Skip to content

Rename session tokens to have wgui prefix #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename session tokens to have wgui prefix #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions handler/routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func Login(db store.IStore) echo.HandlerFunc {

cookiePath := util.GetCookiePath()

sess, _ := session.Get("session", c)
sess, _ := session.Get("wgui_session", c)
sess.Options = &sessions.Options{
Path: cookiePath,
MaxAge: ageMax,
Expand All @@ -114,15 +114,15 @@ func Login(db store.IStore) echo.HandlerFunc {
sess.Values["username"] = dbuser.Username
sess.Values["user_hash"] = util.GetDBUserCRC32(dbuser)
sess.Values["admin"] = dbuser.Admin
sess.Values["session_token"] = tokenUID
sess.Values["wgui_session_token"] = tokenUID
sess.Values["max_age"] = ageMax
sess.Values["created_at"] = now
sess.Values["updated_at"] = now
sess.Save(c.Request(), c.Response())

// set session_token in cookie
cookie := new(http.Cookie)
cookie.Name = "session_token"
cookie.Name = "wgui_session_token"
cookie.Path = cookiePath
cookie.Value = tokenUID
cookie.MaxAge = ageMax
Expand Down
28 changes: 14 additions & 14 deletions handler/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ func isValidSession(c echo.Context) bool {
if util.DisableLogin {
return true
}
sess, _ := session.Get("session", c)
cookie, err := c.Cookie("session_token")
if err != nil || sess.Values["session_token"] != cookie.Value {
sess, _ := session.Get("wgui_session", c)
cookie, err := c.Cookie("wgui_session_token")
if err != nil || sess.Values["wgui_session_token"] != cookie.Value {
return false
}

Expand Down Expand Up @@ -86,14 +86,14 @@ func doRefreshSession(c echo.Context) {
return
}

sess, _ := session.Get("session", c)
sess, _ := session.Get("wgui_session", c)
maxAge := getMaxAge(sess)
if maxAge <= 0 {
return
}

oldCookie, err := c.Cookie("session_token")
if err != nil || sess.Values["session_token"] != oldCookie.Value {
oldCookie, err := c.Cookie("wgui_session_token")
if err != nil || sess.Values["wgui_session_token"] != oldCookie.Value {
return
}

Expand All @@ -118,7 +118,7 @@ func doRefreshSession(c echo.Context) {
sess.Save(c.Request(), c.Response())

cookie := new(http.Cookie)
cookie.Name = "session_token"
cookie.Name = "wgui_session_token"
cookie.Path = cookiePath
cookie.Value = oldCookie.Value
cookie.MaxAge = maxAge
Expand Down Expand Up @@ -198,7 +198,7 @@ func currentUser(c echo.Context) string {
return ""
}

sess, _ := session.Get("session", c)
sess, _ := session.Get("wgui_session", c)
username := fmt.Sprintf("%s", sess.Values["username"])
return username
}
Expand All @@ -209,13 +209,13 @@ func isAdmin(c echo.Context) bool {
return true
}

sess, _ := session.Get("session", c)
sess, _ := session.Get("wgui_session", c)
admin := fmt.Sprintf("%t", sess.Values["admin"])
return admin == "true"
}

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["user_hash"] = userCRC32
sess.Values["admin"] = admin
Expand All @@ -224,23 +224,23 @@ func setUser(c echo.Context, username string, admin bool, userCRC32 uint32) {

// clearSession to remove current session
func clearSession(c echo.Context) {
sess, _ := session.Get("session", c)
sess, _ := session.Get("wgui_session", c)
sess.Values["username"] = ""
sess.Values["user_hash"] = 0
sess.Values["admin"] = false
sess.Values["session_token"] = ""
sess.Values["wgui_session_token"] = ""
sess.Values["max_age"] = -1
sess.Options.MaxAge = -1
sess.Save(c.Request(), c.Response())

cookiePath := util.GetCookiePath()

cookie, err := c.Cookie("session_token")
cookie, err := c.Cookie("wgui_session_token")
if err != nil {
cookie = new(http.Cookie)
}

cookie.Name = "session_token"
cookie.Name = "wgui_session_token"
cookie.Path = cookiePath
cookie.MaxAge = -1
cookie.HttpOnly = true
Expand Down