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

fix: clean up tests and fix name

Browse Source
This commit is contained in:
ybelMekk
2022-01-25 12:08:42 +01:00
parent 1a2b85a5f5
commit abc8bd1835
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/mock/handler.go
View File

@@ -255,6 +255,6 @@ func NewSHA256(data []byte) []byte {
return hash[:]
}
func (ip *identityProviderHandler) GetCurrentSessionState(clientID string) string {
return ip.SessionStates[clientID]
func (ip *identityProviderHandler) GetClientID(sessionID string) string {
return ip.Sessions[sessionID]
}

3
pkg/mock/openid.go
View File

@@ -20,6 +20,9 @@ func IdentityProviderServer(iframe bool) (*httptest.Server, TestProvider, *ident
if iframe {
provider.OpenIDConfiguration.CheckSessionIframe = server.URL + "/checksession"
} else {
provider.OpenIDConfiguration.FrontchannelLogoutSupported = true
provider.OpenIDConfiguration.FrontchannelLogoutSessionSupported = true
}
return server, provider, handler

10
pkg/router/handler_callback.go
View File

@@ -120,23 +120,23 @@ func (h *Handler) validateIDToken(idToken *openid.IDToken, loginCookie *openid.L
func (h *Handler) SessionId(idToken *openid.IDToken, params url.Values) (string, error) {
var openIDconfig = h.Provider.GetOpenIDConfiguration()
var externalSessionID string
var sessionID string
var err error
switch {
case openIDconfig.SidClaimRequired():
externalSessionID, err = idToken.GetStringClaim("sid")
sessionID, err = idToken.GetStringClaim("sid")
case openIDconfig.GetCheckSessionIframe():
externalSessionID, err = getSessionStateFrom(params)
sessionID, err = getSessionStateFrom(params)
default:
externalSessionID, err = h.GenerateSessionID()
sessionID, err = h.GenerateSessionID()
}
if err != nil {
return "", err
}
return externalSessionID, nil
return sessionID, nil
}
func getSessionStateFrom(params url.Values) (string, error) {

13
pkg/router/router_test.go
View File

@@ -196,7 +196,7 @@ func TestHandler_Callback_and_Logout(t *testing.T) {
}
func TestHandler_FrontChannelLogout(t *testing.T) {
_, idp, _ := mock.IdentityProviderServer(false)
_, idp, idpHandler := mock.IdentityProviderServer(false)
h := newHandler(idp)
r := router.New(h)
server := httptest.NewServer(r)
@@ -252,6 +252,9 @@ func TestHandler_FrontChannelLogout(t *testing.T) {
sid, err := h.Crypter.Decrypt(ciphertext)
assert.NoError(t, err)
clientID := idpHandler.GetClientID(parseSessionID(sid))
assert.Equal(t, idp.GetClientConfiguration().GetClientID(), clientID)
frontchannelLogoutURL, err := url.Parse(server.URL)
assert.NoError(t, err)
@@ -324,8 +327,8 @@ func TestHandler_CheckSessionIframe(t *testing.T) {
sessionState, err := h.Crypter.Decrypt(ciphertext)
assert.NoError(t, err)
idpSessionState := idpHandler.GetCurrentSessionState(idp.GetClientConfiguration().GetClientID())
assert.Equal(t, idpSessionState, strings.Split(string(sessionState), ":")[2])
clientID := idpHandler.GetClientID(parseSessionID(sessionState))
assert.Equal(t, idp.GetClientConfiguration().GetClientID(), clientID)
}
func getCookieFromJar(name string, cookies []*http.Cookie) *http.Cookie {
@@ -337,3 +340,7 @@ func getCookieFromJar(name string, cookies []*http.Cookie) *http.Cookie {
return nil
}
func parseSessionID(sessionID []byte) string {
return strings.Split(string(sessionID), ":")[2]
}