lukaszraczylo/traefikoidc
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/traefikoidc.git synced 2026-10-19 04:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! fixup! fixup! fixup! Downgrade gorilla sessions preventing the publishing by traefik hub temporarily.

Browse Source
This commit is contained in:
lukaszraczylo
2024-11-06 14:55:44 +00:00
parent ae456e4e0d
commit f8562fd562
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
helpers.go
+23 -15
View File
@@ -385,14 +385,25 @@ func (t *TraefikOidc) handleLogout(rw http.ResponseWriter, req *http.Request) {
return return
} }
// Build post logout redirect URI with FQDN if not set // Build post logout redirect URI with full URL
if t.postLogoutRedirectURI == "" { host := t.determineHost(req)
// Get the host from request headers or direct host scheme := t.determineScheme(req)
host := t.determineHost(req)
scheme := t.determineScheme(req)
// Build the full URL with scheme and host // Ensure we have a complete post logout redirect URI
t.postLogoutRedirectURI = fmt.Sprintf("%s://%s%s", var postLogoutRedirectURI string
if t.postLogoutRedirectURI != "" {
if strings.HasPrefix(t.postLogoutRedirectURI, "http://") || strings.HasPrefix(t.postLogoutRedirectURI, "https://") {
postLogoutRedirectURI = t.postLogoutRedirectURI
} else {
// Convert relative path to absolute URL
postLogoutRedirectURI = fmt.Sprintf("%s://%s%s",
scheme,
host,
t.postLogoutRedirectURI)
}
} else {
// Default to logout path if not set
postLogoutRedirectURI = fmt.Sprintf("%s://%s%s",
scheme, scheme,
host, host,
t.logoutURLPath) t.logoutURLPath)
@@ -400,19 +411,19 @@ func (t *TraefikOidc) handleLogout(rw http.ResponseWriter, req *http.Request) {
// If we have an end session endpoint and an ID token, use OIDC end session // If we have an end session endpoint and an ID token, use OIDC end session
if t.endSessionURL != "" && idToken != "" { if t.endSessionURL != "" && idToken != "" {
logoutURL, err := BuildLogoutURL(t.endSessionURL, idToken, t.postLogoutRedirectURI) logoutURL, err := BuildLogoutURL(t.endSessionURL, idToken, postLogoutRedirectURI)
if err != nil { if err != nil {
handleError(rw, fmt.Sprintf("Failed to build logout URL: %v", err), http.StatusInternalServerError, t.logger) handleError(rw, fmt.Sprintf("Failed to build logout URL: %v", err), http.StatusInternalServerError, t.logger)
return return
} }
t.logger.Debugf("Redirecting to end session URL: %s", logoutURL) t.logger.Debugf("Redirecting to end session URL: %s with post_logout_redirect_uri: %s", logoutURL, postLogoutRedirectURI)
http.Redirect(rw, req, logoutURL, http.StatusFound) http.Redirect(rw, req, logoutURL, http.StatusFound)
return return
} }
// If no end session endpoint or no ID token, just redirect to the post logout URI // If no end session endpoint or no ID token, just redirect to the post logout URI
t.logger.Debugf("Redirecting to post logout URI: %s", t.postLogoutRedirectURI) t.logger.Debugf("Redirecting to post logout URI: %s", postLogoutRedirectURI)
http.Redirect(rw, req, t.postLogoutRedirectURI, http.StatusFound) http.Redirect(rw, req, postLogoutRedirectURI, http.StatusFound)
} }
// BuildLogoutURL constructs the OIDC end session URL // BuildLogoutURL constructs the OIDC end session URL
@@ -422,13 +433,10 @@ func BuildLogoutURL(endSessionURL, idToken, postLogoutRedirectURI string) (strin
return "", fmt.Errorf("failed to parse end session URL: %w", err) return "", fmt.Errorf("failed to parse end session URL: %w", err)
} }
if postLogoutRedirectURI == "" {
postLogoutRedirectURI = "/"
}
q := u.Query() q := u.Query()
q.Set("id_token_hint", idToken) q.Set("id_token_hint", idToken)
if postLogoutRedirectURI != "" { if postLogoutRedirectURI != "" {
// Ensure postLogoutRedirectURI is properly URL encoded
q.Set("post_logout_redirect_uri", postLogoutRedirectURI) q.Set("post_logout_redirect_uri", postLogoutRedirectURI)
} }
u.RawQuery = q.Encode() u.RawQuery = q.Encode()