Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-05-13 11:48:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix session

Browse source
This commit is contained in:
mhsanaei 2024-08-06 13:44:48 +02:00
parent d8d9c64847
commit 3e3ed4ed52
4 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/assets/js/model/setting.js
View file

@ -7,7 +7,7 @@ class AllSetting {
this.webCertFile = ""; this.webCertFile = "";
this.webKeyFile = ""; this.webKeyFile = "";
this.webBasePath = "/"; this.webBasePath = "/";
this.sessionMaxAge = ""; this.sessionMaxAge = 0;
this.pageSize = 50; this.pageSize = 50;
this.expireDiff = ""; this.expireDiff = "";
this.trafficDiff = ""; this.trafficDiff = "";

7
web/assets/js/util/utils.js
View file

@ -16,6 +16,9 @@ class HttpUtil {
} }
static _respToMsg(resp) { static _respToMsg(resp) {
if (!resp || !resp.data) {
return new Msg(false, 'No response data');
}
const { data } = resp; const { data } = resp;
if (data == null) { if (data == null) {
return new Msg(true); return new Msg(true);
@ -34,7 +37,7 @@ class HttpUtil {
return msg; return msg;
} catch (error) { } catch (error) {
console.error('GET request failed:', error); console.error('GET request failed:', error);
const errorMsg = new Msg(false, error.response?.data?.message || error.message); const errorMsg = new Msg(false, error.response?.data?.message || error.message || 'Request failed');
this._handleMsg(errorMsg); this._handleMsg(errorMsg);
return errorMsg; return errorMsg;
} }
@ -48,7 +51,7 @@ class HttpUtil {
return msg; return msg;
} catch (error) { } catch (error) {
console.error('POST request failed:', error); console.error('POST request failed:', error);
const errorMsg = new Msg(false, error.response?.data?.message || error.message); const errorMsg = new Msg(false, error.response?.data?.message || error.message || 'Request failed');
this._handleMsg(errorMsg); this._handleMsg(errorMsg);
return errorMsg; return errorMsg;
} }

6
web/controller/index.go
View file

@ -83,12 +83,14 @@ func (a *IndexController) login(c *gin.Context) {
logger.Warning("Unable to get session's max age from DB") logger.Warning("Unable to get session's max age from DB")
} }
if sessionMaxAge > 0 { if sessionMaxAge <= 0 {
sessionMaxAge = 60
}
err = session.SetMaxAge(c, sessionMaxAge*60) err = session.SetMaxAge(c, sessionMaxAge*60)
if err != nil { if err != nil {
logger.Warning("Unable to set session's max age") logger.Warning("Unable to set session's max age")
} }
}
err = session.SetLoginUser(c, user) err = session.SetLoginUser(c, user)
logger.Infof("%s logged in successfully", user.Username) logger.Infof("%s logged in successfully", user.Username)

34
web/session/session.go
View file

@ -9,7 +9,10 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
const loginUser = "LOGIN_USER" const (
loginUser = "LOGIN_USER"
defaultPath = "/"
)
func init() { func init() {
gob.Register(model.User{}) gob.Register(model.User{})
@ -17,10 +20,6 @@ func init() {
func SetLoginUser(c *gin.Context, user *model.User) error { func SetLoginUser(c *gin.Context, user *model.User) error {
s := sessions.Default(c) s := sessions.Default(c)
s.Options(sessions.Options{
Path: "/",
HttpOnly: true,
})
s.Set(loginUser, user) s.Set(loginUser, user)
return s.Save() return s.Save()
} }
@ -28,20 +27,24 @@ func SetLoginUser(c *gin.Context, user *model.User) error {
func SetMaxAge(c *gin.Context, maxAge int) error { func SetMaxAge(c *gin.Context, maxAge int) error {
s := sessions.Default(c) s := sessions.Default(c)
s.Options(sessions.Options{ s.Options(sessions.Options{
Path: "/", Path: defaultPath,
MaxAge: maxAge, MaxAge: maxAge,
HttpOnly: true,
}) })
return s.Save() return s.Save()
} }
func GetLoginUser(c *gin.Context) *model.User { func GetLoginUser(c *gin.Context) *model.User {
s := sessions.Default(c) s := sessions.Default(c)
if obj := s.Get(loginUser); obj != nil { obj := s.Get(loginUser)
if user, ok := obj.(model.User); ok { if obj == nil {
return &user
}
}
return nil return nil
}
user, ok := obj.(model.User)
if !ok {
return nil
}
return &user
} }
func IsLogin(c *gin.Context) bool { func IsLogin(c *gin.Context) bool {
@ -52,12 +55,9 @@ func ClearSession(c *gin.Context) error {
s := sessions.Default(c) s := sessions.Default(c)
s.Clear() s.Clear()
s.Options(sessions.Options{ s.Options(sessions.Options{
Path: "/", Path: defaultPath,
MaxAge: -1, MaxAge: -1,
HttpOnly: true,
}) })
if err := s.Save(); err != nil { return s.Save()
return err
}
c.SetCookie("3x-ui", "", -1, "/", "", false, true)
return nil
} }