Skip to content

Don't assume secrets are Base64 encoded #2

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

Closed
wants to merge 1 commit into from
Closed

Don't assume secrets are Base64 encoded #2

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
19 changes: 14 additions & 5 deletions src/main/java/com/auth0/jwt/JWTVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import java.io.IOException;
import java.nio.charset.Charset;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.SignatureException;
Expand All @@ -23,7 +24,7 @@
*/
public class JWTVerifier {

private final String secret;
private final byte[] secret;
private final String audience;
private final String issuer;
private final Base64 decoder;
Expand All @@ -32,8 +33,8 @@ public class JWTVerifier {

private Map<String, String> algorithms;

public JWTVerifier(String secret, String audience, String issuer) {
if (secret == null || "".equals(secret)) {
public JWTVerifier(byte[] secret, String audience, String issuer) {
if (secret == null || secret.length == 0) {
throw new IllegalArgumentException("Secret cannot be null or empty");
}

Expand All @@ -45,11 +46,19 @@ public JWTVerifier(String secret, String audience, String issuer) {
algorithms.put("HS384", "HmacSHA384");
algorithms.put("HS512", "HmacSHA512");

this.secret = secret;
this.secret = secret.clone();
this.audience = audience;
this.issuer = issuer;
}

public JWTVerifier(byte[] secret, String audience) {
this(secret, audience, null);
}

public JWTVerifier(String secret, String audience, String issuer) {
this((secret == null) ? null : secret.getBytes(Charset.forName("UTF-8")), audience, issuer);
}

public JWTVerifier(String secret, String audience) {
this(secret, audience, null);
}
Expand Down Expand Up @@ -100,7 +109,7 @@ public Map<String, Object> verify(String token)

void verifySignature(String[] pieces, String algorithm) throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
Mac hmac = Mac.getInstance(algorithm);
hmac.init(new SecretKeySpec(decoder.decodeBase64(secret), algorithm));
hmac.init(new SecretKeySpec(secret, algorithm));
byte[] sig = hmac.doFinal(new StringBuilder(pieces[0]).append(".").append(pieces[1]).toString().getBytes());

if (!Arrays.equals(sig, decoder.decodeBase64(pieces[2]))) {
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/auth0/jwt/JWTVerifierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ public void shouldFailOnInvalidSignature() throws Exception {
"." +
"suchsignature_plzvalidate_zomgtokens";
String secret = "AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow";
new JWTVerifier(secret, "audience").verifySignature(jws.split("\\."), "HmacSHA256");
new JWTVerifier(Base64.decodeBase64(secret), "audience")
.verifySignature(jws.split("\\."), "HmacSHA256");
}

@Test
Expand All @@ -85,7 +86,7 @@ public void shouldVerifySignature() throws Exception {
"." +
"dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk";
final String secret = "AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow";
new JWTVerifier(secret, "audience")
new JWTVerifier(Base64.decodeBase64(secret), "audience")
.verifySignature(jws.split("\\."), "HmacSHA256");
}

Expand Down