fix: Don't preserve contexts when constructing proof options

Author: peacekeeper

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

@@ -104,16 +104,17 @@ public DataIntegrityProof sign(JsonLDObject jsonLdObject, boolean addToJsonLdObj
 
         this.loadMissingContext(jsonLdObject);
 
-        // add LD contexts to LD proof options if missing
+        // construct LD proof options
 
-        if (dataIntegrityProof.getContexts() == null || dataIntegrityProof.getContexts().isEmpty()) {
-            JsonLDUtils.jsonLdAdd(dataIntegrityProof, Keywords.CONTEXT, jsonLdObject.getContexts().stream().map(JsonLDUtils::uriToString).filter(Objects::nonNull).toList());
+        DataIntegrityProof ldProofOptions = DataIntegrityProof.fromJson(dataIntegrityProof.toJson());
+        if (ldProofOptions.getContexts() == null || ldProofOptions.getContexts().isEmpty()) {
+            JsonLDUtils.jsonLdAdd(ldProofOptions, Keywords.CONTEXT, jsonLdObject.getContexts().stream().map(JsonLDUtils::uriToString).filter(Objects::nonNull).toList());
         }
 
         // obtain the canonicalized document
 
-        Canonicalizer canonicalizer = this.getCanonicalizer(dataIntegrityProof);
-        byte[] canonicalizationResult = canonicalizer.canonicalize(dataIntegrityProof, jsonLdObject);
+        Canonicalizer canonicalizer = this.getCanonicalizer(ldProofOptions);
+        byte[] canonicalizationResult = canonicalizer.canonicalize(ldProofOptions, jsonLdObject);
         if (log.isDebugEnabled()) log.debug("Canonicalization result with {}: {}", canonicalizer.getClass().getSimpleName(), Hex.encodeHexString(canonicalizationResult));
 
         // sign

src/main/java/com/danubetech/dataintegrity/verifier/LdVerifier.java

@@ -58,21 +58,22 @@ public boolean verify(JsonLDObject jsonLdObject, DataIntegrityProof dataIntegrit
 
         this.initialize(dataIntegrityProof);
 
-        // add LD contexts to LD proof options if missing
+        // construct LD proof options
 
-        if (dataIntegrityProof.getContexts() == null || dataIntegrityProof.getContexts().isEmpty()) {
-            JsonLDUtils.jsonLdAdd(dataIntegrityProof, Keywords.CONTEXT, jsonLdObject.getContexts().stream().map(JsonLDUtils::uriToString).filter(Objects::nonNull).toList());
+        DataIntegrityProof ldProofOptions = DataIntegrityProof.fromJson(dataIntegrityProof.toJson());
+        if (ldProofOptions.getContexts() == null || ldProofOptions.getContexts().isEmpty()) {
+            JsonLDUtils.jsonLdAdd(ldProofOptions, Keywords.CONTEXT, jsonLdObject.getContexts().stream().map(JsonLDUtils::uriToString).filter(Objects::nonNull).toList());
         }
 
         // obtain the canonicalized document
 
-        Canonicalizer canonicalizer = this.getCanonicalizer(dataIntegrityProof);
-        byte[] canonicalizationResult = canonicalizer.canonicalize(dataIntegrityProof, jsonLdObject);
+        Canonicalizer canonicalizer = this.getCanonicalizer(ldProofOptions);
+        byte[] canonicalizationResult = canonicalizer.canonicalize(ldProofOptions, jsonLdObject);
         if (log.isDebugEnabled()) log.debug("Canonicalization result with {}: {}", canonicalizer.getClass().getSimpleName(), Hex.encodeHexString(canonicalizationResult));
 
         // verify
 
-        boolean verify = this.verify(canonicalizationResult, dataIntegrityProof);
+        boolean verify = this.verify(canonicalizationResult, ldProofOptions);
         if (log.isDebugEnabled()) log.debug("Verified data integrity proof: {} --> {}", dataIntegrityProof, verify);
 
         // done