From 6f9f970d60c12cafdd284377b2e771a219fab599 Mon Sep 17 00:00:00 2001 From: Shubham Tiwari Date: Mon, 15 Jul 2024 15:44:38 +0530 Subject: [PATCH 1/3] chore: bump jjwt to 0.12.6 --- pom.xml | 4 ++-- .../jwt/accesstoken/AccessTokenTest.java | 12 +++++----- .../jwt/client/ClientCapabilityTest.java | 10 ++++---- .../taskrouter/TaskRouterCapabilityTest.java | 8 +++---- .../jwt/validation/ValidationTokenTest.java | 24 +++++++++---------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 8e95f10179..ea25a09b60 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ 2.14.0 3.3.1 - 0.11.2 + 0.12.6 false false twilio @@ -480,4 +480,4 @@ oss-parent 7 - \ No newline at end of file + diff --git a/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java b/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java index 1cb6d868f8..a227e225ff 100644 --- a/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java +++ b/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java @@ -33,9 +33,9 @@ private void validateToken(Claims claims) { } private Claims getClaimFromJwtToken(Jwt token) { - return Jwts.parserBuilder() + return Jwts.parser() .setSigningKey(SECRET.getBytes()).build() - .parseClaimsJws(token.toJwt()) + .parseSignedClaims(token.toJwt()) .getBody(); } @@ -100,9 +100,9 @@ public void testRegion() { .region("foo") .build(); - JwsHeader header = Jwts.parserBuilder() + JwsHeader header = Jwts.parser() .setSigningKey(SECRET.getBytes()).build() - .parseClaimsJws(token.toJwt()) + .parseSignedClaims(token.toJwt()) .getHeader(); Assert.assertEquals("foo", header.get("twr")); @@ -112,9 +112,9 @@ public void testRegion() { public void testEmptyRegion() { Jwt token = new AccessToken.Builder(ACCOUNT_SID, SIGNING_KEY_SID, SECRET).build(); - JwsHeader header = Jwts.parserBuilder() + JwsHeader header = Jwts.parser() .setSigningKey(SECRET.getBytes()).build() - .parseClaimsJws(token.toJwt()) + .parseSignedClaims(token.toJwt()) .getHeader(); Assert.assertEquals(null, header.get("twr")); diff --git a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java index 7a63abb49e..ca6577ea0a 100644 --- a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java +++ b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java @@ -16,16 +16,16 @@ public class ClientCapabilityTest { private static final String ACCOUNT_SID = "AC123"; - private static final String SECRET = "secretsecretsecretsecretsecret00"; + private static final String SECRET = "secretsecretsecretsecretsecret0000"; @Test public void testEmptyToken() { Jwt jwt = new ClientCapability.Builder(ACCOUNT_SID, SECRET).build(); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(SECRET.getBytes()).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); Assert.assertEquals(ACCOUNT_SID, claims.getIssuer()); @@ -43,8 +43,8 @@ public void testToken() { Claims claims = Jwts.parser() - .setSigningKey(SECRET.getBytes()) - .parseClaimsJws(jwt.toJwt()) + .setSigningKey(SECRET).build() + .parseSignedClaims(jwt.toJwt()) .getBody(); Assert.assertEquals(ACCOUNT_SID, claims.getIssuer()); diff --git a/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java b/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java index f084174841..4bdfa9c4b7 100644 --- a/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java +++ b/src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java @@ -35,9 +35,9 @@ public void testToken() { .policies(policies) .build(); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(AUTH_TOKEN.getBytes()).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid")); @@ -78,9 +78,9 @@ public void testWorkerToken() { .policies(policies) .build(); final Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(AUTH_TOKEN.getBytes()).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid")); diff --git a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java index a1dc059534..b5a4b0918f 100644 --- a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java +++ b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java @@ -88,9 +88,9 @@ public void testTokenBuilder() { .build(); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(privateKey).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); this.validateToken(claims); @@ -113,8 +113,8 @@ public void testTokenValidAlgorithms() { .build(); Claims claims = - Jwts.parserBuilder().setSigningKey(publicKey).build() - .parseClaimsJws(jwt.toJwt()) + Jwts.parser().setSigningKey(publicKey).build() + .parseSignedClaims(jwt.toJwt()) .getBody(); validateToken(claims); } @@ -135,8 +135,8 @@ public void testTokenInvalidAlgorithms() { .build(); - Jwts.parserBuilder().setSigningKey(publicKey).build() - .parseClaimsJws(jwt.toJwt()) + Jwts.parser().setSigningKey(publicKey).build() + .parseSignedClaims(jwt.toJwt()) .getBody(); } } @@ -151,8 +151,8 @@ public void testTokenFromHttpRequest() throws IOException { Jwt jwt = ValidationToken.fromHttpRequest(ACCOUNT_SID, CREDENTIAL_SID, SIGNING_KEY_SID, privateKey, request, SIGNED_HEADERS); Claims claims = - Jwts.parserBuilder().setSigningKey(privateKey).build() - .parseClaimsJws(jwt.toJwt()) + Jwts.parser().setSigningKey(privateKey).build() + .parseSignedClaims(jwt.toJwt()) .getBody(); this.validateToken(claims); @@ -172,9 +172,9 @@ public void testTokenFromEntityRequest() throws IOException { Jwt jwt = ValidationToken.fromHttpRequest(ACCOUNT_SID, CREDENTIAL_SID, SIGNING_KEY_SID, privateKey, requestWithEntity, SIGNED_HEADERS); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(privateKey).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); this.validateToken(claims); @@ -193,9 +193,9 @@ public void testTokenFromHttpRequestWithHostPort() throws IOException { Jwt jwt = ValidationToken.fromHttpRequest(ACCOUNT_SID, CREDENTIAL_SID, SIGNING_KEY_SID, privateKey, request, SIGNED_HEADERS); Claims claims = - Jwts.parserBuilder() + Jwts.parser() .setSigningKey(privateKey).build() - .parseClaimsJws(jwt.toJwt()) + .parseSignedClaims(jwt.toJwt()) .getBody(); From 83e95e024ff9c133b244416afd891808e3768930 Mon Sep 17 00:00:00 2001 From: Shubham Tiwari Date: Mon, 22 Jul 2024 16:55:10 +0530 Subject: [PATCH 2/3] chore: changed secret --- src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java index ca6577ea0a..6685b0f9cb 100644 --- a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java +++ b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java @@ -16,7 +16,7 @@ public class ClientCapabilityTest { private static final String ACCOUNT_SID = "AC123"; - private static final String SECRET = "secretsecretsecretsecretsecret0000"; + private static final String SECRET = "secretsecretsecretsecretsecretsecretsecret00"; @Test public void testEmptyToken() { From 6ef5b64884546ca8d2ff8ee552c78d7edaacd18c Mon Sep 17 00:00:00 2001 From: Shubham Tiwari Date: Tue, 23 Jul 2024 20:22:05 +0530 Subject: [PATCH 3/3] chore: changes for jjwt --- .../java/com/twilio/jwt/accesstoken/AccessTokenTest.java | 4 ++-- .../java/com/twilio/jwt/client/ClientCapabilityTest.java | 5 +++-- .../java/com/twilio/jwt/validation/ValidationTokenTest.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java b/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java index a227e225ff..09bfb638cf 100644 --- a/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java +++ b/src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java @@ -34,8 +34,8 @@ private void validateToken(Claims claims) { private Claims getClaimFromJwtToken(Jwt token) { return Jwts.parser() - .setSigningKey(SECRET.getBytes()).build() - .parseSignedClaims(token.toJwt()) + .setSigningKey(SECRET.getBytes()).build() + .parseSignedClaims(token.toJwt()) .getBody(); } diff --git a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java index 6685b0f9cb..bd4da16d9b 100644 --- a/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java +++ b/src/test/java/com/twilio/jwt/client/ClientCapabilityTest.java @@ -6,6 +6,7 @@ import org.junit.Assert; import org.junit.Test; +import javax.crypto.spec.SecretKeySpec; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -16,7 +17,7 @@ public class ClientCapabilityTest { private static final String ACCOUNT_SID = "AC123"; - private static final String SECRET = "secretsecretsecretsecretsecretsecretsecret00"; + private static final String SECRET = "secretsecretsecretsecretsecret00"; @Test public void testEmptyToken() { @@ -43,7 +44,7 @@ public void testToken() { Claims claims = Jwts.parser() - .setSigningKey(SECRET).build() + .setSigningKey(SECRET.getBytes()).build() .parseSignedClaims(jwt.toJwt()) .getBody(); diff --git a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java index b5a4b0918f..d5b24ceb14 100644 --- a/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java +++ b/src/test/java/com/twilio/jwt/validation/ValidationTokenTest.java @@ -152,8 +152,8 @@ public void testTokenFromHttpRequest() throws IOException { Jwt jwt = ValidationToken.fromHttpRequest(ACCOUNT_SID, CREDENTIAL_SID, SIGNING_KEY_SID, privateKey, request, SIGNED_HEADERS); Claims claims = Jwts.parser().setSigningKey(privateKey).build() - .parseSignedClaims(jwt.toJwt()) - .getBody(); + .parseSignedClaims(jwt.toJwt()) + .getBody(); this.validateToken(claims); Assert.assertEquals("authorization;host", claims.get("hrh"));