Fixed JsonLd as verification input. Check participant exists before verifying.

Author: espona

federated-catalog/src/main/java/org/eclipse/edc/heleade/federated/catalog/extension/api/node/directory/ParticipantNode.java

@@ -386,7 +386,7 @@ public static  Map<String, Object> getMapFromArrayJsonObject(JsonObject jsonObje
      * @param key the key in the JSON object whose value is an array of JSON objects
      * @return a map where keys are the "@id" values and values are the "@value" values from the array's JSON objects
      */
-    public static  Map<String, String> getStringMapFromJsonObject(JsonObject jsonObject, String key) {
+    public static Map<String, String> getStringMapFromJsonObject(JsonObject jsonObject, String key) {
         Map<String, String> results = new HashMap<>();
         if (jsonObject.containsKey(key)) {
             JsonObject object = jsonObject.getJsonObject(key);
@@ -428,8 +428,12 @@ public static  Map<String, String> getStringMapFromArrayJsonObject(JsonObject js
 
     /**
      * Helper method to extract a string value from a JSON object.
+     *
+     * @param jsonObject the JSON object containing the target array
+     * @param key the key in the JSON object whose value is an array of JSON objects
+     * @return the extracted string values
      */
-    private static String getStringValue(JsonObject jsonObject, String key) {
+    public static String getStringValue(JsonObject jsonObject, String key) {
         if (jsonObject.containsKey(key)) {
             var valueArray = jsonObject.getJsonArray(key);
             if (valueArray != null && !valueArray.isEmpty()) {

federated-catalog/src/main/java/org/eclipse/edc/heleade/federated/catalog/extension/api/verification/VerificationApiController.java

@@ -38,6 +38,8 @@
 
 import static org.eclipse.edc.heleade.commons.verification.claims.Claims.verifyClaims;
 import static org.eclipse.edc.heleade.commons.verification.claims.Claims.verifySignature;
+import static org.eclipse.edc.heleade.federated.catalog.extension.api.node.directory.ParticipantNode.getMapFromArrayJsonObject;
+import static org.eclipse.edc.heleade.federated.catalog.extension.api.node.directory.ParticipantNode.getStringValue;
 import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE;
 
 
@@ -89,15 +91,25 @@ public JsonObject verify(String body) {
         JsonObject jsonBody = jsonReader.readObject();
         jsonReader.close();
 
+        JsonObject jsonLdBody = jsonLd.expand(jsonBody).getContent();
+
         // get the inputs from the body
-        String id = jsonBody.getString(EDC_NAMESPACE + "participantId");
-        String participantSignedClaims = jsonBody.getString(EDC_NAMESPACE + "signedClaims");
-        Map<String, Object> participantClaims = getMapFromJsonObject(jsonBody.getJsonObject(EDC_NAMESPACE + "claims"));
-        JsonObject participantClaimsJson = jsonBody.getJsonObject(EDC_NAMESPACE + "claims");
+        String id = getStringValue(jsonLdBody, EDC_NAMESPACE + "participantId");
+        String participantSignedClaims = getStringValue(jsonLdBody, EDC_NAMESPACE + "signedClaims");
+        Map<String, Object> participantClaims = getMapFromArrayJsonObject(jsonLdBody, EDC_NAMESPACE + "claims");
+        JsonObject participantClaimsJson = getJsonObjectFromStringMap(participantClaims);
         String claimsString = participantClaimsJson.toString();
 
-        // check the signature
+        // check participant is registered
         ParticipantNode participantNode = targetNodeDirectory.getParticipantNode(id);
+        if (participantNode == null) {
+            return Json.createObjectBuilder()
+                    .add("error", "Participant not registered in federated catalog")
+                    .add("verifySignatureSuccess", false)
+                    .add("verifyClaimsSuccess", false).build();
+        }
+
+        // check the signature
         String pem = participantNode.security().get(EDC_NAMESPACE + "pem");
         boolean verifySignatureSuccess = verifySignature(typeManager.getMapper(), pem, participantSignedClaims, claimsString);
         JsonObjectBuilder builder = Json.createObjectBuilder();
@@ -113,6 +125,19 @@ public JsonObject verify(String body) {
         return builder.build();
     }
 
+    private JsonObject getJsonObjectFromStringMap(Map<String, Object> map) {
+        JsonObjectBuilder builder = Json.createObjectBuilder();
+        for (String key : map.keySet()) {
+            Object value = map.get(key);
+            if (value instanceof String) {
+                builder.add(key, (String) value);
+            } else {
+                throw new IllegalArgumentException("Invalid type for key: " + key);
+            }
+        }
+        return builder.build();
+    }
+
     private Map<String, Object> getMapFromJsonObject(JsonObject jsonObject) {
         Map<String, Object> map = new HashMap<String, Object>();
         for (String key : jsonObject.keySet()) {