From 8390bbeea1671553d6499aa2bd0fe85f6fbbe58c Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Wed, 17 Apr 2024 18:47:08 +0200 Subject: [PATCH 1/6] chore(config): [#530] remove obsolete entries from acceptedPolicies configuration --- CHANGELOG.md | 4 ++++ charts/item-relationship-service/values.yaml | 6 ------ irs-api/src/main/resources/application.yml | 6 ------ irs-registry-client/README.md | 6 ------ 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0910b38fce..76c1455396 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ _**For better traceability add the corresponding GitHub issue number in each cha ## [Unreleased] +## Changed + +- Removed obsolete entries from acceptedPolicies configuration. #530 + ## [5.0.0] - 2024-04-16 diff --git a/charts/item-relationship-service/values.yaml b/charts/item-relationship-service/values.yaml index 11e51ed895..2f60e73eb3 100644 --- a/charts/item-relationship-service/values.yaml +++ b/charts/item-relationship-service/values.yaml @@ -199,15 +199,9 @@ edc: # IRS will only negotiate contracts for offers with a policy as defined in the allowedNames list. # If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed. acceptedPolicies: - - leftOperand: "PURPOSE" - operator: "eq" - rightOperand: "ID 3.0 Trace" - leftOperand: "PURPOSE" operator: "eq" rightOperand: "ID 3.1 Trace" - - leftOperand: "PURPOSE" - operator: "eq" - rightOperand: R2_Traceability - leftOperand: "FrameworkAgreement.traceability" operator: "eq" rightOperand: "active" diff --git a/irs-api/src/main/resources/application.yml b/irs-api/src/main/resources/application.yml index 7e34c4faaf..2e1268a00c 100644 --- a/irs-api/src/main/resources/application.yml +++ b/irs-api/src/main/resources/application.yml @@ -162,15 +162,9 @@ irs-edc-client: # IRS will only negotiate contracts for offers with a policy as defined in the acceptedPolicies list. # If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed. acceptedPolicies: - - leftOperand: "PURPOSE" - operator: "eq" - rightOperand: "ID 3.0 Trace" - leftOperand: "PURPOSE" operator: "eq" rightOperand: "ID 3.1 Trace" - - leftOperand: "PURPOSE" - operator: "eq" - rightOperand: R2_Traceability - leftOperand: "FrameworkAgreement.traceability" operator: "eq" rightOperand: "active" diff --git a/irs-registry-client/README.md b/irs-registry-client/README.md index 449f64e032..15778aba25 100644 --- a/irs-registry-client/README.md +++ b/irs-registry-client/README.md @@ -67,15 +67,9 @@ irs-edc-client: # IRS will only negotiate contracts for offers with a policy as defined in the acceptedPolicies list. # If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed. acceptedPolicies: - - leftOperand: "PURPOSE" - operator: "eq" - rightOperand: "ID 3.0 Trace" - leftOperand: "PURPOSE" operator: "eq" rightOperand: "ID 3.1 Trace" - - leftOperand: "PURPOSE" - operator: "eq" - rightOperand: R2_Traceability - leftOperand: "FrameworkAgreement.traceability" operator: "eq" rightOperand: "active" From dcc771cb6c29554886103ee7ab2c9b0d4307fab1 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Thu, 18 Apr 2024 17:02:58 +0200 Subject: [PATCH 2/6] chore(owasp): [#530] replace "ID 3.0 Trace" with "ID 3.1 Trace" in tests --- .../data-sovereignty-sequence.puml | 2 +- .../JsonLdConfigurationTest.java | 2 +- .../EdcContractAgreementsResponseTest.java | 2 +- .../policy/PolicyCheckerServiceTest.java | 26 +++++++++---------- .../EdcPolicyDefinitionServiceTest.java | 4 +-- .../edc/client/testutil/TestConstants.java | 1 - .../transformer/EdcTransformerTest.java | 4 +-- .../services/PolicyStoreServiceTest.java | 2 +- local/testing/testdata/README.md | 6 ++--- 9 files changed, 24 insertions(+), 25 deletions(-) diff --git a/docs/src/uml-diagrams/data-sovereignty/data-sovereignty-sequence.puml b/docs/src/uml-diagrams/data-sovereignty/data-sovereignty-sequence.puml index d089e82689..182e0dafb5 100644 --- a/docs/src/uml-diagrams/data-sovereignty/data-sovereignty-sequence.puml +++ b/docs/src/uml-diagrams/data-sovereignty/data-sovereignty-sequence.puml @@ -30,7 +30,7 @@ note left }, "rightExpression": { "edctype": "dataspaceconnector:literalexpression", - "value": "ID 3.0 Trace" + "value": "ID 3.1 Trace" }, "operator": "EQ" } diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/configuration/JsonLdConfigurationTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/configuration/JsonLdConfigurationTest.java index ed3c61c02c..11d579dd55 100644 --- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/configuration/JsonLdConfigurationTest.java +++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/configuration/JsonLdConfigurationTest.java @@ -69,7 +69,7 @@ void shouldMapContstraints() throws JsonProcessingException { .leftExpression( new LiteralExpression("idsc:PURPOSE")) .rightExpression( - new LiteralExpression("ID 3.0 Trace")) + new LiteralExpression("ID 3.1 Trace")) .build(); final ObjectMapper objectMapper = new JsonLdConfiguration().objectMapper(); final String s = objectMapper.writeValueAsString(atomicConstraint); diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponseTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponseTest.java index 5b135ec95b..045de84d92 100644 --- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponseTest.java +++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponseTest.java @@ -50,7 +50,7 @@ void shouldParseEdcContractAgreementsResponse() throws JsonProcessingException { "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } } }, diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/PolicyCheckerServiceTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/PolicyCheckerServiceTest.java index d3d5de037e..a429081888 100644 --- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/PolicyCheckerServiceTest.java +++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/PolicyCheckerServiceTest.java @@ -71,7 +71,7 @@ void shouldRejectWrongPolicy() { @Test void shouldRejectWhenPolicyStoreIsEmpty() { // given - Policy policy = createAtomicConstraintPolicy(TestConstants.PURPOSE, TestConstants.ID_3_0_TRACE); + Policy policy = createAtomicConstraintPolicy(TestConstants.PURPOSE, TestConstants.ID_3_1_TRACE); when(policyStore.getAcceptedPolicies(any())).thenReturn(List.of()); // when boolean result = policyCheckerService.isValid(policy, "bpn"); @@ -102,12 +102,12 @@ void shouldRejectAndConstraintsWhenOnlyOneMatch() { @Test void shouldAcceptAndConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSetOfProvidedPolicy() { // given - final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, new Operator(OperatorType.EQ), - TestConstants.STATUS_ACTIVE); + final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, + new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE); final Constraint constraint2 = new Constraint(TestConstants.MEMBERSHIP, new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE); - final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, new Operator(OperatorType.EQ), - TestConstants.STATUS_ACTIVE); + final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, + new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE); final var policyList = List.of( new AcceptedPolicy(policy("and-policy", List.of(constraint1, constraint2, constraint3), List.of()), OffsetDateTime.now().plusYears(1))); @@ -127,12 +127,12 @@ void shouldAcceptAndConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSet @Test void shouldAcceptOrConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSetOfProvidedPolicy() { // given - final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, new Operator(OperatorType.EQ), - TestConstants.STATUS_ACTIVE); + final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, + new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE); final Constraint constraint2 = new Constraint(TestConstants.MEMBERSHIP, new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE); - final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, new Operator(OperatorType.EQ), - TestConstants.STATUS_ACTIVE); + final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, + new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE); final var policyList = List.of( new AcceptedPolicy(policy("and-policy", List.of(), List.of(constraint1, constraint2, constraint3)), OffsetDateTime.now().plusYears(1))); @@ -152,12 +152,12 @@ void shouldAcceptOrConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSetO @Test void shouldAcceptConstraintsWithDefaultPolicy() { // given - final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, new Operator(OperatorType.EQ), - TestConstants.STATUS_ACTIVE); + final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, + new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE); final Constraint constraint2 = new Constraint(TestConstants.MEMBERSHIP, new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE); - final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, new Operator(OperatorType.EQ), - TestConstants.STATUS_ACTIVE); + final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, + new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE); final var policyList = List.of(new AcceptedPolicy( policy("default-policy", List.of(constraint1, constraint2, constraint3), diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java index 66d59878c9..f47772e25d 100644 --- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java +++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java @@ -74,7 +74,7 @@ void setUp() { @Test void testCreatePolicyDefinitionRequest() throws JsonProcessingException, JSONException { // given - String policyName = "ID 3.0 Trace"; + String policyName = "ID 3.1 Trace"; String policyId = "4cc0bb57-2d64-4cfb-a13b-aceef3477b7e"; // when @@ -99,7 +99,7 @@ void testCreatePolicyDefinitionRequest() throws JsonProcessingException, JSONExc { "@type": "Constraint", "odrl:leftOperand": "PURPOSE", - "odrl:rightOperand": "ID 3.0 Trace", + "odrl:rightOperand": "ID 3.1 Trace", "odrl:operator": { "@id": "odrl:eq" } diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/testutil/TestConstants.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/testutil/TestConstants.java index 547255d41c..64b7684b36 100644 --- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/testutil/TestConstants.java +++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/testutil/TestConstants.java @@ -31,7 +31,6 @@ public class TestConstants { public static final String FRAMEWORK_AGREEMENT_DISMANTLER = "FrameworkAgreement.dismantler"; public static final String FRAMEWORK_AGREEMENT_TEST = "FrameworkAgreement.test"; public static final String MEMBERSHIP = "Membership"; - public static final String ID_3_0_TRACE = "ID 3.0 Trace"; public static final String ID_3_1_TRACE = "ID 3.1 Trace"; public static final String STATUS_ACTIVE = "active"; public static final String PURPOSE = "PURPOSE"; diff --git a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformerTest.java b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformerTest.java index bd9a1af69e..86c8bbf3f1 100644 --- a/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformerTest.java +++ b/irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformerTest.java @@ -87,7 +87,7 @@ class EdcTransformerTest { "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } } }, @@ -190,7 +190,7 @@ private static Policy createPolicy(final String assetId) { new LiteralExpression("idsc:PURPOSE")) .operator(Operator.EQ) .rightExpression( - new LiteralExpression("ID 3.0 Trace")) + new LiteralExpression("ID 3.1 Trace")) .build(); final OrConstraint orConstraint = OrConstraint.Builder.newInstance().constraint(atomicConstraint).build(); final Permission permission = Permission.Builder.newInstance() diff --git a/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/services/PolicyStoreServiceTest.java b/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/services/PolicyStoreServiceTest.java index 7508a276b9..802a60114c 100644 --- a/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/services/PolicyStoreServiceTest.java +++ b/irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/services/PolicyStoreServiceTest.java @@ -79,7 +79,7 @@ class PolicyStoreServiceTest { private static final String BPN = "testBpn"; - private static final String EXAMPLE_ALLOWED_NAME = "ID 3.0 Trace"; + private static final String EXAMPLE_ALLOWED_NAME = "ID 3.1 Trace"; private static final String EXAMPLE_ACCEPTED_LEFT_OPERAND = "PURPOSE"; private static final String REGISTER_POLICY_EXAMPLE_PAYLOAD = PolicyStoreControllerTest.REGISTER_POLICY_EXAMPLE_PAYLOAD; diff --git a/local/testing/testdata/README.md b/local/testing/testdata/README.md index e2f36694bf..185b0e6adc 100644 --- a/local/testing/testdata/README.md +++ b/local/testing/testdata/README.md @@ -52,12 +52,12 @@ An example policy can look like this: ```json { "policies": { - "ID 3.0 Trace": { + "ID 3.1 Trace": { "@context": { "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "PolicyDefinitionRequestDto", - "@id": "id-3.0-trace", + "@id": "id-3.1-trace", "policy": { "@type": "Policy", "odrl:permission": [ @@ -70,7 +70,7 @@ An example policy can look like this: "@type": "Constraint", "odrl:leftOperand": "idsc:PURPOSE", "odrl:operator": "EQ", - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } ] } From 8e96d22eb04cbc5b0e6db59b96ba22678ecb3988 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Thu, 18 Apr 2024 18:28:56 +0200 Subject: [PATCH 3/6] chore(owasp): [#530] replace "ID 3.0 Trace" with "ID 3.1 Trace" - correct README --- local/testing/testdata/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/local/testing/testdata/README.md b/local/testing/testdata/README.md index 185b0e6adc..091094cd93 100644 --- a/local/testing/testdata/README.md +++ b/local/testing/testdata/README.md @@ -87,8 +87,8 @@ An example policy can look like this: There are two options to apply the policy. -1. Use the parameter `-p id-3.0-trace` to apply this policy to every asset -2. Add a field `policy: "id-3.0-trace"` to the top level of each asset you want to use this policy. Every other asset +1. Use the parameter `-p id-3.1-trace` to apply this policy to every asset +2. Add a field `policy: "id-3.1-trace"` to the top level of each asset you want to use this policy. Every other asset will get the default, empty policy. It is also possible to define more than one policy at the beginning and then use the `"policy": ""` field to apply a From c3518489d1b13a745c1290e30083082c56fdb9e1 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Thu, 18 Apr 2024 18:29:16 +0200 Subject: [PATCH 4/6] chore(owasp): [#530] replace "ID 3.0 Trace" with "ID 3.1 Trace" - adjust #322 concept --- .../#322-Provisioning-of-contractAgreementId-for-assets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concept/#322-Provisioning-of-contractAgreementId-for-assets/#322-Provisioning-of-contractAgreementId-for-assets.md b/docs/concept/#322-Provisioning-of-contractAgreementId-for-assets/#322-Provisioning-of-contractAgreementId-for-assets.md index 2603d8da57..53d0124c66 100644 --- a/docs/concept/#322-Provisioning-of-contractAgreementId-for-assets/#322-Provisioning-of-contractAgreementId-for-assets.md +++ b/docs/concept/#322-Provisioning-of-contractAgreementId-for-assets/#322-Provisioning-of-contractAgreementId-for-assets.md @@ -377,7 +377,7 @@ policy store in order to receice further on assets with the specific policy. "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } } } From 89a691b087078147f4683c1ba39cec97d4fc7bd7 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Thu, 18 Apr 2024 18:29:43 +0200 Subject: [PATCH 5/6] chore(owasp): [#530] replace "ID 3.0 Trace" with "ID 3.1 Trace" - adjust test data files --- local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json | 6 +++--- .../testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json | 6 +++--- local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json | 6 +++--- ...DataIntegrity-IntegrityAspect-with-invalid-vehicles.json | 6 +++--- .../IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json | 6 +++--- .../testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity.json | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json b/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json index edb31b4812..eafb522c61 100644 --- a/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json +++ b/local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json @@ -1,11 +1,11 @@ { "policies": { - "ID 3.0 Trace": { + "ID 3.1 Trace": { "@context": { "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "PolicyDefinitionRequestDto", - "@id": "id-3.0-trace", + "@id": "id-3.1-trace", "policy": { "@type": "Policy", "odrl:permission": [ @@ -20,7 +20,7 @@ "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } ] } diff --git a/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json b/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json index 3cd3986742..2230704708 100644 --- a/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json +++ b/local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json @@ -1,11 +1,11 @@ { "policies": { - "ID 3.0 Trace": { + "ID 3.1 Trace": { "@context": { "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "PolicyDefinitionRequestDto", - "@id": "id-3.0-trace", + "@id": "id-3.1-trace", "policy": { "@type": "Policy", "odrl:permission": [ @@ -20,7 +20,7 @@ "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } ] } diff --git a/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json b/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json index a68de610f5..dd05561bff 100644 --- a/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json +++ b/local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json @@ -1,11 +1,11 @@ { "policies": { - "ID 3.0 Trace": { + "ID 3.1 Trace": { "@context": { "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "PolicyDefinitionRequestDto", - "@id": "id-3.0-trace", + "@id": "id-3.1-trace", "policy": { "@type": "Policy", "odrl:permission": [ @@ -20,7 +20,7 @@ "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" }, { "@type": "Constraint", diff --git a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect-with-invalid-vehicles.json b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect-with-invalid-vehicles.json index 3d6fe2fc95..de73957298 100644 --- a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect-with-invalid-vehicles.json +++ b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect-with-invalid-vehicles.json @@ -1,11 +1,11 @@ { "policies": { - "ID 3.0 Trace": { + "ID 3.1 Trace": { "@context": { "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "PolicyDefinitionRequestDto", - "@id": "id-3.0-trace", + "@id": "id-3.1-trace", "policy": { "@type": "Policy", "odrl:permission": [ @@ -20,7 +20,7 @@ "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } ] } diff --git a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json index 11a568597e..e1457e74d3 100644 --- a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json +++ b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json @@ -1,11 +1,11 @@ { "policies": { - "ID 3.0 Trace": { + "ID 3.1 Trace": { "@context": { "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "PolicyDefinitionRequestDto", - "@id": "id-3.0-trace", + "@id": "id-3.1-trace", "policy": { "@type": "Policy", "odrl:permission": [ @@ -20,7 +20,7 @@ "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } ] } diff --git a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity.json b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity.json index 0a526c11db..035d30662d 100644 --- a/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity.json +++ b/local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity.json @@ -1,11 +1,11 @@ { "policies": { - "ID 3.0 Trace": { + "ID 3.1 Trace": { "@context": { "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "PolicyDefinitionRequestDto", - "@id": "id-3.0-trace", + "@id": "id-3.1-trace", "policy": { "@type": "Policy", "odrl:permission": [ @@ -20,7 +20,7 @@ "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } ] } From a8bad55ecd5e03009f0d5c09892f741e7760c9e8 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Thu, 18 Apr 2024 18:34:03 +0200 Subject: [PATCH 6/6] chore(owasp): [#530] replace "ID 3.0 Trace" with "ID 3.1 Trace" - adjust EdcRegistration.registerEdcAsset --- .../tractusx/irs/ess/service/EdcRegistration.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java index 1034be723b..9af1ac74dc 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java +++ b/irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java @@ -128,8 +128,8 @@ private void registerAsset(final String assetId, final String notificationType, } } """.formatted(assetId, notificationType, essBaseUrl + path); - final var entity = restTemplate.exchange(edcProviderUrl + assetsPath, HttpMethod.POST, - toEntity(body), String.class); + final var entity = restTemplate.exchange(edcProviderUrl + assetsPath, HttpMethod.POST, toEntity(body), + String.class); if (entity.getStatusCode().is2xxSuccessful()) { log.info("Notification asset registered successfully."); @@ -160,7 +160,7 @@ private void registerPolicy(final String policyId) { "odrl:operator": { "@id": "odrl:eq" }, - "odrl:rightOperand": "ID 3.0 Trace" + "odrl:rightOperand": "ID 3.1 Trace" } ] } @@ -169,8 +169,8 @@ private void registerPolicy(final String policyId) { } } """.formatted(policyId); - final var entity = restTemplate.exchange(edcProviderUrl + policydefinitionsPath, - HttpMethod.POST, toEntity(body), String.class); + final var entity = restTemplate.exchange(edcProviderUrl + policydefinitionsPath, HttpMethod.POST, + toEntity(body), String.class); if (entity.getStatusCode().is2xxSuccessful()) { log.info("Notification policy registered successfully."); @@ -194,8 +194,8 @@ private void registerContractDefinition(final String contractId, final String as } """.formatted(contractId, contractId, assetId); - final var entity = restTemplate.exchange(edcProviderUrl + contractdefinitionsPath, - HttpMethod.POST, toEntity(body), String.class); + final var entity = restTemplate.exchange(edcProviderUrl + contractdefinitionsPath, HttpMethod.POST, + toEntity(body), String.class); if (entity.getStatusCode().is2xxSuccessful()) { log.info("Notification contract definition registered successfully."); } else {