Skip to content

DPoP replay check should take clockSkew into account Closes (26.4) #43668

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
mposolda merged 1 commit into from
Oct 24, 2025
Merged

DPoP replay check should take clockSkew into account Closes (26.4) #43668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion services/src/main/java/org/keycloak/services/util/DPoPUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ private static DPoP validateDPoP(KeycloakSession session, URI uri, String method
DPoPClaimsCheck.INSTANCE,
new DPoPHTTPCheck(uri, method),
new DPoPIsActiveCheck(session, lifetime, clockSkew),
new DPoPReplayCheck(session, lifetime));
new DPoPReplayCheck(session, lifetime + clockSkew));

if (accessToken != null) {
verifier.withChecks(new DPoPAccessTokenHashCheck(accessToken));
Expand Down
42 changes: 40 additions & 2 deletions ...ntegration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/DPoPTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,36 @@ public void testDPoPByPublicClient() throws Exception {
successTokenProceduresWithDPoP(dpopProofEcEncoded, jktEc, true, true);
}

@Test
public void testDPoPByPublicClientClockSkew() throws Exception {
getTestingClient().testing().setTestingInfinispanTimeService();
try {
sendAuthorizationRequestWithDPoPJkt(null);

// get a DPoP proof 10 seconds in the future
String dpopProofEcEncoded = generateSignedDPoPProof(UUID.randomUUID().toString(), HttpMethod.POST, oauth.getEndpoints().getToken(),
(long) (Time.currentTime() + 10), Algorithm.ES256, jwsEcHeader, ecKeyPair.getPrivate(), null);

AccessTokenResponse response = successTokenProceduresWithDPoP(dpopProofEcEncoded, jktEc, true, true, false);

setTimeOffset(25); // 25 <= 10+10+15, proof not expired because clockSkew, detected by replay check
response = oauth.refreshRequest(response.getRefreshToken()).dpopProof(dpopProofEcEncoded).send();
assertEquals(400, response.getStatusCode());
assertEquals(OAuthErrorException.INVALID_REQUEST, response.getError());
assertEquals("DPoP proof has already been used", response.getErrorDescription());

setTimeOffset(36); // 36 > 10+10+15, proof expired definitely
response = oauth.refreshRequest(response.getRefreshToken()).dpopProof(dpopProofEcEncoded).send();
assertEquals(400, response.getStatusCode());
assertEquals(response.getError(), OAuthErrorException.INVALID_REQUEST);
assertEquals("DPoP proof is not active", response.getErrorDescription());

oauth.logoutForm().idTokenHint(response.getIdToken()).open();
} finally {
getTestingClient().testing().revertTestingInfinispanTimeService();
}
}

@Test
public void testDPoPByPublicClientTokenRefreshWithoutDPoPProof() throws Exception {
// use pre-computed EC key
Expand Down Expand Up @@ -1205,7 +1235,12 @@ private void sendAuthorizationRequestWithDPoPJkt(String dpopJkt) {
oauth.loginForm().dpopJkt(dpopJkt).doLogin(TEST_USER_NAME, TEST_USER_PASSWORD);
}

private void successTokenProceduresWithDPoP(String dpopProofEncoded, String jkt, boolean accessTokenBound, boolean refreshTokenBound) throws Exception {
private AccessTokenResponse successTokenProceduresWithDPoP(String dpopProofEncoded, String jkt, boolean accessTokenBound, boolean refreshTokenBound) throws Exception {
return successTokenProceduresWithDPoP(dpopProofEncoded, jkt, accessTokenBound, refreshTokenBound, true);
}

private AccessTokenResponse successTokenProceduresWithDPoP(String dpopProofEncoded, String jkt, boolean accessTokenBound,
boolean refreshTokenBound, boolean performLogout) throws Exception {
String code = oauth.parseLoginResponse().getCode();
AccessTokenResponse response = oauth.accessTokenRequest(code).dpopProof(dpopProofEncoded).send();
assertEquals(accessTokenBound ? TokenUtil.TOKEN_TYPE_DPOP : TokenUtil.TOKEN_TYPE_BEARER, response.getTokenType());
Expand Down Expand Up @@ -1256,7 +1291,10 @@ private void successTokenProceduresWithDPoP(String dpopProofEncoded, String jkt,
}

// logout
oauth.logoutForm().idTokenHint(response.getIdToken()).open();
if (performLogout) {
oauth.logoutForm().idTokenHint(response.getIdToken()).open();
}
return response;
}

private void failureRefreshTokenProceduresWithoutDPoP(String dpopProofEncoded, String jkt) throws Exception {
Expand Down
Loading