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

Move DefaultGetLoginURL into util.go

This commit is contained in:
Alexander Block 2020-09-15 10:12:25 +02:00
parent 9a64e67d5b
commit 4eb9612679
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/azure.go
View File

@ -212,7 +212,7 @@ 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 := DefaultGetLoginURL(p.ProviderData, redirectURI, state) a, params := makeLoginURL(p.ProviderData, redirectURI, state)
if p.ProtectedResource != nil && p.ProtectedResource.String() != "" { if p.ProtectedResource != nil && p.ProtectedResource.String() != "" {
params.Add("resource", p.ProtectedResource.String()) params.Add("resource", p.ProtectedResource.String())
} }

2
providers/logingov.go
View File

@ -225,7 +225,7 @@ 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 := DefaultGetLoginURL(p.ProviderData, redirectURI, state) a, params := makeLoginURL(p.ProviderData, redirectURI, state)
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) params.Add("acr_values", acr)

21
providers/provider_default.go
View File

@ -73,28 +73,9 @@ func (p *ProviderData) Redeem(ctx context.Context, redirectURL, code string) (s
return return
} }
func DefaultGetLoginURL(p *ProviderData, redirectURI, state string) (url.URL, url.Values) {
a := *p.LoginURL
params, _ := url.ParseQuery(a.RawQuery)
params.Set("redirect_uri", redirectURI)
if p.AcrValues != "" {
params.Add("acr_values", p.AcrValues)
}
if p.Prompt != "" {
params.Set("prompt", p.Prompt)
} else { // Legacy variant of the prompt param:
params.Set("approval_prompt", p.ApprovalPrompt)
}
params.Add("scope", p.Scope)
params.Set("client_id", p.ClientID)
params.Set("response_type", "code")
params.Add("state", state)
return a, params
}
// 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 := DefaultGetLoginURL(p, redirectURI, state) a, params := makeLoginURL(p, redirectURI, state)
a.RawQuery = params.Encode() a.RawQuery = params.Encode()
return a.String() return a.String()
} }

20
providers/util.go
View File

@ -3,6 +3,7 @@ package providers
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"net/url"
) )
const ( const (
@ -29,3 +30,22 @@ 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) {
a := *p.LoginURL
params, _ := url.ParseQuery(a.RawQuery)
params.Set("redirect_uri", redirectURI)
if p.AcrValues != "" {
params.Add("acr_values", p.AcrValues)
}
if p.Prompt != "" {
params.Set("prompt", p.Prompt)
} else { // Legacy variant of the prompt param:
params.Set("approval_prompt", p.ApprovalPrompt)
}
params.Add("scope", p.Scope)
params.Set("client_id", p.ClientID)
params.Set("response_type", "code")
params.Add("state", state)
return a, params
}