Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/check_obligations_and_prohibitions #509

Merged
merged 4 commits into from
Jul 24, 2024
Merged

fix/check_obligations_and_prohibitions #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
585346e
fix: initial commit
eschrewe Jul 18, 2024
148704a
chore: merge main
eschrewe Jul 24, 2024
dcab4b7
fix: review issues
eschrewe Jul 24, 2024
b949272
fix: variable name
eschrewe Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...n/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,6 +1151,17 @@ public boolean testContractPolicyConstraints(JsonNode catalogEntry) {
log.debug("Constraint mismatch: we expect to have a constraint in permission node.");
return false;
}

for (String rule : new String[] {"obligation", "prohibition"}) {
var policy = catalogEntry.get(EdcRequestBodyBuilder.ODRL_NAMESPACE + "hasPolicy").get(0);
var ruleNode = policy.get(EdcRequestBodyBuilder.ODRL_NAMESPACE + rule);
boolean test = ruleNode == null || (ruleNode.isArray() && ruleNode.isEmpty());
if (!test) {
log.warn("Unexpected {} found, rejecting: {}", rule, catalogEntry.toPrettyString());
return false;
}
}

boolean result = true;

if (constraint.get().isArray() && constraint.get().size() == 2) {
Expand Down
114 changes: 111 additions & 3 deletions ...va/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import org.eclipse.tractusx.puris.backend.common.util.VariablesService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
Expand Down Expand Up @@ -59,6 +61,8 @@ public class EdcAdapterServiceTest {

private final Pattern urlPattern = PatternStore.URL_PATTERN;

private final JsonLdUtils jsonLdUtils = new JsonLdUtils();

@BeforeEach
void setUp() throws Exception {
MockitoAnnotations.openMocks(this);
Expand Down Expand Up @@ -120,7 +124,6 @@ public void correctConstraints_testContractPolicyConstraints_succeed() throws Js
"}";

JsonNode validJsonNode = objectMapper.readTree(validJson);
JsonLdUtils jsonLdUtils = new JsonLdUtils();
validJsonNode = jsonLdUtils.expand(validJsonNode);
System.out.println(validJsonNode.toPrettyString());

Expand Down Expand Up @@ -190,7 +193,6 @@ public void wrongConstraints_testContractPolicyConstraints_fails() throws JsonPr
"}";

JsonNode invalidJsonNode = objectMapper.readTree(invalidJson);
JsonLdUtils jsonLdUtils = new JsonLdUtils();
invalidJsonNode = jsonLdUtils.expand(invalidJsonNode);

// when
Expand Down Expand Up @@ -249,7 +251,6 @@ public void oneConstraint_testContractPolicyConstraints_fails() throws JsonProce
"}";

JsonNode invalidJsonNode = objectMapper.readTree(invalidJson);
JsonLdUtils jsonLdUtils = new JsonLdUtils();
invalidJsonNode = jsonLdUtils.expand(invalidJsonNode);

// when
Expand All @@ -262,4 +263,111 @@ public void oneConstraint_testContractPolicyConstraints_fails() throws JsonProce
assertFalse(result);
}

/**
* Tests policy with unexpected (non-empty) obligation or prohibition, which must be rejected
*
* @throws JsonProcessingException if json is invalid
*/
@ParameterizedTest
@ValueSource(strings = {unexpectedObligation, unexpectedProhibition})
public void unexpectedRule_testContractPolicyConstraints_fails(String input) throws JsonProcessingException {
// given
JsonNode invalidJsonNode = objectMapper.readTree(input);
invalidJsonNode = jsonLdUtils.expand(invalidJsonNode);
System.out.println(invalidJsonNode.toPrettyString());

// when
when(variablesService.getPurisFrameworkAgreementWithVersion()).thenReturn("Puris:1.0");
when(variablesService.getPurisPurposeWithVersion()).thenReturn("cx.puris.base:1");

// then
boolean result = edcAdapterService.testContractPolicyConstraints(invalidJsonNode);
assertFalse(result);
}


private final static String unexpectedProhibition = "{\n" +
" \"@id\" : \"PartTypeInformationSubmodelApi@BPNL00000007RXRX\",\n" +
" \"@type\" : \"dcat:Dataset\",\n" +
" \"odrl:hasPolicy\" : {\n" +
" \"@id\" : \"QlBOTDAwMDAwMDA3UlRVUF9jb250cmFjdGRlZmluaXRpb25fZm9yX1BhcnRUeXBlSW5mb3JtYXRpb25TdWJtb2RlbEFwaUBCUE5MMDAwMDAwMDdSWFJY:UGFydFR5cGVJbmZvcm1hdGlvblN1Ym1vZGVsQXBpQEJQTkwwMDAwMDAwN1JYUlg=:NzE3MGJmZDMtYTg5NS00YmU2LWI5Y2EtMDVhYTUwY2VjMDk2\",\n" +
" \"@type\" : \"odrl:Offer\",\n" +
" \"odrl:permission\" : {\n" +
" \"odrl:action\" : {\n" +
" \"@id\" : \"odrl:use\"\n" +
" },\n" +
" \"odrl:constraint\" : {\n" +
" \"odrl:and\" : [ {\n" +
" \"odrl:leftOperand\" : { \"@id\": \"cx-policy:FrameworkAgreement\"},\n" +
" \"odrl:operator\" : {\n" +
" \"@id\" : \"odrl:eq\"\n" +
" },\n" +
" \"odrl:rightOperand\" : \"Puris:1.0\"\n" +
" }, {\n" +
" \"odrl:leftOperand\" : { \"@id\": \"cx-policy:UsagePurpose\"},\n" +
" \"odrl:operator\" : {\n" +
" \"@id\" : \"odrl:eq\"\n" +
" },\n" +
" \"odrl:rightOperand\" : \"cx.puris.base:1\"\n" +
" } ]\n" +
" }\n" +
" },\n" +
" \"odrl:prohibition\" : [ {\"foo\": \"bar\"} ],\n" +
" \"odrl:obligation\" : [ ]\n" +
" }," +
" \"@context\": {\n" +
" \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\",\n" +
" \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n" +
" \"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n" +
" \"tx-auth\": \"https://w3id.org/tractusx/auth/\",\n" +
" \"cx-policy\": \"https://w3id.org/catenax/policy/\",\n" +
" \"dcat\": \"http://www.w3.org/ns/dcat#\",\n" +
" \"dct\": \"http://purl.org/dc/terms/\",\n" +
" \"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n" +
" \"dspace\": \"https://w3id.org/dspace/v0.8/\"\n" +
" }" +
"}";

private final static String unexpectedObligation = "{\n" +
" \"@id\" : \"PartTypeInformationSubmodelApi@BPNL00000007RXRX\",\n" +
" \"@type\" : \"dcat:Dataset\",\n" +
" \"odrl:hasPolicy\" : {\n" +
" \"@id\" : \"QlBOTDAwMDAwMDA3UlRVUF9jb250cmFjdGRlZmluaXRpb25fZm9yX1BhcnRUeXBlSW5mb3JtYXRpb25TdWJtb2RlbEFwaUBCUE5MMDAwMDAwMDdSWFJY:UGFydFR5cGVJbmZvcm1hdGlvblN1Ym1vZGVsQXBpQEJQTkwwMDAwMDAwN1JYUlg=:NzE3MGJmZDMtYTg5NS00YmU2LWI5Y2EtMDVhYTUwY2VjMDk2\",\n" +
" \"@type\" : \"odrl:Offer\",\n" +
" \"odrl:permission\" : {\n" +
" \"odrl:action\" : {\n" +
" \"@id\" : \"odrl:use\"\n" +
" },\n" +
" \"odrl:constraint\" : {\n" +
" \"odrl:and\" : [ {\n" +
" \"odrl:leftOperand\" : { \"@id\": \"cx-policy:FrameworkAgreement\"},\n" +
" \"odrl:operator\" : {\n" +
" \"@id\" : \"odrl:eq\"\n" +
" },\n" +
" \"odrl:rightOperand\" : \"Puris:1.0\"\n" +
" }, {\n" +
" \"odrl:leftOperand\" : { \"@id\": \"cx-policy:UsagePurpose\"},\n" +
" \"odrl:operator\" : {\n" +
" \"@id\" : \"odrl:eq\"\n" +
" },\n" +
" \"odrl:rightOperand\" : \"cx.puris.base:1\"\n" +
" } ]\n" +
" }\n" +
" },\n" +
" \"odrl:prohibition\" : [ ],\n" +
" \"odrl:obligation\" : [ {\"foo\": \"bar\"} ]\n" +
" }," +
" \"@context\": {\n" +
" \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\",\n" +
" \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n" +
" \"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n" +
" \"tx-auth\": \"https://w3id.org/tractusx/auth/\",\n" +
" \"cx-policy\": \"https://w3id.org/catenax/policy/\",\n" +
" \"dcat\": \"http://www.w3.org/ns/dcat#\",\n" +
" \"dct\": \"http://purl.org/dc/terms/\",\n" +
" \"odrl\": \"http://www.w3.org/ns/odrl/2/\",\n" +
" \"dspace\": \"https://w3id.org/dspace/v0.8/\"\n" +
" }" +
"}";

}
Loading