Skip to content

remove jti from the required claims for jwt client authentication #3577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strehle merged 6 commits into from
Jan 8, 2026
+10 −7
Merged

remove jti from the required claims for jwt client authentication #3577

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7525d6
remove jti from the required claims for jwt client authentication
strehle Aug 9, 2025
5154675
Merge remote-tracking branch 'origin/develop' into fix/issue/3569
strehle Dec 24, 2025
57cd0f3
split required claims
strehle Dec 27, 2025
cff3a28
Update server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/J…
strehle Dec 30, 2025
c2f87c9
Update server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/J…
strehle Dec 31, 2025
6c1981b
fix rename from copilot
strehle Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/JwtClientAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ public class JwtClientAuthentication {

// no signature check with invalid algorithms
private static final Set<Algorithm> NOT_SUPPORTED_ALGORITHMS = Set.of(Algorithm.NONE, JWSAlgorithm.HS256, JWSAlgorithm.HS384, JWSAlgorithm.HS512);
private static final Set<String> JWT_REQUIRED_CLAIMS = Set.of(ClaimConstants.ISS, ClaimConstants.SUB, ClaimConstants.AUD,
ClaimConstants.EXPIRY_IN_SECONDS, ClaimConstants.JTI);
private static final Set<String> JWT_RFC7523_CLAIMS = Set.of(ClaimConstants.ISS, ClaimConstants.SUB, ClaimConstants.AUD,
ClaimConstants.EXPIRY_IN_SECONDS);
private static final Set<String> JWT_OIDC_CLAIMS = Set.of(ClaimConstants.ISS, ClaimConstants.SUB, ClaimConstants.AUD,
ClaimConstants.EXPIRY_IN_SECONDS, ClaimConstants.JTI);

private final KeyInfoService keyInfoService;
private final OidcMetadataFetcher oidcMetadataFetcher;
Expand Down Expand Up @@ -160,7 +162,7 @@ public boolean validateClientJwt(Map<String, String[]> requestParameters, Client
// Validate token according to private_key_jwt with OIDC
return clientId.equals(validateClientJWToken(clientJWT, oidcMetadataFetcher == null ? new JWKSet() :
JWKSet.parse(oidcMetadataFetcher.fetchWebKeySet(clientJwtConfiguration).getKeySetMap()),
clientId, clientId, keyInfoService.getTokenEndpointUrl()).getSubject());
JWT_OIDC_CLAIMS, clientId, clientId, keyInfoService.getTokenEndpointUrl()).getSubject());
} else {
// Check if we found trust for private_key_jwt with RFC 7523. We allow client_id (from request) != sub (client_assertion)
ClientJwtCredential jwtFederation = getClientJwtFederation(clientJwtConfiguration, clientClaims);
Expand Down Expand Up @@ -217,11 +219,12 @@ public static String getClientIdOidcAssertion(String clientAssertion) {
}
}

// Validate federated client with RFC 7523
private boolean validateFederatedClientWT(JWT jwtAssertion, JWTClaimsSet clientClaims, ClientJwtCredential jwtFederation) throws OidcMetadataFetchingException, ParseException {
try {
JWKSet jwkSet = retrieveJwkSet(clientClaims);
String expectedAud = Optional.ofNullable(jwtFederation.getAudience()).orElse(keyInfoService.getTokenEndpointUrl());
return validateClientJWToken(jwtAssertion, jwkSet, jwtFederation.getSubject(), jwtFederation.getIssuer(), expectedAud) != null;
return validateClientJWToken(jwtAssertion, jwkSet, JWT_RFC7523_CLAIMS, jwtFederation.getSubject(), jwtFederation.getIssuer(), expectedAud) != null;
} catch (MalformedURLException | IllegalArgumentException | URISyntaxException e) {
return false;
}
Expand Down Expand Up @@ -270,7 +273,7 @@ private JWKSet retrieveJwkSet(JWTClaimsSet clientClaims) throws MalformedURLExce
}
}

private JWTClaimsSet validateClientJWToken(JWT jwtAssertion, JWKSet jwkSet, String expectedSub, String expectIss, String expectedAud) {
private JWTClaimsSet validateClientJWToken(JWT jwtAssertion, JWKSet jwkSet, Set<String> requiredClaims, String expectedSub, String expectIss, String expectedAud) {
if (Optional.ofNullable(jwkSet).orElse(new JWKSet()).isEmpty()) {
throw new BadCredentialsException("Bad empty jwk_set");
}
Expand All @@ -284,7 +287,7 @@ private JWTClaimsSet validateClientJWToken(JWT jwtAssertion, JWKSet jwkSet, Stri
jwtProcessor.setJWSKeySelector(keySelector);

JWTClaimsSet.Builder claimSetBuilder = new JWTClaimsSet.Builder().issuer(expectIss).subject(expectedSub);
jwtProcessor.setJWTClaimsSetVerifier(new DefaultJWTClaimsVerifier<>(expectedAud, claimSetBuilder.build(), JWT_REQUIRED_CLAIMS));
jwtProcessor.setJWTClaimsSetVerifier(new DefaultJWTClaimsVerifier<>(expectedAud, claimSetBuilder.build(), requiredClaims));

try {
return jwtProcessor.process(jwtAssertion, null);
Expand Down
Loading