WIP support for JWT with Verifiable Presentation.

Signed-off-by: Markus Sabadello <[email protected]>

Author: peacekeeper

src/main/java/com/danubetech/verifiablecredentials/jwt/JwtVerifiableCredential.java

@@ -24,13 +24,16 @@ public class JwtVerifiableCredential {
 	private final JwtClaims payload;
 	private final VerifiableCredential payloadVerifiableCredential;
 
-	private JwtVerifiableCredential(JwtClaims payload, VerifiableCredential payloadVerifiableCredential) {
+	private String compactSerialization;
+
+	private JwtVerifiableCredential(JwtClaims payload, VerifiableCredential payloadVerifiableCredential, String compactSerialization) {
 
 		if (payload == null) throw new NullPointerException();
 		if (payloadVerifiableCredential == null) throw new NullPointerException();
 
 		this.payload = payload;
 		this.payloadVerifiableCredential = payloadVerifiableCredential;
+		this.compactSerialization = compactSerialization;
 	}
 
 	public static JwtVerifiableCredential fromJwt(String jwt, String algorithm, PublicKey publicKey, boolean doValidate) throws JoseException, GeneralSecurityException, InvalidJwtException {
@@ -57,7 +60,7 @@ public static JwtVerifiableCredential fromJwt(String jwt, String algorithm, Publ
 		LinkedHashMap<String, Object> jsonLdObject = (LinkedHashMap<String, Object>) jwtPayload.getClaimValue(JWT_CLAIM_VC);
 		VerifiableCredential payloadVerifiableCredential = VerifiableCredential.fromJsonLdObject(jsonLdObject, false);
 
-		return new JwtVerifiableCredential(jwtPayload, payloadVerifiableCredential);
+		return new JwtVerifiableCredential(jwtPayload, payloadVerifiableCredential, jwt);
 	}
 
 	public static JwtVerifiableCredential fromJwt(String jwt, String algorithm, PublicKey publicKey) throws JoseException, GeneralSecurityException, InvalidJwtException {
@@ -116,7 +119,7 @@ public static JwtVerifiableCredential fromVerifiableCredential(VerifiableCredent
 
 		payload.setClaim(JWT_CLAIM_VC, payloadVerifiableCredential.getJsonLdObject());
 
-		return new JwtVerifiableCredential(payload, payloadVerifiableCredential);
+		return new JwtVerifiableCredential(payload, payloadVerifiableCredential, null);
 	}
 
 	public static JwtVerifiableCredential fromVerifiableCredential(VerifiableCredential verifiableCredential) {
@@ -134,6 +137,11 @@ public VerifiableCredential getPayloadVerifiableCredential() {
 		return this.payloadVerifiableCredential;
 	}
 
+	public String getCompactSerialization() {
+
+		return this.compactSerialization;
+	}
+
 	public String toJwt(String algorithm, PrivateKey privateKey) throws JoseException {
 
 		String payload = this.getPayload().toJson();
@@ -144,7 +152,8 @@ public String toJwt(String algorithm, PrivateKey privateKey) throws JoseExceptio
 
 		jws.setKey(privateKey);
 
-		return jws.getCompactSerialization();
+		this.compactSerialization = jws.getCompactSerialization();
+		return compactSerialization;
 	}
 
 	public VerifiableCredential toVerifiableCredential() throws MalformedClaimException {

src/main/java/com/danubetech/verifiablecredentials/jwt/JwtVerifiablePresentation.java

@@ -0,0 +1,77 @@
+package com.danubetech.verifiablecredentials.jwt;
+
+import java.security.PrivateKey;
+
+import org.jose4j.jws.JsonWebSignature;
+import org.jose4j.jwt.JwtClaims;
+import org.jose4j.lang.JoseException;
+
+public class JwtVerifiablePresentation {
+
+	public static final String JWT_CLAIM_VP = "vp";
+
+	private final JwtClaims payload;
+	private final JwtVerifiableCredential payloadJwtVerifiableCredential;
+
+	private String compactSerialization;
+
+	private JwtVerifiablePresentation(JwtClaims payload, JwtVerifiableCredential payloadJwtVerifiableCredential, String compactSerialization) {
+
+		if (payload == null) throw new NullPointerException();
+		if (payloadJwtVerifiableCredential == null) throw new NullPointerException();
+
+		this.payload = payload;
+		this.payloadJwtVerifiableCredential = payloadJwtVerifiableCredential;
+		this.compactSerialization = compactSerialization;
+	}
+
+	public static JwtVerifiablePresentation fromJwtVerifiableCredential(JwtVerifiableCredential jwtVerifiableCredential, String aud) {
+
+		JwtVerifiableCredential payloadJwtVerifiableCredential = jwtVerifiableCredential;
+
+		JwtClaims payload = new JwtClaims();
+
+		if (aud != null) {
+
+			payload.setAudience(aud);
+		}
+
+		payload.setClaim(JWT_CLAIM_VP, payloadJwtVerifiableCredential.getCompactSerialization());
+
+		return new JwtVerifiablePresentation(payload, payloadJwtVerifiableCredential, null);
+	}
+
+	public static JwtVerifiablePresentation fromJwtVerifiableCredential(JwtVerifiableCredential jwtVerifiableCredential) {
+
+		return fromJwtVerifiableCredential(jwtVerifiableCredential, null);
+	}
+
+	public JwtClaims getPayload() {
+
+		return this.payload;
+	}
+
+	public JwtVerifiableCredential getPayloadJwtVerifiableCredential() {
+
+		return this.payloadJwtVerifiableCredential;
+	}
+
+	public String getCompactSerialization() {
+
+		return this.compactSerialization;
+	}
+
+	public String toJwt(String algorithm, PrivateKey privateKey) throws JoseException {
+
+		String payload = this.getPayload().toJson();
+
+		JsonWebSignature jws = new JsonWebSignature();
+		jws.setAlgorithmHeaderValue(algorithm);
+		jws.setPayload(payload);
+
+		jws.setKey(privateKey);
+
+		this.compactSerialization = jws.getCompactSerialization();
+		return compactSerialization;
+	}
+}

src/main/java/com/danubetech/verifiablecredentials/w3ctestsuite/Generator.java

@@ -18,6 +18,7 @@
 
 import com.danubetech.verifiablecredentials.VerifiableCredential;
 import com.danubetech.verifiablecredentials.jwt.JwtVerifiableCredential;
+import com.danubetech.verifiablecredentials.jwt.JwtVerifiablePresentation;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.github.jsonldjava.utils.JsonUtils;
 
@@ -59,8 +60,6 @@ public static void main(String[] args) throws Exception {
 				PrivateKey privateKey = readPrivateKey(argJwt);
 				PublicKey publicKey = readPublicKey(argJwt);
 
-				if (argPresentation) throw new RuntimeException("--jwt-presentation not supported.");
-
 				if (argDecode) {
 
 					JwtVerifiableCredential jwtVerifiableCredential = JwtVerifiableCredential.fromJwt(input, AlgorithmIdentifiers.RSA_USING_SHA256, publicKey, false);
@@ -72,12 +71,21 @@ public static void main(String[] args) throws Exception {
 					VerifiableCredential verifiableCredential = VerifiableCredential.fromJsonString(input);
 					JwtVerifiableCredential jwtVerifiableCredential = JwtVerifiableCredential.fromVerifiableCredential(verifiableCredential, argAud);
 
-					if (argNoJws) {
+					if (argPresentation) {
+
+						jwtVerifiableCredential.toJwt(AlgorithmIdentifiers.RSA_USING_SHA256, privateKey);
+						JwtVerifiablePresentation jwtVerifiablePresentation = JwtVerifiablePresentation.fromJwtVerifiableCredential(jwtVerifiableCredential, argAud);
 
-						output = jwtVerifiableCredential.getPayload().toJson();
+						output = jwtVerifiablePresentation.toJwt(AlgorithmIdentifiers.RSA_USING_SHA256, privateKey);
 					} else {
 
-						output = jwtVerifiableCredential.toJwt(AlgorithmIdentifiers.RSA_USING_SHA256, privateKey);
+						if (argNoJws) {
+
+							output = jwtVerifiableCredential.getPayload().toJson();
+						} else {
+
+							output = jwtVerifiableCredential.toJwt(AlgorithmIdentifiers.RSA_USING_SHA256, privateKey);
+						}
 					}
 				}
 			}