Skip to content

Update com.auth0:java-jwt to 4.4.0 #259

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
merged 1 commit into from
Sep 23, 2024
Merged

Update com.auth0:java-jwt to 4.4.0 #259

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 api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.17.0</version>
<version>4.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
6 changes: 4 additions & 2 deletions api/src/main/java/com/messagebird/RequestValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
import com.auth0.jwt.algorithms.Algorithm;
import com.auth0.jwt.exceptions.JWTVerificationException;
import com.auth0.jwt.exceptions.SignatureVerificationException;
import com.auth0.jwt.interfaces.Clock;
import com.auth0.jwt.interfaces.Claim;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.auth0.jwt.interfaces.JWTVerifier;
import com.messagebird.exceptions.RequestValidationException;

import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.time.Clock;

/**
* RequestValidator validates request signature signed by MessageBird services.
Expand Down Expand Up @@ -128,7 +129,8 @@ public DecodedJWT validateSignature(Clock clock, String signature, String url, b
if (!skipURLValidation)
builder.withClaim("url_hash", calculateSha256(url.getBytes()));

boolean payloadHashClaimExist = !jwt.getClaim("payload_hash").isNull();
Claim payloadHashClaim = jwt.getClaim("payload_hash");
boolean payloadHashClaimExist = !(payloadHashClaim.isNull() || payloadHashClaim.isMissing());
if (requestBody != null && requestBody.length > 0) {
if (!payloadHashClaimExist) {
throw new RequestValidationException("The Claim 'payload_hash' is not set but payload is present.");
Expand Down
9 changes: 4 additions & 5 deletions api/src/test/java/com/messagebird/RequestValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.messagebird;

import com.auth0.jwt.interfaces.Clock;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.messagebird.exceptions.RequestValidationException;
Expand All @@ -13,7 +12,10 @@

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.time.Clock;
import java.time.Instant;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -64,10 +66,7 @@ public static Collection<Object[]> data() throws IOException {
public void testWebhookSignature() throws Throwable {
RequestValidator validator = new RequestValidator(testCase.secret != null ? testCase.secret : "");

Clock clock = mock(Clock.class);
Date clockDate = spy(Date.from(OffsetDateTime.parse(testCase.timestamp).toInstant()));
when(clock.getToday()).thenReturn(clockDate);

Clock clock = Clock.fixed(OffsetDateTime.parse(testCase.timestamp).toInstant(), ZoneId.systemDefault());
ThrowingRunnable runnable = () -> validator.validateSignature(clock, testCase.token, testCase.url,
(testCase.payload == null) ? null : testCase.payload.getBytes(StandardCharsets.UTF_8));

Expand Down