feat: fail validation if muliple operands in a Logical Constraint are…

… found (#4371)
eclipse-edc · Jul 23, 2024 · f9f4d18 · f9f4d18
1 parent 4e14377
commit f9f4d18
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/...dc/connector/controlplane/api/management/policy/validation/PolicyDefinitionValidator.java b/...dc/connector/controlplane/api/management/policy/validation/PolicyDefinitionValidator.java
@@ -146,7 +146,15 @@ private record ConstraintValidator(JsonLdPath path) implements Validator<JsonObj
 
         @Override
         public ValidationResult validate(JsonObject input) {
-            if (LOGICAL_CONSTRAINTS.stream().anyMatch(input::containsKey)) {
+            var logicalOperands = input.keySet().stream().filter(LOGICAL_CONSTRAINTS::contains).toList();
+
+            if (logicalOperands.size() > 1) {
+                return ValidationResult.failure(
+                        violation("Cannot define multiple operands in a Logical Constraint: %s".formatted(logicalOperands),
+                                path.toString()));
+            }
+
+            if (logicalOperands.size() == 1) {
                 return ValidationResult.success();
             }
 

diff --git a/...onnector/controlplane/api/management/policy/validation/PolicyDefinitionValidatorTest.java b/...onnector/controlplane/api/management/policy/validation/PolicyDefinitionValidatorTest.java
@@ -34,6 +34,7 @@
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_CONSTRAINT_ATTRIBUTE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_LEFT_OPERAND_ATTRIBUTE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_OPERATOR_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_OR_CONSTRAINT_ATTRIBUTE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_PERMISSION_ATTRIBUTE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_POLICY_TYPE_SET;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_PROFILE_ATTRIBUTE;
@@ -202,6 +203,31 @@ void shouldSucceed_whenLogicalConstraintIsPresent() {
         assertThat(result).isSucceeded();
     }
 
+    @Test
+    void shouldFail_whenLogicalConstraintWithMultipleOperandsIsPresent() {
+        var permission = createArrayBuilder().add(createObjectBuilder()
+                .add(ODRL_ACTION_ATTRIBUTE, createValidAction())
+                .add(ODRL_CONSTRAINT_ATTRIBUTE, createArrayBuilder().add(createObjectBuilder()
+                        .add(ODRL_AND_CONSTRAINT_ATTRIBUTE, createArrayBuilder())
+                        .add(ODRL_OR_CONSTRAINT_ATTRIBUTE, createArrayBuilder())
+                )));
+        var policy = createObjectBuilder()
+                .add(TYPE, policySet())
+                .add(ODRL_PERMISSION_ATTRIBUTE, permission);
+        var policyDefinition = createObjectBuilder()
+                .add(EDC_POLICY_DEFINITION_POLICY, createArrayBuilder().add(policy))
+                .build();
+
+        var result = validator.validate(policyDefinition);
+
+        assertThat(result).isFailed().extracting(ValidationFailure::getViolations).asInstanceOf(list(Violation.class))
+                .hasSize(1)
+                .anySatisfy(violation -> {
+                    assertThat(violation.message()).contains("multiple operands");
+                    assertThat(violation.path()).endsWith(ODRL_CONSTRAINT_ATTRIBUTE);
+                });
+    }
+
     @Test
     void shouldSucceed_whenProfileIsPresent() {
         var policy = createObjectBuilder()