mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge: * auth: rename "session" cookie to "agh_session" 

Close #1196

* commit 'b3614ba62fcde8ff3e3b6e708095f84a230aa2f2':
  * auth: rename "session" cookie to "agh_session"
This commit is contained in:
Simon Zolin 2019-11-26 19:21:34 +03:00
parent 7a665ff8f0 b3614ba62f
commit 48c0b487e3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
home/auth.go
View File

@ -18,6 +18,7 @@ import (
) )
const cookieTTL = 365 * 24 // in hours const cookieTTL = 365 * 24 // in hours
const sessionCookieName = "agh_session"
type session struct { type session struct {
userName string userName string
@ -294,7 +295,8 @@ func (a *Auth) httpCookie(req loginJSON) string {
s.expire = uint32(now.Unix()) + a.sessionTTL s.expire = uint32(now.Unix()) + a.sessionTTL
a.addSession(sess, &s) a.addSession(sess, &s)
return fmt.Sprintf("session=%s; Path=/; HttpOnly; Expires=%s", hex.EncodeToString(sess), expstr) return fmt.Sprintf("%s=%s; Path=/; HttpOnly; Expires=%s",
sessionCookieName, hex.EncodeToString(sess), expstr)
} }
func handleLogin(w http.ResponseWriter, r *http.Request) { func handleLogin(w http.ResponseWriter, r *http.Request) {
@ -330,7 +332,8 @@ func handleLogout(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Location", "/login.html") w.Header().Set("Location", "/login.html")
s := fmt.Sprintf("session=; Path=/; HttpOnly; Expires=Thu, 01 Jan 1970 00:00:00 GMT") s := fmt.Sprintf("%s=; Path=/; HttpOnly; Expires=Thu, 01 Jan 1970 00:00:00 GMT",
sessionCookieName)
w.Header().Set("Set-Cookie", s) w.Header().Set("Set-Cookie", s)
w.WriteHeader(http.StatusFound) w.WriteHeader(http.StatusFound)
@ -350,7 +353,7 @@ func parseCookie(cookie string) string {
if len(kv) != 2 { if len(kv) != 2 {
continue continue
} }
if kv[0] == "session" { if kv[0] == sessionCookieName {
return kv[1] return kv[1]
} }
} }
@ -363,7 +366,7 @@ func optionalAuth(handler func(http.ResponseWriter, *http.Request)) func(http.Re
if r.URL.Path == "/login.html" { if r.URL.Path == "/login.html" {
// redirect to dashboard if already authenticated // redirect to dashboard if already authenticated
authRequired := config.auth != nil && config.auth.AuthRequired() authRequired := config.auth != nil && config.auth.AuthRequired()
cookie, err := r.Cookie("session") cookie, err := r.Cookie(sessionCookieName)
if authRequired && err == nil { if authRequired && err == nil {
r := config.auth.CheckSession(cookie.Value) r := config.auth.CheckSession(cookie.Value)
if r == 0 { if r == 0 {
@ -382,7 +385,7 @@ func optionalAuth(handler func(http.ResponseWriter, *http.Request)) func(http.Re
} else if config.auth != nil && config.auth.AuthRequired() { } else if config.auth != nil && config.auth.AuthRequired() {
// redirect to login page if not authenticated // redirect to login page if not authenticated
ok := false ok := false
cookie, err := r.Cookie("session") cookie, err := r.Cookie(sessionCookieName)
if err == nil { if err == nil {
r := config.auth.CheckSession(cookie.Value) r := config.auth.CheckSession(cookie.Value)
if r == 0 { if r == 0 {
@ -460,7 +463,7 @@ func (a *Auth) UserFind(login string, password string) User {
// GetCurrentUser - get the current user // GetCurrentUser - get the current user
func (a *Auth) GetCurrentUser(r *http.Request) User { func (a *Auth) GetCurrentUser(r *http.Request) User {
cookie, err := r.Cookie("session") cookie, err := r.Cookie(sessionCookieName)
if err != nil { if err != nil {
// there's no Cookie, check Basic authentication // there's no Cookie, check Basic authentication
user, pass, ok := r.BasicAuth() user, pass, ok := r.BasicAuth()