From 4b1b51447830dd9e2b23b6c26f7ab0b6703d089e Mon Sep 17 00:00:00 2001 From: Dmitrii Gabor Date: Thu, 1 Oct 2026 16:04:10 +0300 Subject: [PATCH 1/2] Allow JWS header with algorithms not in the Algorithm enum JWSHeader keeps "alg" as a string, so tokens signed by a custom SignatureProvider can be parsed. getAlgorithm() returns null for algorithms not in the enum, getRawAlgorithm() returns the original value. Closes #53413 Co-Authored-By: Claude Opus 5.5 Signed-off-by: Dmitrii Gabor --- .../main/java/org/keycloak/TokenVerifier.java | 4 +- .../java/org/keycloak/jose/jws/JWSHeader.java | 24 +++++-- .../java/org/keycloak/sdjwt/JwsToken.java | 4 +- .../org/keycloak/jose/jws/JWSHeaderTest.java | 68 +++++++++++++++++++ 4 files changed, 90 insertions(+), 10 deletions(-) create mode 100644 core/src/test/java/org/keycloak/jose/jws/JWSHeaderTest.java diff --git a/core/src/main/java/org/keycloak/TokenVerifier.java b/core/src/main/java/org/keycloak/TokenVerifier.java index a9cb4b792eac..c5c5c1c634fc 100755 --- a/core/src/main/java/org/keycloak/TokenVerifier.java +++ b/core/src/main/java/org/keycloak/TokenVerifier.java @@ -31,6 +31,7 @@ import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.exceptions.TokenNotActiveException; import org.keycloak.exceptions.TokenSignatureInvalidException; +import org.keycloak.jose.jws.Algorithm; import org.keycloak.jose.jws.AlgorithmType; import org.keycloak.jose.jws.JWSHeader; import org.keycloak.jose.jws.JWSInput; @@ -440,7 +441,8 @@ public void verifySignature() throws VerificationException { throw new VerificationException(e); } } else { - AlgorithmType algorithmType = getHeader().getAlgorithm().getType(); + Algorithm algorithm = getHeader().getAlgorithm(); + AlgorithmType algorithmType = algorithm == null ? null : algorithm.getType(); if (null == algorithmType) { throw new VerificationException("Unknown or unsupported token algorithm"); } diff --git a/core/src/main/java/org/keycloak/jose/jws/JWSHeader.java b/core/src/main/java/org/keycloak/jose/jws/JWSHeader.java index bb903eb1e20d..d67853237761 100755 --- a/core/src/main/java/org/keycloak/jose/jws/JWSHeader.java +++ b/core/src/main/java/org/keycloak/jose/jws/JWSHeader.java @@ -43,7 +43,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class JWSHeader implements JOSEHeader { @JsonProperty("alg") - private Algorithm algorithm; + private String alg; @JsonProperty("typ") private String type; @@ -66,30 +66,42 @@ public JWSHeader() { } public JWSHeader(Algorithm algorithm, String type, String contentType) { - this.algorithm = algorithm; + setAlgorithm(algorithm); this.type = type; this.contentType = contentType; } public JWSHeader(Algorithm algorithm, String type, String keyId, JWK key) { - this.algorithm = algorithm; + setAlgorithm(algorithm); this.type = type; this.keyId = keyId; this.key = key; } + /** + * @return the algorithm, or {@code null} if the {@code alg} header is not one of {@link Algorithm} values + * (e.g. an algorithm implemented by a custom {@code SignatureProvider}). Use {@link #getRawAlgorithm()} to get it. + */ + @JsonIgnore public Algorithm getAlgorithm() { - return algorithm; + if (alg == null) { + return null; + } + try { + return Algorithm.valueOf(alg); + } catch (IllegalArgumentException e) { + return null; + } } public void setAlgorithm(Algorithm algorithm) { - this.algorithm = algorithm; + this.alg = algorithm == null ? null : algorithm.name(); } @JsonIgnore @Override public String getRawAlgorithm() { - return getAlgorithm().name(); + return alg; } public String getType() { diff --git a/core/src/main/java/org/keycloak/sdjwt/JwsToken.java b/core/src/main/java/org/keycloak/sdjwt/JwsToken.java index be9695fd4bc1..0f4ecc58efa9 100644 --- a/core/src/main/java/org/keycloak/sdjwt/JwsToken.java +++ b/core/src/main/java/org/keycloak/sdjwt/JwsToken.java @@ -78,9 +78,7 @@ public String sign(SignatureSignerContext signerContext) { public void verifySignature(SignatureVerifierContext verifier) throws VerificationException { Objects.requireNonNull(verifier, "verifier must not be null"); - String headerAlgorithm = jwsHeader == null || jwsHeader.getAlgorithm() == null - ? null - : jwsHeader.getRawAlgorithm(); + String headerAlgorithm = jwsHeader == null ? null : jwsHeader.getRawAlgorithm(); String verifierAlgorithm = verifier.getAlgorithm(); if (headerAlgorithm == null || verifierAlgorithm == null || !headerAlgorithm.equals(verifierAlgorithm)) { throw new VerificationException(String.format( diff --git a/core/src/test/java/org/keycloak/jose/jws/JWSHeaderTest.java b/core/src/test/java/org/keycloak/jose/jws/JWSHeaderTest.java new file mode 100644 index 000000000000..157d805b3794 --- /dev/null +++ b/core/src/test/java/org/keycloak/jose/jws/JWSHeaderTest.java @@ -0,0 +1,68 @@ +/* + * Copyright 2026 Red Hat, Inc. and/or its affiliates + * and other contributors as indicated by the @author tags. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.keycloak.jose.jws; + +import java.nio.charset.StandardCharsets; +import java.security.KeyPairGenerator; +import java.util.Base64; + +import org.keycloak.TokenVerifier; +import org.keycloak.common.VerificationException; +import org.keycloak.representations.AccessToken; +import org.keycloak.util.JsonSerialization; + +import org.junit.Assert; +import org.junit.Test; + +public class JWSHeaderTest { + + @Test + public void knownAlgorithm() throws Exception { + JWSHeader header = JsonSerialization.readValue("{\"alg\":\"ES256\",\"typ\":\"JWT\"}", JWSHeader.class); + Assert.assertEquals(Algorithm.ES256, header.getAlgorithm()); + Assert.assertEquals("ES256", header.getRawAlgorithm()); + Assert.assertEquals("{\"alg\":\"ES256\",\"typ\":\"JWT\"}", JsonSerialization.writeValueAsString(header)); + } + + @Test + public void customAlgorithm() throws Exception { + JWSHeader header = JsonSerialization.readValue("{\"alg\":\"CUSTOM256\",\"typ\":\"JWT\",\"kid\":\"k1\"}", JWSHeader.class); + Assert.assertNull(header.getAlgorithm()); + Assert.assertEquals("CUSTOM256", header.getRawAlgorithm()); + Assert.assertEquals("k1", header.getKeyId()); + Assert.assertEquals("{\"alg\":\"CUSTOM256\",\"typ\":\"JWT\",\"kid\":\"k1\"}", JsonSerialization.writeValueAsString(header)); + } + + @Test + public void customAlgorithmInToken() throws Exception { + String token = encode("{\"alg\":\"CUSTOM256\",\"typ\":\"JWT\"}") + "." + encode("{\"sub\":\"user\"}") + "." + encode("signature"); + + JWSInput input = new JWSInput(token); + Assert.assertEquals("CUSTOM256", input.getHeader().getRawAlgorithm()); + + TokenVerifier verifier = TokenVerifier.create(token, AccessToken.class) + .publicKey(KeyPairGenerator.getInstance("RSA").generateKeyPair().getPublic()); + Assert.assertEquals("user", verifier.getToken().getSubject()); + VerificationException e = Assert.assertThrows(VerificationException.class, verifier::verifySignature); + Assert.assertEquals("Unknown or unsupported token algorithm", e.getMessage()); + } + + private static String encode(String s) { + return Base64.getUrlEncoder().withoutPadding().encodeToString(s.getBytes(StandardCharsets.UTF_8)); + } +} From 9993d4a4d261654ef495305bc03028e3fc5cb8c7 Mon Sep 17 00:00:00 2001 From: Dmitrii Gabor Date: Thu, 1 Oct 2026 16:31:39 +0300 Subject: [PATCH 2/2] Use raw JWS algorithm in signature verification paths Look up signature providers by JWSHeader.getRawAlgorithm() instead of getAlgorithm().name(), so algorithms that are not in the Algorithm enum reach their providers. A missing alg is still rejected. Closes #53413 Co-Authored-By: Claude Opus 5.5 Signed-off-by: Dmitrii Gabor --- .../org/keycloak/jose/jws/JWSHeaderTest.java | 41 +++++++++++++++++++ .../client/AbstractBaseJWTValidator.java | 6 +-- .../AttestationBasedClientAuthenticator.java | 9 ++-- .../jose/jws/DefaultTokenManager.java | 11 +++-- .../organization/utils/Organizations.java | 2 +- .../keybinding/AttestationValidatorUtil.java | 8 ++-- .../keybinding/JwtProofValidator.java | 11 +++-- .../AccessTokenIntrospectionProvider.java | 2 +- .../oidc/endpoints/UserInfoEndpoint.java | 7 +--- ...eSigningAlgorithmForSignedJwtExecutor.java | 2 +- .../ClientRegistrationTokenUtils.java | 2 +- .../managers/AuthenticationManager.java | 6 +-- .../resources/LoginActionsService.java | 4 +- .../org/keycloak/services/util/DPoPUtil.java | 8 ++-- 14 files changed, 77 insertions(+), 42 deletions(-) diff --git a/core/src/test/java/org/keycloak/jose/jws/JWSHeaderTest.java b/core/src/test/java/org/keycloak/jose/jws/JWSHeaderTest.java index 157d805b3794..6b0c06e7208f 100644 --- a/core/src/test/java/org/keycloak/jose/jws/JWSHeaderTest.java +++ b/core/src/test/java/org/keycloak/jose/jws/JWSHeaderTest.java @@ -19,10 +19,12 @@ import java.nio.charset.StandardCharsets; import java.security.KeyPairGenerator; +import java.util.Arrays; import java.util.Base64; import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; +import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.representations.AccessToken; import org.keycloak.util.JsonSerialization; @@ -62,7 +64,46 @@ public void customAlgorithmInToken() throws Exception { Assert.assertEquals("Unknown or unsupported token algorithm", e.getMessage()); } + @Test + public void customAlgorithmWithVerifierContext() throws Exception { + String token = encode("{\"alg\":\"CUSTOM256\",\"typ\":\"JWT\",\"kid\":\"k1\"}") + "." + encode("{\"sub\":\"user\"}") + "." + encode("signature"); + + AccessToken accessToken = TokenVerifier.create(token, AccessToken.class) + .verifierContext(new CustomVerifier("signature")) + .verify() + .getToken(); + Assert.assertEquals("user", accessToken.getSubject()); + + TokenVerifier invalid = TokenVerifier.create(token, AccessToken.class) + .verifierContext(new CustomVerifier("other")); + Assert.assertThrows(VerificationException.class, invalid::verify); + } + private static String encode(String s) { return Base64.getUrlEncoder().withoutPadding().encodeToString(s.getBytes(StandardCharsets.UTF_8)); } + + private static class CustomVerifier implements SignatureVerifierContext { + + private final byte[] expectedSignature; + + CustomVerifier(String expectedSignature) { + this.expectedSignature = expectedSignature.getBytes(StandardCharsets.UTF_8); + } + + @Override + public String getKid() { + return "k1"; + } + + @Override + public String getAlgorithm() { + return "CUSTOM256"; + } + + @Override + public boolean verify(byte[] data, byte[] signature) { + return Arrays.equals(expectedSignature, signature); + } + } } diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractBaseJWTValidator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractBaseJWTValidator.java index 09665bd9345b..89f6307e1d9f 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractBaseJWTValidator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractBaseJWTValidator.java @@ -147,12 +147,12 @@ protected boolean isSymmetricAlgorithmAllowed() { public boolean validateSignatureAlgorithm(String expectedSignatureAlg) { JWSInput jws = clientAssertionState.getJws(); - if (jws.getHeader().getAlgorithm() == null) { + String algorithmName = jws.getHeader().getRawAlgorithm(); + + if (algorithmName == null) { return failure("Invalid signature algorithm"); } - String algorithmName = jws.getHeader().getAlgorithm().name(); - if ("none".equalsIgnoreCase(algorithmName)) { return failure("Invalid signature algorithm"); } diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/AttestationBasedClientAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/AttestationBasedClientAuthenticator.java index 78de00396288..56c474bae311 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/AttestationBasedClientAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/AttestationBasedClientAuthenticator.java @@ -45,7 +45,6 @@ import org.keycloak.exceptions.TokenVerificationException; import org.keycloak.jose.jwk.JWK; import org.keycloak.jose.jwk.JWKParser; -import org.keycloak.jose.jws.Algorithm; import org.keycloak.jose.jws.JWSInput; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.ClientModel; @@ -403,8 +402,8 @@ private void validateClientAttestationJwt(ClientAuthenticationFlowContext contex // Client Attestation JWT signature check // - Algorithm algorithm = jws.getHeader().getAlgorithm(); - SignatureProvider signatureProvider = session.getProvider(SignatureProvider.class, algorithm.name()); + String algorithm = jws.getHeader().getRawAlgorithm(); + SignatureProvider signatureProvider = algorithm == null ? null : session.getProvider(SignatureProvider.class, algorithm); if (signatureProvider == null) { throw new TokenVerificationException(attestationJwt, "Signature provider not found for algorithm: " + algorithm); } @@ -480,8 +479,8 @@ private void validateClientAttestationPoPJwt(ClientAuthenticationFlowContext con // Client Attestation PoP JWT signature check // - Algorithm algorithm = jws.getHeader().getAlgorithm(); - SignatureProvider signatureProvider = session.getProvider(SignatureProvider.class, algorithm.name()); + String algorithm = jws.getHeader().getRawAlgorithm(); + SignatureProvider signatureProvider = algorithm == null ? null : session.getProvider(SignatureProvider.class, algorithm); if (signatureProvider == null) { throw new TokenVerificationException(attestationPoPJwt, "Signature provider not found for algorithm: " + algorithm); } diff --git a/services/src/main/java/org/keycloak/jose/jws/DefaultTokenManager.java b/services/src/main/java/org/keycloak/jose/jws/DefaultTokenManager.java index 8597ab8ae21c..22a4d08eef98 100644 --- a/services/src/main/java/org/keycloak/jose/jws/DefaultTokenManager.java +++ b/services/src/main/java/org/keycloak/jose/jws/DefaultTokenManager.java @@ -97,9 +97,9 @@ public T decode(String token, Class clazz) { try { JWSInput jws = new JWSInput(token); - String signatureAlgorithm = jws.getHeader().getAlgorithm().name(); + String signatureAlgorithm = jws.getHeader().getRawAlgorithm(); - SignatureProvider signatureProvider = session.getProvider(SignatureProvider.class, signatureAlgorithm); + SignatureProvider signatureProvider = signatureAlgorithm == null ? null : session.getProvider(SignatureProvider.class, signatureAlgorithm); if (signatureProvider == null) { return null; } @@ -177,11 +177,14 @@ public T decodeClientJWT(String jwt, ClientModel client, BiConsumer T verifyJWS(ClientModel client, Class clazz, JWSInput jws, boolean allowNoneAlgorithm) { try { - String signatureAlgorithm = jws.getHeader().getAlgorithm().name(); + String signatureAlgorithm = jws.getHeader().getRawAlgorithm(); + if (signatureAlgorithm == null) { + return null; + } ClientSignatureVerifierProvider signatureProvider = session.getProvider(ClientSignatureVerifierProvider.class, signatureAlgorithm); if (signatureProvider == null) { - if (allowNoneAlgorithm && jws.getHeader().getAlgorithm().equals(org.keycloak.jose.jws.Algorithm.none)) { + if (allowNoneAlgorithm && org.keycloak.jose.jws.Algorithm.none.name().equals(signatureAlgorithm)) { return jws.readJsonContent(clazz); } return null; diff --git a/services/src/main/java/org/keycloak/organization/utils/Organizations.java b/services/src/main/java/org/keycloak/organization/utils/Organizations.java index efd16249d81d..0a81bddf78c3 100644 --- a/services/src/main/java/org/keycloak/organization/utils/Organizations.java +++ b/services/src/main/java/org/keycloak/organization/utils/Organizations.java @@ -285,7 +285,7 @@ public static InviteOrgActionToken parseInvitationToken(KeycloakSession session, .withChecks(TokenVerifier.IS_ACTIVE, new TokenVerifier.RealmUrlCheck(Urls.realmIssuer(context.getUri().getBaseUri(), realm.getName()))); - SignatureVerifierContext verifierContext = CryptoUtils.getSignatureProvider(session, verifier.getHeader().getAlgorithm().name()).verifier(verifier.getHeader().getKeyId()); + SignatureVerifierContext verifierContext = CryptoUtils.getSignatureProvider(session, verifier.getHeader().getRawAlgorithm()).verifier(verifier.getHeader().getKeyId()); verifier.verifierContext(verifierContext); return verifier.verify().getToken(); diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationValidatorUtil.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationValidatorUtil.java index 314b92e44f74..66659fbe1f71 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationValidatorUtil.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationValidatorUtil.java @@ -16,7 +16,6 @@ import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.jose.jwk.JWK; import org.keycloak.jose.jwk.JWKParser; -import org.keycloak.jose.jws.Algorithm; import org.keycloak.jose.jws.JWSHeader; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; @@ -113,13 +112,13 @@ public static KeyAttestationJwtBody validateAttestationJwt( throw new VCIssuerException(ErrorType.INVALID_PROOF, "The x5c certificate chain is not trusted by a configured attester trust provider"); } - verifier = verifierFromResolvedJWK(resolvedJwk, header.getAlgorithm().name(), keycloakSession); + verifier = verifierFromResolvedJWK(resolvedJwk, header.getRawAlgorithm(), keycloakSession); } else if (header.getKeyId() != null) { JWK resolvedJwk = keyResolver.resolveKey(header.getKeyId(), rawHeader, rawPayload); if (resolvedJwk == null) { throw new VCIssuerException(ErrorType.INVALID_PROOF, "Key with kid '" + header.getKeyId() + "' not found in trusted key registry"); } - verifier = verifierFromResolvedJWK(resolvedJwk, header.getAlgorithm().name(), keycloakSession); + verifier = verifierFromResolvedJWK(resolvedJwk, header.getRawAlgorithm(), keycloakSession); } else { throw new VCIssuerException(ErrorType.INVALID_PROOF, "Neither x5c nor kid present in attestation JWT header"); } @@ -293,8 +292,7 @@ private static Optional> resolveProofSigningAlgorithms( private static void validateJwsHeader(KeycloakSession session, JWSHeader header, VCIssuanceContext vcIssuanceContext, String proofTypeKeyForSigningAlgPolicy) { - String alg = Optional.ofNullable(header.getAlgorithm()) - .map(Algorithm::name) + String alg = Optional.ofNullable(header.getRawAlgorithm()) .orElseThrow(() -> new VCIssuerException(ErrorType.INVALID_PROOF, "Missing algorithm in JWS header")); List supportedAsymmetricAlgs = CryptoUtils.getSupportedAsymmetricSignatureAlgorithms(session); diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidator.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidator.java index 51e46a7d239e..711400d5f4ed 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidator.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidator.java @@ -153,7 +153,7 @@ private JWK validateSingleJwtProof(VCIssuanceContext vcIssuanceContext, String j Map headerClaims = JsonSerialization.mapper.convertValue(jwsHeader, new TypeReference<>() { }); - String algorithm = jwsHeader.getAlgorithm().name(); + String algorithm = jwsHeader.getRawAlgorithm(); validateNoPrivateKeyInHeaderClaims(algorithm, headerClaims); KeyAttestationInfo attestationInfo = resolveHeaderAttestation(vcIssuanceContext, headerClaims); @@ -179,7 +179,7 @@ private JWK validateSingleJwtProof(VCIssuanceContext vcIssuanceContext, String j } } } else if (jwsHeader.getX5c() != null && !jwsHeader.getX5c().isEmpty()) { - jwk = AttestationValidatorUtil.resolveJwkFromProofX5c(jwsHeader.getX5c(), jwsHeader.getAlgorithm().name()); + jwk = AttestationValidatorUtil.resolveJwkFromProofX5c(jwsHeader.getX5c(), algorithm); } else { throw new VCIssuerException(ErrorType.INVALID_PROOF, "Missing binding key. JWT must contain either jwk, kid, or x5c in header."); } @@ -198,9 +198,9 @@ private JWK validateSingleJwtProof(VCIssuanceContext vcIssuanceContext, String j AccessToken proofPayload = JsonSerialization.readValue(jwsInput.getContent(), AccessToken.class); validateProofPayload(vcIssuanceContext, proofPayload); - SignatureVerifierContext signatureVerifierContext = getVerifier(jwk, jwsHeader.getAlgorithm().name()); + SignatureVerifierContext signatureVerifierContext = getVerifier(jwk, algorithm); if (signatureVerifierContext == null) { - throw new VCIssuerException(ErrorType.INVALID_PROOF, "No verifier configured for " + jwsHeader.getAlgorithm()); + throw new VCIssuerException(ErrorType.INVALID_PROOF, "No verifier configured for " + algorithm); } if (!signatureVerifierContext.verify(jwsInput.getEncodedSignatureInput().getBytes(StandardCharsets.UTF_8), jwsInput.getSignature())) { @@ -289,8 +289,7 @@ private JWSInput getJwsInput(String jwt) throws JWSInputException { * @throws VCIssuerException */ private void validateJwsHeader(VCIssuanceContext vcIssuanceContext, JWSHeader jwsHeader) throws VCIssuerException { - String alg = Optional.ofNullable(jwsHeader.getAlgorithm()) - .map(Enum::name) + String alg = Optional.ofNullable(jwsHeader.getRawAlgorithm()) .orElseThrow(() -> new VCIssuerException(ErrorType.INVALID_PROOF, "Missing jwsHeader claim alg")); if (!CryptoUtils.getSupportedAsymmetricSignatureAlgorithms(keycloakSession).contains(alg)) { throw new VCIssuerException(ErrorType.INVALID_PROOF, "Proof signature algorithm not supported: " + alg); diff --git a/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java index 1ed4bf0ed25e..51c46e6ce62b 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java @@ -246,7 +246,7 @@ protected boolean verifyToken(String tokenStr) { TokenVerifier verifier = TokenVerifier.create(tokenStr, getTokenClass()) .realmUrl(Urls.realmIssuer(session.getContext().getUri().getBaseUri(), realm.getName())); - SignatureVerifierContext verifierContext = CryptoUtils.getSignatureProvider(session, verifier.getHeader().getAlgorithm().name()).verifier(verifier.getHeader().getKeyId()); + SignatureVerifierContext verifierContext = CryptoUtils.getSignatureProvider(session, verifier.getHeader().getRawAlgorithm()).verifier(verifier.getHeader().getKeyId()); verifier.verifierContext(verifierContext); this.token = verifier.verify().getToken(); diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java index 9cf1504224c5..2a7bf448033c 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java @@ -51,7 +51,6 @@ import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; import org.keycloak.jose.jwk.JWK; -import org.keycloak.jose.jws.Algorithm; import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.jose.jws.JWSHeader; import org.keycloak.keys.loader.PublicKeyStorageManager; @@ -199,11 +198,7 @@ private Response issueUserInfo() { verifier = DPoPUtil.withDPoPVerifier(verifier, realm, new DPoPUtil.Validator(session).request(request).uriInfo(session.getContext().getUri()).accessToken(tokenForUserInfo.getToken())); JWSHeader header = verifier.getHeader(); - Algorithm algorithm = header.getAlgorithm(); - if (algorithm == null) { - throw new VerificationException("Missing token algorithm"); - } - SignatureVerifierContext verifierContext = CryptoUtils.getSignatureProvider(session, algorithm.name()).verifier(header.getKeyId()); + SignatureVerifierContext verifierContext = CryptoUtils.getSignatureProvider(session, header.getRawAlgorithm()).verifier(header.getKeyId()); verifier.verifierContext(verifierContext); token = verifier.verify().getToken(); diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutor.java index 73664ad1c82e..605089c92efe 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutor.java @@ -116,7 +116,7 @@ private void validateSigningAlgorithm() throws ClientPolicyException { } catch (JWSInputException e) { throw new ClientPolicyException(OAuthErrorException.INVALID_REQUEST, "not allowed input format."); } - verifySecureSigningAlgorithm(jws.getHeader().getAlgorithm().name()); + verifySecureSigningAlgorithm(jws.getHeader().getRawAlgorithm()); } private boolean supportsClientAssertion(String clientAuthenticatorType) { diff --git a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java index f52afc86b957..5d7b5473a805 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java @@ -107,7 +107,7 @@ public static TokenVerification verifyToken(KeycloakSession session, RealmModel new TokenVerifierProviderManager().additionalAccessTokenVerifications(ctx); } - SignatureVerifierContext verifierContext = CryptoUtils.getSignatureProvider(session, verifier.getHeader().getAlgorithm().name()).verifier(verifier.getHeader().getKeyId()); + SignatureVerifierContext verifierContext = CryptoUtils.getSignatureProvider(session, verifier.getHeader().getRawAlgorithm()).verifier(verifier.getHeader().getKeyId()); verifier.verifierContext(verifierContext); kid = verifierContext.getKid(); diff --git a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java index 84bfdd730ab5..bfc00e757416 100755 --- a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java @@ -263,7 +263,7 @@ public static boolean expireUserSessionCookie(KeycloakSession session, UserSessi .withChecks(VALIDATE_IDENTITY_COOKIE); String kid = verifier.getHeader().getKeyId(); - String algorithm = verifier.getHeader().getAlgorithm().name(); + String algorithm = verifier.getHeader().getRawAlgorithm(); SignatureVerifierContext signatureVerifier = CryptoUtils.getSignatureProvider(session, algorithm).verifier(kid); verifier.verifierContext(signatureVerifier); @@ -1575,9 +1575,9 @@ public static AuthResult verifyIdentityToken(KeycloakSession session, RealmModel } String kid = verifier.getHeader().getKeyId(); - String algorithm = verifier.getHeader().getAlgorithm().name(); + String algorithm = verifier.getHeader().getRawAlgorithm(); - SignatureProvider signatureProvider = session.getProvider(SignatureProvider.class, algorithm); + SignatureProvider signatureProvider = algorithm == null ? null : session.getProvider(SignatureProvider.class, algorithm); if (signatureProvider == null) { logger.debugf("Invalid algorithm '%s' in the access token", algorithm); return null; diff --git a/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java b/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java index f6bb88834c44..cab84aea0827 100755 --- a/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java +++ b/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java @@ -628,9 +628,9 @@ protected Response handleActi ); String kid = verifier.getHeader().getKeyId(); - String algorithm = verifier.getHeader().getAlgorithm().name(); + String algorithm = verifier.getHeader().getRawAlgorithm(); - SignatureProvider signatureProvider = session.getProvider(SignatureProvider.class, algorithm); + SignatureProvider signatureProvider = algorithm == null ? null : session.getProvider(SignatureProvider.class, algorithm); if (signatureProvider == null) { throw new ExplainedTokenVerificationException(aToken, Errors.INVALID_SIGNATURE, Messages.INVALID_REQUEST); } diff --git a/services/src/main/java/org/keycloak/services/util/DPoPUtil.java b/services/src/main/java/org/keycloak/services/util/DPoPUtil.java index ba432da771fd..b30aa9f246b8 100644 --- a/services/src/main/java/org/keycloak/services/util/DPoPUtil.java +++ b/services/src/main/java/org/keycloak/services/util/DPoPUtil.java @@ -189,13 +189,13 @@ private static DPoP validateDPoP(KeycloakSession session, URI uri, String method throw new VerificationException("Invalid or missing type in DPoP header: " + header.getType()); } - if (header.getAlgorithm() == null) { + String algorithm = header.getRawAlgorithm(); + if (algorithm == null) { throw new VerificationException("No alg in DPoP header"); } - String algorithm = header.getAlgorithm().name(); if (!getDPoPSupportedAlgorithms(session).contains(algorithm)) { - throw new VerificationException("Unsupported DPoP algorithm: " + header.getAlgorithm()); + throw new VerificationException("Unsupported DPoP algorithm: " + algorithm); } JWK jwk = header.getKey(); @@ -223,7 +223,7 @@ private static DPoP validateDPoP(KeycloakSession session, URI uri, String method } } - key.setAlgorithm(header.getAlgorithm().name()); + key.setAlgorithm(algorithm); SignatureVerifierContext signatureVerifier = CryptoUtils.getSignatureProvider(session, algorithm).verifier(key); verifier.verifierContext(signatureVerifier);