gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-07 17:10:07 +08:00
Code

feat: 面板开启 https 时，cookie 开启 secure 属性 (#3817)

Browse Source
This commit is contained in:
ssongliu 2024-02-04 22:46:33 +08:00 committed by GitHub
parent c169f211a0
commit 1169648162
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/app/service/auth.go
View File

@ -109,6 +109,10 @@ func (u *AuthService) generateSession(c *gin.Context, name, authMethod string) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
httpsSetting, err := settingRepo.Get(settingRepo.WithByKey("SSL"))
if err != nil {
return nil, err
}
lifeTime, err := strconv.Atoi(setting.Value) lifeTime, err := strconv.Atoi(setting.Value)
if err != nil { if err != nil {
return nil, err return nil, err
@ -129,7 +133,7 @@ func (u *AuthService) generateSession(c *gin.Context, name, authMethod string) (
sessionUser, err := global.SESSION.Get(sID) sessionUser, err := global.SESSION.Get(sID)
if err != nil { if err != nil {
sID = uuid.New().String() sID = uuid.New().String()
c.SetCookie(constant.SessionName, sID, 0, "", "", false, false) c.SetCookie(constant.SessionName, sID, 0, "", "", httpsSetting.Value == "enable", false)
err := global.SESSION.Set(sID, sessionUser, lifeTime) err := global.SESSION.Set(sID, sessionUser, lifeTime)
if err != nil { if err != nil {
return nil, err return nil, err
@ -144,9 +148,13 @@ func (u *AuthService) generateSession(c *gin.Context, name, authMethod string) (
} }
func (u *AuthService) LogOut(c *gin.Context) error { func (u *AuthService) LogOut(c *gin.Context) error {
httpsSetting, err := settingRepo.Get(settingRepo.WithByKey("SSL"))
if err != nil {
return err
}
sID, _ := c.Cookie(constant.SessionName) sID, _ := c.Cookie(constant.SessionName)
if sID != "" { if sID != "" {
c.SetCookie(constant.SessionName, sID, -1, "", "", false, false) c.SetCookie(constant.SessionName, sID, -1, "", "", httpsSetting.Value == "enable", false)
err := global.SESSION.Delete(sID) err := global.SESSION.Delete(sID)
if err != nil { if err != nil {
return err return err

6
backend/app/service/setting.go
View File

@ -198,6 +198,9 @@ func (u *SettingService) UpdateSSL(c *gin.Context, req dto.SSLUpdate) error {
} }
_ = os.Remove(path.Join(secretDir, "server.crt")) _ = os.Remove(path.Join(secretDir, "server.crt"))
_ = os.Remove(path.Join(secretDir, "server.key")) _ = os.Remove(path.Join(secretDir, "server.key"))
sID, _ := c.Cookie(constant.SessionName)
c.SetCookie(constant.SessionName, sID, 0, "", "", false, false)
go func() { go func() {
_, err := cmd.Exec("systemctl restart 1panel.service") _, err := cmd.Exec("systemctl restart 1panel.service")
if err != nil { if err != nil {
@ -289,6 +292,9 @@ func (u *SettingService) UpdateSSL(c *gin.Context, req dto.SSLUpdate) error {
if err := settingRepo.Update("SSL", req.SSL); err != nil { if err := settingRepo.Update("SSL", req.SSL); err != nil {
return err return err
} }
sID, _ := c.Cookie(constant.SessionName)
c.SetCookie(constant.SessionName, sID, 0, "", "", true, false)
go func() { go func() {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
_, err := cmd.Exec("systemctl restart 1panel.service") _, err := cmd.Exec("systemctl restart 1panel.service")