github/wonderwall
1
0
Fork 0
mirror of https://github.com/nais/wonderwall.git synced 2026-05-07 17:06:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ClientID to cookie names

Browse Source 
Co-authored-by: Sindre Rødseth Hansen <sindre.rodseth.hansen@nav.no>
This commit is contained in:
Morten Lied Johansen
2021-09-29 10:20:11 +02:00
parent 28b750517b
commit b60db493ac
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/router/cookies.go
View File

@@ -21,8 +21,16 @@ type CallbackParams struct {
Referer string `json:"referer"`
}
func (h *Handler) getCallbackCookieName() string {
return fmt.Sprintf(CallbackCookieNameTemplate, h.Config.ClientID)
}
func (h *Handler) GetSessionCookieName() string {
return fmt.Sprintf(SessionCookieNameTemplate, h.Config.ClientID)
}
func (h *Handler) getCallbackParams(r *http.Request) (*CallbackParams, error) {
callbackCookieString, err := h.getEncryptedCookie(r, CallbackCookieName)
callbackCookieString, err := h.getEncryptedCookie(r, h.getCallbackCookieName())
if err != nil {
return nil, err
}

13
pkg/router/router.go
View File

@@ -31,10 +31,9 @@ import (
)
const (
SessionCookieName = "io.nais.wonderwall.session"
LoginCookieLifetime = 2 * time.Minute
CallbackCookieName = "io.nais.wonderwall.callback"
LoginCookieLifetime = 2 * time.Minute
SessionCookieNameTemplate = "io.nais.wonderwall.%s.session"
CallbackCookieNameTemplate = "io.nais.wonderwall.%s.callback"
RedirectURLParameter = "redirect"
SecurityLevelURLParameter = "level"
@@ -230,7 +229,7 @@ func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
return
}
err = h.setEncryptedCookie(w, CallbackCookieName, string(jsonString), LoginCookieLifetime)
err = h.setEncryptedCookie(w, h.getCallbackCookieName(), string(jsonString), LoginCookieLifetime)
if err != nil {
log.Error(err)
w.WriteHeader(http.StatusInternalServerError)
@@ -317,7 +316,7 @@ func (h *Handler) Callback(w http.ResponseWriter, r *http.Request) {
}
sessionID := h.localSessionID(externalSessionID)
err = h.setEncryptedCookie(w, SessionCookieName, sessionID, h.Config.SessionMaxLifetime)
err = h.setEncryptedCookie(w, h.GetSessionCookieName(), sessionID, h.Config.SessionMaxLifetime)
if err != nil {
log.Error(err)
w.WriteHeader(http.StatusInternalServerError)
@@ -405,7 +404,7 @@ func (h *Handler) Logout(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusInternalServerError)
return
}
h.deleteCookie(w, SessionCookieName)
h.deleteCookie(w, h.GetSessionCookieName())
}
u, err := url.Parse(h.Config.WellKnown.EndSessionEndpoint)

6
pkg/router/router_test.go
View File

@@ -248,7 +248,7 @@ func TestHandler_Callback_and_Logout(t *testing.T) {
cookies := client.Jar.Cookies(callbackURL)
var sessionCookie *http.Cookie
for _, cookie := range cookies {
if cookie.Name == router.SessionCookieName {
if cookie.Name == h.GetSessionCookieName() {
sessionCookie = cookie
}
}
@@ -262,7 +262,7 @@ func TestHandler_Callback_and_Logout(t *testing.T) {
cookies = client.Jar.Cookies(callbackURL)
for _, cookie := range cookies {
if cookie.Name == router.SessionCookieName {
if cookie.Name == h.GetSessionCookieName() {
sessionCookie = cookie
}
}
@@ -342,7 +342,7 @@ func TestHandler_FrontChannelLogout(t *testing.T) {
cookies := client.Jar.Cookies(callbackURL)
var sessionCookie *http.Cookie
for _, cookie := range cookies {
if cookie.Name == router.SessionCookieName {
if cookie.Name == h.GetSessionCookieName() {
sessionCookie = cookie
}
}

2
pkg/router/session.go
View File

@@ -7,7 +7,7 @@ import (
)
func (h *Handler) getSessionFromCookie(r *http.Request) (*session.Data, error) {
sessionID, err := h.getEncryptedCookie(r, SessionCookieName)
sessionID, err := h.getEncryptedCookie(r, h.GetSessionCookieName())
if err != nil {
return nil, fmt.Errorf("no session cookie: %w", err)
}