Skip to content

Commit 862359e

Browse files
committed
add Header parsing
1 parent 8af2d5c commit 862359e

22 files changed

Lines changed: 649 additions & 217 deletions

‎lib/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ dependencies {
1010
compile 'commons-codec:commons-codec:1.10'
1111
testCompile 'junit:junit:4.12'
1212
testCompile 'org.hamcrest:hamcrest-library:1.3'
13+
testCompile 'org.mockito:mockito-core:2.2.8'
1314
}
Lines changed: 70 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,38 @@
11
package com.auth0.jwtdecodejava;
22

33
import com.auth0.jwtdecodejava.exceptions.JWTException;
4+
import com.auth0.jwtdecodejava.impl.JWTParser;
5+
import com.auth0.jwtdecodejava.interfaces.Claim;
46
import com.auth0.jwtdecodejava.interfaces.Header;
7+
import com.auth0.jwtdecodejava.interfaces.JWT;
58
import com.auth0.jwtdecodejava.interfaces.Payload;
6-
import com.auth0.jwtdecodejava.impl.jackson.JacksonConverter;
7-
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.sun.istack.internal.NotNull;
810

911
import java.io.IOException;
12+
import java.util.Date;
1013

11-
public class JWTDecoder {
14+
public final class JWTDecoder implements JWT {
1215

1316
private Header header;
1417
private Payload payload;
1518
private String signature;
1619

17-
public JWTDecoder(String jwt) {
20+
private JWTDecoder(String jwt) {
1821
try {
1922
parseToken(jwt);
2023
} catch (IOException e) {
2124
e.printStackTrace();
2225
}
2326
}
2427

25-
public Header getHeader() {
26-
return header;
27-
}
28-
29-
public Payload getPayload() {
30-
return payload;
31-
}
32-
33-
public String getSignature() {
34-
return signature;
28+
public static JWT decode(String jwt){
29+
return new JWTDecoder(jwt);
3530
}
3631

3732
private void parseToken(String token) throws IOException {
3833
final String[] parts = splitToken(token);
39-
final JacksonConverter converter = new JacksonConverter(new ObjectMapper());
40-
// header = converter.parseHeader(Utils.base64Decode(parts[0]));
34+
final JWTParser converter = new JWTParser();
35+
header = converter.parseHeader(Utils.base64Decode(parts[0]));
4136
payload = converter.parsePayload(Utils.base64Decode(parts[1]));
4237
signature = parts[2];
4338
}
@@ -50,4 +45,63 @@ private String[] splitToken(String token) {
5045
return parts;
5146
}
5247

48+
@Override
49+
public String getAlgorithm() {
50+
return header.getAlgorithm();
51+
}
52+
53+
@Override
54+
public String getType() {
55+
return header.getType();
56+
}
57+
58+
@Override
59+
public String getContentType() {
60+
return header.getContentType();
61+
}
62+
63+
@Override
64+
public String getIssuer() {
65+
return payload.getIssuer();
66+
}
67+
68+
@Override
69+
public String getSubject() {
70+
return payload.getSubject();
71+
}
72+
73+
@Override
74+
public String[] getAudience() {
75+
return payload.getAudience();
76+
}
77+
78+
@Override
79+
public Date getExpiresAt() {
80+
return payload.getExpiresAt();
81+
}
82+
83+
@Override
84+
public Date getNotBefore() {
85+
return payload.getNotBefore();
86+
}
87+
88+
@Override
89+
public Date getIssuedAt() {
90+
return payload.getIssuedAt();
91+
}
92+
93+
@Override
94+
public String getId() {
95+
return payload.getId();
96+
}
97+
98+
@Override
99+
public Claim getClaim(@NotNull String name) {
100+
return payload.getClaim(name);
101+
}
102+
103+
@Override
104+
public String getSignature() {
105+
return signature;
106+
}
53107
}

‎lib/src/main/java/com/auth0/jwtdecodejava/impl/BaseClaim.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

lib/src/main/java/com/auth0/jwtdecodejava/impl/jackson/ClaimImpl.java renamed to lib/src/main/java/com/auth0/jwtdecodejava/impl/ClaimImpl.java

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
package com.auth0.jwtdecodejava.impl.jackson;
1+
package com.auth0.jwtdecodejava.impl;
22

3-
import com.auth0.jwtdecodejava.impl.BaseClaim;
3+
import com.auth0.jwtdecodejava.interfaces.Claim;
44
import com.fasterxml.jackson.databind.JsonNode;
55
import com.fasterxml.jackson.databind.ObjectMapper;
6+
import com.fasterxml.jackson.databind.node.NullNode;
67
import com.sun.istack.internal.NotNull;
7-
88
import java.lang.reflect.Array;
99
import java.util.ArrayList;
1010
import java.util.Date;
1111
import java.util.List;
12+
import java.util.Map;
1213

13-
public class ClaimImpl extends BaseClaim {
14+
public class ClaimImpl implements Claim {
1415

1516
private final JsonNode data;
1617

17-
public ClaimImpl(@NotNull String name, @NotNull JsonNode node) {
18-
super(name);
19-
this.data = node;
18+
public ClaimImpl(@NotNull JsonNode node) {
19+
this.data = node == null ? NullNode.getInstance() : node;
2020
}
2121

2222
@Override
@@ -31,38 +31,41 @@ public boolean isNull() {
3131

3232
@Override
3333
public Boolean asBoolean() {
34-
return data.asBoolean();
34+
return isNull() ? null : data.asBoolean();
3535
}
3636

3737
@Override
3838
public Integer asInt() {
39-
return data.asInt();
39+
return isNull() ? null : data.asInt();
4040
}
4141

4242
@Override
4343
public Double asDouble() {
44-
return data.asDouble();
44+
return isNull() ? null : data.asDouble();
4545
}
4646

4747
@Override
4848
public String asString() {
49-
return data.asText();
49+
return isNull() ? null : data.asText();
5050
}
5151

5252
@Override
5353
public Date asDate() {
54+
if (isNull()) {
55+
return null;
56+
}
5457
long seconds = data.asLong();
5558
return new Date(seconds * 1000);
5659
}
5760

5861
@Override
5962
@SuppressWarnings("unchecked")
6063
public <T> T[] asArray(Class<T> tClazz) throws Exception {
61-
ObjectMapper mapper = new ObjectMapper();
62-
if (!data.isArray()) {
64+
if (data.isNull() || !data.isArray()) {
6365
return (T[]) Array.newInstance(tClazz, 0);
6466
}
6567

68+
ObjectMapper mapper = new ObjectMapper();
6669
T[] arr = (T[]) Array.newInstance(tClazz, data.size());
6770
for (int i = 0; i < data.size(); i++) {
6871
arr[i] = mapper.treeToValue(data.get(i), tClazz);
@@ -72,15 +75,31 @@ public <T> T[] asArray(Class<T> tClazz) throws Exception {
7275

7376
@Override
7477
public <T> List<T> asList(Class<T> tClazz) throws Exception {
75-
ObjectMapper mapper = new ObjectMapper();
76-
if (!data.isArray()) {
78+
if (data.isNull() || !data.isArray()) {
7779
return new ArrayList<>(0);
7880
}
7981

82+
ObjectMapper mapper = new ObjectMapper();
8083
List<T> list = new ArrayList<>();
8184
for (int i = 0; i < data.size(); i++) {
8285
list.add(mapper.treeToValue(data.get(i), tClazz));
8386
}
8487
return list;
8588
}
89+
90+
public static Claim extractClaim(@NotNull String claimName, @NotNull Map<String, JsonNode> tree) {
91+
JsonNode node = tree.get(claimName);
92+
return claimFromNode(node);
93+
}
94+
95+
@NotNull
96+
public static Claim claimFromNode(JsonNode node) {
97+
if (node == null || node.isMissingNode()) {
98+
return new MissingClaim();
99+
}
100+
if (node.isObject() && node.size() == 0) {
101+
return new NullClaim();
102+
}
103+
return new ClaimImpl(node);
104+
}
86105
}

lib/src/main/java/com/auth0/jwtdecodejava/impl/PublicClaims.java renamed to lib/src/main/java/com/auth0/jwtdecodejava/impl/Claims.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
package com.auth0.jwtdecodejava.impl;
22

33

4-
public final class PublicClaims {
4+
abstract class Claims {
55

6-
private PublicClaims() {
7-
}
6+
//Header
7+
public static final String ALGORITHM = "alg";
8+
public static final String CONTENT_TYPE = "cty";
9+
public static final String TYPE = "typ";
810

11+
//Payload
912
public static final String ISSUER = "iss";
1013
public static final String SUBJECT = "sub";
1114
public static final String EXPIRES_AT = "exp";
1215
public static final String NOT_BEFORE = "nbf";
1316
public static final String ISSUED_AT = "iat";
1417
public static final String JWT_ID = "jti";
1518
public static final String AUDIENCE = "aud";
19+
1620
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.auth0.jwtdecodejava.impl;
2+
3+
import com.auth0.jwtdecodejava.exceptions.JWTException;
4+
import com.fasterxml.jackson.core.JsonParser;
5+
import com.fasterxml.jackson.core.type.TypeReference;
6+
import com.fasterxml.jackson.databind.DeserializationContext;
7+
import com.fasterxml.jackson.databind.JsonNode;
8+
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
9+
10+
import java.io.IOException;
11+
import java.util.Map;
12+
13+
public class HeaderDeserializer extends StdDeserializer<HeaderImpl> {
14+
15+
public HeaderDeserializer() {
16+
this(null);
17+
}
18+
19+
protected HeaderDeserializer(Class<?> vc) {
20+
super(vc);
21+
}
22+
23+
@Override
24+
public HeaderImpl deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
25+
Map<String, JsonNode> tree = p.getCodec().readValue(p, new TypeReference<Map<String, JsonNode>>() {
26+
});
27+
if (tree == null) {
28+
throw new JWTException("Null map");
29+
}
30+
return new HeaderImpl(tree);
31+
}
32+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.auth0.jwtdecodejava.impl;
2+
3+
import com.auth0.jwtdecodejava.interfaces.Header;
4+
import com.fasterxml.jackson.databind.JsonNode;
5+
6+
import java.util.Map;
7+
8+
import static com.auth0.jwtdecodejava.impl.ClaimImpl.extractClaim;
9+
import static com.auth0.jwtdecodejava.impl.Claims.*;
10+
11+
public class HeaderImpl implements Header {
12+
private final Map<String, JsonNode> tree;
13+
14+
public HeaderImpl(Map<String, JsonNode> tree) {
15+
this.tree = tree;
16+
}
17+
18+
@Override
19+
public String getAlgorithm() {
20+
return extractClaim(ALGORITHM, tree).asString();
21+
}
22+
23+
@Override
24+
public String getType() {
25+
return extractClaim(TYPE, tree).asString();
26+
}
27+
28+
@Override
29+
public String getContentType() {
30+
return extractClaim(CONTENT_TYPE, tree).asString();
31+
}
32+
}

0 commit comments

Comments
 (0)