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

Migrate all requests to result pattern

Browse Source
This commit is contained in:
Joel Speed
2020-07-06 17:42:26 +01:00
parent d0b6c04960
commit de9e65a63a
15 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/validation/options.go
View File

@ -86,6 +86,7 @@ func Validate(o *options.Options) error {
requestURL := strings.TrimSuffix(o.OIDCIssuerURL, "/") + "/.well-known/openid-configuration"
body, err := requests.New(requestURL).
WithContext(ctx).
Do().
UnmarshalJSON()
if err != nil {
logger.Printf("error: failed to discover OIDC configuration: %v", err)
@ -384,11 +385,9 @@ func newVerifierFromJwtIssuer(jwtIssuer jwtIssuer) (*oidc.IDTokenVerifier, error
if err != nil {
// Try as JWKS URI
jwksURI := strings.TrimSuffix(jwtIssuer.issuerURI, "/") + "/.well-known/jwks.json"
resp, err := requests.New(jwksURI).Do()
if err != nil {
if err := requests.New(jwksURI).Do().Error(); err != nil {
return nil, err
}
resp.Body.Close()
verifier = oidc.NewVerifier(jwtIssuer.issuerURI, oidc.NewRemoteKeySet(context.Background(), jwksURI), config)
} else {