Skip to content
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

Fix DPoPInterceptor thread-safety #1534

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Fix DPoPInterceptor thread-safety #1534

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
11 changes: 5 additions & 6 deletions impl/src/main/java/com/okta/sdk/impl/oauth2/DPoPInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,14 @@ public class DPoPInterceptor implements ExecChainHandler {
private static final String DPOP_HEADER = "DPoP";
//nonce is valid for 24 hours, but can only refresh it when doing a token request => start refreshing after 22 hours
private static final int NONCE_VALID_SECONDS = 60 * 60 * 22;
private static final MessageDigest SHA256; //required to sign ath claim

static {
//MessageDigest is not thread-safe, need one per thread
private static final ThreadLocal<MessageDigest> SHA256 = ThreadLocal.withInitial(() -> {
try {
SHA256 = MessageDigest.getInstance("SHA-256");
return MessageDigest.getInstance("SHA-256");
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
}
});

//if null, means dpop is not enabled yet
private PrivateJwk<PrivateKey, PublicKey, ?> jwk;
Expand Down Expand Up @@ -119,7 +118,7 @@ private void processRequest(HttpRequest request, boolean tokenRequest) {
//already authenticated, need to replace Authorization header prefix and set ath claim
String token = authorization.getValue().replaceFirst("^Bearer ", "");
request.setHeader("Authorization", DPOP_HEADER + " " + token);
byte[] ath = SHA256.digest(token.getBytes(StandardCharsets.US_ASCII));
byte[] ath = SHA256.get().digest(token.getBytes(StandardCharsets.US_ASCII));
builder.claim("ath", Encoders.BASE64URL.encode(ath));
} else if (tokenRequest && nonce != null) {
//still in handshake, need to set nonce
Expand Down