go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-03-29 22:06:58 +02:00
Code Issues Releases Activity

Fix X-Auth-Request-Preferred-Username in response headers

Browse Source
This commit is contained in:
Nick Meves 2020-11-07 12:34:27 -08:00
parent 1c26539ef0
commit 7d6ff03d13
No known key found for this signature in database
GPG Key ID: 93BA8A3CEDCDD1CF
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/apis/options/legacy_options.go
View File

@ -203,7 +203,10 @@ func (l *LegacyHeaders) getResponseHeaders() []Header {
responseHeaders := []Header{} responseHeaders := []Header{}
if l.SetXAuthRequest { if l.SetXAuthRequest {
responseHeaders = append(responseHeaders, getXAuthRequestHeaders(l.PassAccessToken)...) responseHeaders = append(responseHeaders, getXAuthRequestHeaders()...)
if l.PassAccessToken {
responseHeaders = append(responseHeaders, getXAuthRequestAccessTokenHeader())
}
} }
if l.SetBasicAuth { if l.SetBasicAuth {
@ -331,7 +334,7 @@ func getPreferredUsernameHeader() Header {
} }
} }
func getXAuthRequestHeaders(passAccessToken bool) []Header { func getXAuthRequestHeaders() []Header {
headers := []Header{ headers := []Header{
{ {
Name: "X-Auth-Request-User", Name: "X-Auth-Request-User",
@ -353,7 +356,16 @@ func getXAuthRequestHeaders(passAccessToken bool) []Header {
}, },
}, },
}, },
getPreferredUsernameHeader(), {
Name: "X-Auth-Request-Preferred-Username",
Values: []HeaderValue{
{
ClaimSource: &ClaimSource{
Claim: "preferred_username",
},
},
},
},
{ {
Name: "X-Auth-Request-Groups", Name: "X-Auth-Request-Groups",
Values: []HeaderValue{ Values: []HeaderValue{
@ -366,18 +378,18 @@ func getXAuthRequestHeaders(passAccessToken bool) []Header {
}, },
} }
if passAccessToken {
headers = append(headers, Header{
Name: "X-Auth-Request-Access-Token",
Values: []HeaderValue{
{
ClaimSource: &ClaimSource{
Claim: "access_token",
},
},
},
})
}
return headers return headers
} }
func getXAuthRequestAccessTokenHeader() Header {
return Header{
Name: "X-Auth-Request-Access-Token",
Values: []HeaderValue{
{
ClaimSource: &ClaimSource{
Claim: "access_token",
},
},
},
}
}