public_git
/
oauth2-proxy
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor makeLoginURL to accept extraParams 

And don't require the caller to know how to use the returned params.
This commit is contained in:
Alexander Block 2020-09-15 10:20:10 +02:00
parent 4eb9612679
commit 74918c40d8
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
providers/azure.go
View File

@ -212,10 +212,10 @@ func (p *AzureProvider) GetEmailAddress(ctx context.Context, s *sessions.Session
} }
func (p *AzureProvider) GetLoginURL(redirectURI, state string) string { func (p *AzureProvider) GetLoginURL(redirectURI, state string) string {
a, params := makeLoginURL(p.ProviderData, redirectURI, state) extraParams := url.Values{}
if p.ProtectedResource != nil && p.ProtectedResource.String() != "" { if p.ProtectedResource != nil && p.ProtectedResource.String() != "" {
params.Add("resource", p.ProtectedResource.String()) extraParams.Add("resource", p.ProtectedResource.String())
} }
a.RawQuery = params.Encode() a := makeLoginURL(p.ProviderData, redirectURI, state, extraParams)
return a.String() return a.String()
} }

8
providers/logingov.go
View File

@ -225,12 +225,12 @@ func (p *LoginGovProvider) Redeem(ctx context.Context, redirectURL, code string)
// GetLoginURL overrides GetLoginURL to add login.gov parameters // GetLoginURL overrides GetLoginURL to add login.gov parameters
func (p *LoginGovProvider) GetLoginURL(redirectURI, state string) string { func (p *LoginGovProvider) GetLoginURL(redirectURI, state string) string {
a, params := makeLoginURL(p.ProviderData, redirectURI, state) extraParams := url.Values{}
if p.AcrValues == "" { if p.AcrValues == "" {
acr := "http://idmanagement.gov/ns/assurance/loa/1" acr := "http://idmanagement.gov/ns/assurance/loa/1"
params.Add("acr_values", acr) extraParams.Add("acr_values", acr)
} }
params.Add("nonce", p.Nonce) extraParams.Add("nonce", p.Nonce)
a.RawQuery = params.Encode() a := makeLoginURL(p.ProviderData, redirectURI, state, extraParams)
return a.String() return a.String()
} }

4
providers/provider_default.go
View File

@ -75,8 +75,8 @@ func (p *ProviderData) Redeem(ctx context.Context, redirectURL, code string) (s
// GetLoginURL with typical oauth parameters // GetLoginURL with typical oauth parameters
func (p *ProviderData) GetLoginURL(redirectURI, state string) string { func (p *ProviderData) GetLoginURL(redirectURI, state string) string {
a, params := makeLoginURL(p, redirectURI, state) extraParams := url.Values{}
a.RawQuery = params.Encode() a := makeLoginURL(p, redirectURI, state, extraParams)
return a.String() return a.String()
} }

10
providers/util.go
View File

@ -31,7 +31,7 @@ func makeOIDCHeader(accessToken string) http.Header {
return makeAuthorizationHeader(tokenTypeBearer, accessToken, extraHeaders) return makeAuthorizationHeader(tokenTypeBearer, accessToken, extraHeaders)
} }
func makeLoginURL(p *ProviderData, redirectURI, state string) (url.URL, url.Values) { func makeLoginURL(p *ProviderData, redirectURI, state string, extraParams url.Values) url.URL {
a := *p.LoginURL a := *p.LoginURL
params, _ := url.ParseQuery(a.RawQuery) params, _ := url.ParseQuery(a.RawQuery)
params.Set("redirect_uri", redirectURI) params.Set("redirect_uri", redirectURI)
@ -47,5 +47,11 @@ func makeLoginURL(p *ProviderData, redirectURI, state string) (url.URL, url.Valu
params.Set("client_id", p.ClientID) params.Set("client_id", p.ClientID)
params.Set("response_type", "code") params.Set("response_type", "code")
params.Add("state", state) params.Add("state", state)
return a, params for n, p := range extraParams {
for _, v := range p {
params.Add(n, v)
}
}
a.RawQuery = params.Encode()
return a
} }