Merge 1cb923e250 into 14af2951e5

CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ## Changes since v7.15.3
 
+- [#3472](https://github.com/oauth2-proxy/oauth2-proxy/pull/3472) fix: apply configured signing algorithms to extra JWT issuers (#3471) (@Bortlesboat)
+
 # V7.15.3
 
 ## Release Highlights

pkg/validation/options.go

@@ -61,6 +61,7 @@ func Validate(o *options.Options) error {
 				verifier, err := newVerifierFromJwtIssuer(
 					o.Providers[0].OIDCConfig.AudienceClaims,
 					o.Providers[0].OIDCConfig.ExtraAudiences,
+					o.Providers[0].OIDCConfig.EnabledSigningAlgs,
 					jwtIssuer,
 				)
 				if err != nil {
@@ -143,13 +144,8 @@ func parseJwtIssuers(issuers []string, msgs []string) ([]jwtIssuer, []string) {
 
 // newVerifierFromJwtIssuer takes in issuer information in jwtIssuer info and returns
 // a verifier for that issuer.
-func newVerifierFromJwtIssuer(audienceClaims []string, extraAudiences []string, jwtIssuer jwtIssuer) (internaloidc.IDTokenVerifier, error) {
+func newVerifierFromJwtIssuer(audienceClaims []string, extraAudiences []string, supportedSigningAlgs []string, jwtIssuer jwtIssuer) (internaloidc.IDTokenVerifier, error) {
-	pvOpts := internaloidc.ProviderVerifierOptions{
+	pvOpts := providerVerifierOptionsFromJwtIssuer(audienceClaims, extraAudiences, supportedSigningAlgs, jwtIssuer)
-		AudienceClaims: audienceClaims,
-		ClientID:       jwtIssuer.audience,
-		ExtraAudiences: extraAudiences,
-		IssuerURL:      jwtIssuer.issuerURI,
-	}
 
 	pv, err := internaloidc.NewProviderVerifier(context.TODO(), pvOpts)
 	if err != nil {
@@ -166,6 +162,16 @@ func newVerifierFromJwtIssuer(audienceClaims []string, extraAudiences []string,
 	return pv.Verifier(), nil
 }
 
+func providerVerifierOptionsFromJwtIssuer(audienceClaims []string, extraAudiences []string, supportedSigningAlgs []string, jwtIssuer jwtIssuer) internaloidc.ProviderVerifierOptions {
+	return internaloidc.ProviderVerifierOptions{
+		AudienceClaims:       audienceClaims,
+		ClientID:             jwtIssuer.audience,
+		ExtraAudiences:       extraAudiences,
+		IssuerURL:            jwtIssuer.issuerURI,
+		SupportedSigningAlgs: supportedSigningAlgs,
+	}
+}
+
 // jwtIssuer hold parsed JWT issuer info that's used to construct a verifier.
 type jwtIssuer struct {
 	issuerURI string

pkg/validation/options_test.go

@@ -107,6 +107,24 @@ func TestInitializedOptions(t *testing.T) {
 	assert.Equal(t, nil, Validate(o))
 }
 
+func TestProviderVerifierOptionsFromJwtIssuer(t *testing.T) {
+	audienceClaims := []string{"aud", "client_id"}
+	extraAudiences := []string{"extra-audience"}
+	supportedSigningAlgs := []string{"RS256", "ES256"}
+	issuer := jwtIssuer{
+		issuerURI: "https://issuer.example.com",
+		audience:  "client-id",
+	}
+
+	got := providerVerifierOptionsFromJwtIssuer(audienceClaims, extraAudiences, supportedSigningAlgs, issuer)
+
+	assert.Equal(t, audienceClaims, got.AudienceClaims)
+	assert.Equal(t, issuer.audience, got.ClientID)
+	assert.Equal(t, extraAudiences, got.ExtraAudiences)
+	assert.Equal(t, issuer.issuerURI, got.IssuerURL)
+	assert.Equal(t, supportedSigningAlgs, got.SupportedSigningAlgs)
+}
+
 // Note that it's not worth testing nonparseable URLs, since url.Parse()
 // seems to parse damn near anything.
 func TestRedirectURL(t *testing.T) {