Merge branch 'refactor-signing'

Author: peacekeeper

src/main/java/com/danubetech/dataintegrity/signer/BbsBlsSignature2020LdSigner.java

@@ -9,9 +9,11 @@
 import com.danubetech.keyformats.crypto.ByteSigner;
 import com.danubetech.keyformats.crypto.impl.Bls12381G2_BBSPlus_PrivateKeySigner;
 import com.danubetech.keyformats.jose.JWSAlgorithm;
+import foundation.identity.jsonld.JsonLDObject;
 import io.ipfs.multibase.Multibase;
 
 import java.security.GeneralSecurityException;
+import java.util.Objects;
 
 public class BbsBlsSignature2020LdSigner extends LdSigner<BbsBlsSignature2020DataIntegritySuite> {
 
@@ -27,6 +29,12 @@ public BbsBlsSignature2020LdSigner() {
 		this((ByteSigner) null);
 	}
 
+    @Override
+    public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> proofOptionsBuilder, JsonLDObject jsonLDObject) throws GeneralSecurityException {
+        proofOptionsBuilder.forceContextsArray(true).contexts(jsonLDObject.getContexts().stream().filter(Objects::nonNull).toList());
+    }
+
+    @Override
 	public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
 		return URDNA2015SHA256Canonicalizer.getInstance();
 	}

src/main/java/com/danubetech/dataintegrity/signer/DataIntegrityProofLdSigner.java

@@ -5,11 +5,13 @@
 import com.danubetech.dataintegrity.suites.DataIntegrityProofDataIntegritySuite;
 import com.danubetech.dataintegrity.suites.DataIntegritySuites;
 import com.danubetech.keyformats.crypto.ByteSigner;
+import foundation.identity.jsonld.JsonLDObject;
 import io.ipfs.multibase.Multibase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.security.GeneralSecurityException;
+import java.util.Objects;
 
 public class DataIntegrityProofLdSigner extends LdSigner<DataIntegrityProofDataIntegritySuite> {
 
@@ -24,7 +26,7 @@ public DataIntegrityProofLdSigner() {
 	}
 
 	@Override
-	public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> ldProofBuilder) throws GeneralSecurityException {
+	public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> proofOptionsBuilder, JsonLDObject jsonLDObject) throws GeneralSecurityException {
 
 		// determine algorithm and cryptosuite
 
@@ -37,9 +39,15 @@ public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.B
 			}
 		} else {
 			cryptosuite = DataIntegritySuites.DATA_INTEGRITY_SUITE_DATAINTEGRITYPROOF.findDefaultCryptosuiteForJwsAlgorithm(algorithm);
-			ldProofBuilder.cryptosuite(cryptosuite);
+			proofOptionsBuilder.cryptosuite(cryptosuite);
 		}
 		if (log.isDebugEnabled()) log.debug("Determined algorithm {} and cryptosuite: {}", algorithm, cryptosuite);
+
+        // determine @context
+
+        if (cryptosuite.contains("rdfc")) {
+            proofOptionsBuilder.forceContextsArray(true).contexts(jsonLDObject.getContexts().stream().filter(Objects::nonNull).toList());
+        }
 	}
 
 	@Override

src/main/java/com/danubetech/dataintegrity/signer/EcdsaKoblitzSignature2016LdSigner.java

@@ -14,10 +14,12 @@
 import com.nimbusds.jose.JWSHeader;
 import com.nimbusds.jose.JWSSigner;
 import com.nimbusds.jose.util.Base64URL;
+import foundation.identity.jsonld.JsonLDObject;
 import org.bitcoinj.crypto.ECKey;
 
 import java.security.GeneralSecurityException;
 import java.util.Collections;
+import java.util.Objects;
 
 public class EcdsaKoblitzSignature2016LdSigner extends LdSigner<EcdsaKoblitzSignature2016DataIntegritySuite> {
 
@@ -33,6 +35,12 @@ public EcdsaKoblitzSignature2016LdSigner() {
 		this((ByteSigner) null);
 	}
 
+    @Override
+    public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> proofOptionsBuilder, JsonLDObject jsonLDObject) throws GeneralSecurityException {
+        proofOptionsBuilder.forceContextsArray(true).contexts(jsonLDObject.getContexts().stream().filter(Objects::nonNull).toList());
+    }
+
+    @Override
 	public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
 		return URDNA2015SHA256Canonicalizer.getInstance();
 	}

src/main/java/com/danubetech/dataintegrity/signer/EcdsaSecp256k1Signature2019LdSigner.java

@@ -14,10 +14,12 @@
 import com.nimbusds.jose.JWSHeader;
 import com.nimbusds.jose.JWSSigner;
 import com.nimbusds.jose.util.Base64URL;
+import foundation.identity.jsonld.JsonLDObject;
 import org.bitcoinj.crypto.ECKey;
 
 import java.security.GeneralSecurityException;
 import java.util.Collections;
+import java.util.Objects;
 
 public class EcdsaSecp256k1Signature2019LdSigner extends LdSigner<EcdsaSecp256k1Signature2019DataIntegritySuite> {
 
@@ -33,6 +35,12 @@ public EcdsaSecp256k1Signature2019LdSigner() {
 		this((ByteSigner) null);
 	}
 
+    @Override
+    public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> proofOptionsBuilder, JsonLDObject jsonLDObject) throws GeneralSecurityException {
+        proofOptionsBuilder.forceContextsArray(true).contexts(jsonLDObject.getContexts().stream().filter(Objects::nonNull).toList());
+    }
+
+    @Override
 	public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
 		return URDNA2015SHA256Canonicalizer.getInstance();
 	}

src/main/java/com/danubetech/dataintegrity/signer/EcdsaSecp256r1Signature2019LdSigner.java

@@ -8,10 +8,12 @@
 import com.danubetech.keyformats.crypto.ByteSigner;
 import com.danubetech.keyformats.crypto.impl.P_256_ES256_PrivateKeySigner;
 import com.danubetech.keyformats.jose.JWSAlgorithm;
+import foundation.identity.jsonld.JsonLDObject;
 import io.ipfs.multibase.Multibase;
 
 import java.security.GeneralSecurityException;
 import java.security.interfaces.ECPrivateKey;
+import java.util.Objects;
 
 public class EcdsaSecp256r1Signature2019LdSigner extends LdSigner<EcdsaSecp256r1Signature2019DataIntegritySuite> {
 
@@ -27,6 +29,12 @@ public EcdsaSecp256r1Signature2019LdSigner() {
 		this((ByteSigner) null);
 	}
 
+    @Override
+    public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> proofOptionsBuilder, JsonLDObject jsonLDObject) throws GeneralSecurityException {
+        proofOptionsBuilder.forceContextsArray(true).contexts(jsonLDObject.getContexts().stream().filter(Objects::nonNull).toList());
+    }
+
+    @Override
 	public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
 		return URDNA2015SHA256Canonicalizer.getInstance();
 	}

src/main/java/com/danubetech/dataintegrity/signer/EcdsaSecp384r1Signature2019LdSigner.java

@@ -8,10 +8,12 @@
 import com.danubetech.keyformats.crypto.ByteSigner;
 import com.danubetech.keyformats.crypto.impl.P_384_ES384_PrivateKeySigner;
 import com.danubetech.keyformats.jose.JWSAlgorithm;
+import foundation.identity.jsonld.JsonLDObject;
 import io.ipfs.multibase.Multibase;
 
 import java.security.GeneralSecurityException;
 import java.security.interfaces.ECPrivateKey;
+import java.util.Objects;
 
 public class EcdsaSecp384r1Signature2019LdSigner extends LdSigner<EcdsaSecp384r1Signature2019DataIntegritySuite> {
 
@@ -27,6 +29,12 @@ public EcdsaSecp384r1Signature2019LdSigner() {
 		this((ByteSigner) null);
 	}
 
+    @Override
+    public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> proofOptionsBuilder, JsonLDObject jsonLDObject) throws GeneralSecurityException {
+        proofOptionsBuilder.forceContextsArray(true).contexts(jsonLDObject.getContexts().stream().filter(Objects::nonNull).toList());
+    }
+
+    @Override
 	public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
 		return URDNA2015SHA384Canonicalizer.getInstance();
 	}

src/main/java/com/danubetech/dataintegrity/signer/Ed25519Signature2018LdSigner.java

@@ -14,9 +14,11 @@
 import com.nimbusds.jose.JWSHeader;
 import com.nimbusds.jose.JWSSigner;
 import com.nimbusds.jose.util.Base64URL;
+import foundation.identity.jsonld.JsonLDObject;
 
 import java.security.GeneralSecurityException;
 import java.util.Collections;
+import java.util.Objects;
 
 public class Ed25519Signature2018LdSigner extends LdSigner<Ed25519Signature2018DataIntegritySuite> {
 
@@ -32,6 +34,12 @@ public Ed25519Signature2018LdSigner() {
 		this((ByteSigner) null);
 	}
 
+    @Override
+    public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> proofOptionsBuilder, JsonLDObject jsonLDObject) throws GeneralSecurityException {
+        proofOptionsBuilder.forceContextsArray(true).contexts(jsonLDObject.getContexts().stream().filter(Objects::nonNull).toList());
+    }
+
+    @Override
 	public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
 		return URDNA2015SHA256Canonicalizer.getInstance();
 	}

src/main/java/com/danubetech/dataintegrity/signer/Ed25519Signature2020LdSigner.java

@@ -8,9 +8,11 @@
 import com.danubetech.keyformats.crypto.ByteSigner;
 import com.danubetech.keyformats.crypto.impl.Ed25519_EdDSA_PrivateKeySigner;
 import com.danubetech.keyformats.jose.JWSAlgorithm;
+import foundation.identity.jsonld.JsonLDObject;
 import io.ipfs.multibase.Multibase;
 
 import java.security.GeneralSecurityException;
+import java.util.Objects;
 
 public class Ed25519Signature2020LdSigner extends LdSigner<Ed25519Signature2020DataIntegritySuite> {
 
@@ -26,6 +28,12 @@ public Ed25519Signature2020LdSigner() {
 		this((ByteSigner) null);
 	}
 
+    @Override
+    public void initialize(DataIntegrityProof.Builder<? extends DataIntegrityProof.Builder<?>> proofOptionsBuilder, JsonLDObject jsonLDObject) throws GeneralSecurityException {
+        proofOptionsBuilder.forceContextsArray(true).contexts(jsonLDObject.getContexts().stream().filter(Objects::nonNull).toList());
+    }
+
+    @Override
 	public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
 		return URDNA2015SHA256Canonicalizer.getInstance();
 	}

src/main/java/com/danubetech/dataintegrity/signer/JcsEcdsaSecp256k1Signature2019LdSigner.java

@@ -28,6 +28,7 @@ public JcsEcdsaSecp256k1Signature2019LdSigner() {
 		this((ByteSigner) null);
 	}
 
+    @Override
 	public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
 		return JCSSHA256Canonicalizer.getInstance();
 	}

src/main/java/com/danubetech/dataintegrity/signer/JcsEd25519Signature2020LdSigner.java

@@ -8,6 +8,7 @@
 import com.danubetech.keyformats.crypto.ByteSigner;
 import com.danubetech.keyformats.crypto.impl.Ed25519_EdDSA_PrivateKeySigner;
 import com.danubetech.keyformats.jose.JWSAlgorithm;
+import foundation.identity.jsonld.JsonLDObject;
 import io.ipfs.multibase.Base58;
 
 import java.security.GeneralSecurityException;
@@ -27,6 +28,7 @@ public JcsEd25519Signature2020LdSigner() {
 		this((ByteSigner) null);
 	}
 
+    @Override
 	public Canonicalizer getCanonicalizer(DataIntegrityProof dataIntegrityProof) {
 		return JCSSHA256Canonicalizer.getInstance();
 	}