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

Merge d3d8706f5e into 9168731c7a

This commit is contained in:
Brian McNamara 2025-10-06 16:53:57 +03:00 committed by GitHub
parent 9168731c7a d3d8706f5e
commit 29dc6dcb13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/validation/options.go
View File

@ -58,8 +58,7 @@ func Validate(o *options.Options) error {
jwtIssuers, msgs = parseJwtIssuers(o.ExtraJwtIssuers, msgs) jwtIssuers, msgs = parseJwtIssuers(o.ExtraJwtIssuers, msgs)
for _, jwtIssuer := range jwtIssuers { for _, jwtIssuer := range jwtIssuers {
verifier, err := newVerifierFromJwtIssuer( verifier, err := newVerifierFromJwtIssuer(
o.Providers[0].OIDCConfig.AudienceClaims, o.Providers[0].OIDCConfig,
o.Providers[0].OIDCConfig.ExtraAudiences,
jwtIssuer, jwtIssuer,
) )
if err != nil { if err != nil {
@ -142,12 +141,14 @@ func parseJwtIssuers(issuers []string, msgs []string) ([]jwtIssuer, []string) {
// newVerifierFromJwtIssuer takes in issuer information in jwtIssuer info and returns // newVerifierFromJwtIssuer takes in issuer information in jwtIssuer info and returns
// a verifier for that issuer. // a verifier for that issuer.
func newVerifierFromJwtIssuer(audienceClaims []string, extraAudiences []string, jwtIssuer jwtIssuer) (internaloidc.IDTokenVerifier, error) { func newVerifierFromJwtIssuer(odicOptions options.OIDCOptions, jwtIssuer jwtIssuer) (internaloidc.IDTokenVerifier, error) {
pvOpts := internaloidc.ProviderVerifierOptions{ pvOpts := internaloidc.ProviderVerifierOptions{
AudienceClaims: audienceClaims, AudienceClaims: odicOptions.AudienceClaims,
ClientID: jwtIssuer.audience, ClientID: jwtIssuer.audience,
ExtraAudiences: extraAudiences, ExtraAudiences: odicOptions.ExtraAudiences,
IssuerURL: jwtIssuer.issuerURI, IssuerURL: jwtIssuer.issuerURI,
SkipDiscovery: odicOptions.SkipDiscovery,
JWKsURL: odicOptions.JwksURL,
} }
pv, err := internaloidc.NewProviderVerifier(context.TODO(), pvOpts) pv, err := internaloidc.NewProviderVerifier(context.TODO(), pvOpts)