fix: prevent 'invalid Uri' error (#689)

* fix: prevent 'invalid Uri' error when creating verificationMethod for proofDraft

* test: add test for 'invalid Uri' error when creating verificationMethod for proofDraft

* fix: add variable to compose controller and keyId

Author: u-veys

core/identity-hub-core/src/main/java/org/eclipse/edc/identityhub/core/services/verifiablepresentation/generators/LdpPresentationGenerator.java

@@ -159,7 +159,12 @@ private JsonArray toJsonArray(List<VerifiableCredentialContainer> credentials) {
     }
 
     private JsonObject signPresentation(JsonObject presentationObject, SignatureSuite suite, String suiteIdentifier, PrivateKey pk, String publicKeyId, String controller) {
-        var keyIdUri = URI.create(publicKeyId);
+        var composedKeyId = publicKeyId;
+        if (!publicKeyId.startsWith(controller)) {
+            composedKeyId = controller + "#" + publicKeyId;
+        }
+
+        var keyIdUri = URI.create(composedKeyId);
         var controllerUri = URI.create(controller);
         var verificationMethodType = URI.create(suiteIdentifier);
 
@@ -169,7 +174,7 @@ private JsonObject signPresentation(JsonObject presentationObject, SignatureSuit
 
         var proofDraft = Jws2020ProofDraft.Builder.newInstance()
                 .proofPurpose(ASSERTION_METHOD)
-                .verificationMethod(new JsonWebKeyPair(URI.create(controller + "#" + publicKeyId), verificationMethodType, controllerUri, null))
+                .verificationMethod(new JsonWebKeyPair(keyIdUri, verificationMethodType, controllerUri, null))
                 .created(Instant.now())
                 .mapper(typeManager.getMapper(typeContext))
                 .build();

core/identity-hub-core/src/test/java/org/eclipse/edc/identityhub/core/services/verifiablepresentation/generators/LdpPresentationGeneratorTest.java

@@ -154,6 +154,17 @@ public void create_whenVcsEmpty_shouldReturnEmptyVp() {
         assertThat(result).isNotNull();
     }
 
+    @Test
+    public void create_whenPublicKeyContainsController() {
+        var ldpVc = TestData.LDP_VC_WITH_PROOF;
+        var vcc = new VerifiableCredentialContainer(ldpVc, CredentialFormat.VC1_0_LD, createDummyCredential());
+        var publicKeyIdWithController = ADDITIONAL_DATA.get("controller").toString() + "#" + PUBLIC_KEY_ID;
+
+        var result = creator.generatePresentation(List.of(vcc), PRIVATE_KEY_ALIAS, publicKeyIdWithController, issuerId, ADDITIONAL_DATA);
+        assertThat(result).isNotNull();
+        assertThat(result.get("https://w3id.org/security#proof")).isNotNull();
+    }
+
     @NotNull
     private TitaniumJsonLd initializeJsonLd() {
         var jld = new TitaniumJsonLd(mock());