public_git
/
wireguard-ui
mirror of https://github.com/ngoduykhanh/wireguard-ui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 36be3a7ac9 into 2fdafd34ca

This commit is contained in:
Sam Gleske 2025-05-06 21:09:01 -04:00 committed by GitHub
parent 2fdafd34ca 36be3a7ac9
commit c429177450
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handler/routes.go
View File

@ -100,7 +100,7 @@ func Login(db store.IStore) echo.HandlerFunc {
cookiePath := util.GetCookiePath() cookiePath := util.GetCookiePath()
sess, _ := session.Get("session", c) sess, _ := session.Get("wgui_session", c)
sess.Options = &sessions.Options{ sess.Options = &sessions.Options{
Path: cookiePath, Path: cookiePath,
MaxAge: ageMax, MaxAge: ageMax,
@ -114,7 +114,7 @@ func Login(db store.IStore) echo.HandlerFunc {
sess.Values["username"] = dbuser.Username sess.Values["username"] = dbuser.Username
sess.Values["user_hash"] = util.GetDBUserCRC32(dbuser) sess.Values["user_hash"] = util.GetDBUserCRC32(dbuser)
sess.Values["admin"] = dbuser.Admin sess.Values["admin"] = dbuser.Admin
sess.Values["session_token"] = tokenUID sess.Values["wgui_session_token"] = tokenUID
sess.Values["max_age"] = ageMax sess.Values["max_age"] = ageMax
sess.Values["created_at"] = now sess.Values["created_at"] = now
sess.Values["updated_at"] = now sess.Values["updated_at"] = now
@ -122,7 +122,7 @@ func Login(db store.IStore) echo.HandlerFunc {
// set session_token in cookie // set session_token in cookie
cookie := new(http.Cookie) cookie := new(http.Cookie)
cookie.Name = "session_token" cookie.Name = "wgui_session_token"
cookie.Path = cookiePath cookie.Path = cookiePath
cookie.Value = tokenUID cookie.Value = tokenUID
cookie.MaxAge = ageMax cookie.MaxAge = ageMax

28
handler/session.go
View File

@ -47,9 +47,9 @@ func isValidSession(c echo.Context) bool {
if util.DisableLogin { if util.DisableLogin {
return true return true
} }
sess, _ := session.Get("session", c) sess, _ := session.Get("wgui_session", c)
cookie, err := c.Cookie("session_token") cookie, err := c.Cookie("wgui_session_token")
if err != nil || sess.Values["session_token"] != cookie.Value { if err != nil || sess.Values["wgui_session_token"] != cookie.Value {
return false return false
} }
@ -86,14 +86,14 @@ func doRefreshSession(c echo.Context) {
return return
} }
sess, _ := session.Get("session", c) sess, _ := session.Get("wgui_session", c)
maxAge := getMaxAge(sess) maxAge := getMaxAge(sess)
if maxAge <= 0 { if maxAge <= 0 {
return return
} }
oldCookie, err := c.Cookie("session_token") oldCookie, err := c.Cookie("wgui_session_token")
if err != nil || sess.Values["session_token"] != oldCookie.Value { if err != nil || sess.Values["wgui_session_token"] != oldCookie.Value {
return return
} }
@ -118,7 +118,7 @@ func doRefreshSession(c echo.Context) {
sess.Save(c.Request(), c.Response()) sess.Save(c.Request(), c.Response())
cookie := new(http.Cookie) cookie := new(http.Cookie)
cookie.Name = "session_token" cookie.Name = "wgui_session_token"
cookie.Path = cookiePath cookie.Path = cookiePath
cookie.Value = oldCookie.Value cookie.Value = oldCookie.Value
cookie.MaxAge = maxAge cookie.MaxAge = maxAge
@ -198,7 +198,7 @@ func currentUser(c echo.Context) string {
return "" return ""
} }
sess, _ := session.Get("session", c) sess, _ := session.Get("wgui_session", c)
username := fmt.Sprintf("%s", sess.Values["username"]) username := fmt.Sprintf("%s", sess.Values["username"])
return username return username
} }
@ -209,13 +209,13 @@ func isAdmin(c echo.Context) bool {
return true return true
} }
sess, _ := session.Get("session", c) sess, _ := session.Get("wgui_session", c)
admin := fmt.Sprintf("%t", sess.Values["admin"]) admin := fmt.Sprintf("%t", sess.Values["admin"])
return admin == "true" return admin == "true"
} }
func setUser(c echo.Context, username string, admin bool, userCRC32 uint32) { func setUser(c echo.Context, username string, admin bool, userCRC32 uint32) {
sess, _ := session.Get("session", c) sess, _ := session.Get("wgui_session", c)
sess.Values["username"] = username sess.Values["username"] = username
sess.Values["user_hash"] = userCRC32 sess.Values["user_hash"] = userCRC32
sess.Values["admin"] = admin sess.Values["admin"] = admin
@ -224,23 +224,23 @@ func setUser(c echo.Context, username string, admin bool, userCRC32 uint32) {
// clearSession to remove current session // clearSession to remove current session
func clearSession(c echo.Context) { func clearSession(c echo.Context) {
sess, _ := session.Get("session", c) sess, _ := session.Get("wgui_session", c)
sess.Values["username"] = "" sess.Values["username"] = ""
sess.Values["user_hash"] = 0 sess.Values["user_hash"] = 0
sess.Values["admin"] = false sess.Values["admin"] = false
sess.Values["session_token"] = "" sess.Values["wgui_session_token"] = ""
sess.Values["max_age"] = -1 sess.Values["max_age"] = -1
sess.Options.MaxAge = -1 sess.Options.MaxAge = -1
sess.Save(c.Request(), c.Response()) sess.Save(c.Request(), c.Response())
cookiePath := util.GetCookiePath() cookiePath := util.GetCookiePath()
cookie, err := c.Cookie("session_token") cookie, err := c.Cookie("wgui_session_token")
if err != nil { if err != nil {
cookie = new(http.Cookie) cookie = new(http.Cookie)
} }
cookie.Name = "session_token" cookie.Name = "wgui_session_token"
cookie.Path = cookiePath cookie.Path = cookiePath
cookie.MaxAge = -1 cookie.MaxAge = -1
cookie.HttpOnly = true cookie.HttpOnly = true