feat: add ABAC extension

edc-controlplane/edc-controlplane-construct-x/con-x-controlplane-postgresql-hashicorp-vault/build.gradle.kts

@@ -37,8 +37,8 @@ dependencies {
     implementation("org.eclipse.tractusx.edc:agreements:$txVersion")
     implementation("org.eclipse.tractusx.edc:retirement-evaluation-store-sql:$txVersion")
     implementation(project(":edc-extensions:agreements:retirement-evaluation-bootstrapping"))
-    implementation("org.eclipse.tractusx.edc:tx-dcp:$txVersion")
     implementation(project(":edc-extensions:dynamic-issuers"))
+    implementation(project(":edc-extensions:basic-abac"))
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

edc-controlplane/edc-controlplane-construct-x/con-x-controlplane-postgresql-vault/build.gradle.kts

@@ -36,8 +36,8 @@ dependencies {
 
     implementation("org.eclipse.tractusx.edc:agreements:$txVersion")
     implementation("org.eclipse.tractusx.edc:retirement-evaluation-store-sql:$txVersion")
+    implementation(project(":edc-extensions:basic-abac"))
     implementation(project(":edc-extensions:agreements:retirement-evaluation-bootstrapping"))
-    implementation("org.eclipse.tractusx.edc:tx-dcp:$txVersion")
     implementation(project(":edc-extensions:dynamic-issuers"))
 }
 

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/environments/local-con-x-env.bru

@@ -6,12 +6,7 @@ vars {
   CONSUMER_IDHUB_ID_API: http://localhost:20100/api/identity
   CONSUMER_IDHUB_STS_API: http://localhost:20500/api/sts
   CONSUMER_IDHUB_CREDS_API: http://localhost:20600/api/credentials
-  ISSUER_APIKEY: Y29uLXgtaXNzdWVy.P3ROSh354pDFG8vOq4DB+lChxi4A6vIcbI/07UvwnKTIKl43pousUO0hu5fH28YnuQzbVF1meRBWjKU55/PT/g==
-  CONSUMER_IH_APIKEY: dXNlci1jb25zdW1lcg==.dMQICllhhPpgGtJBMWn2uKnH4+lkLAAD2PcPjn6iAIlMKBXUPmFHShj+HNYUDOY4zPQqwqBZ+cki4Mhtu7oyvw==
-  PROVIDER_IH_APIKEY: dXNlci1wcm92aWRlcg==.cdX1+2gWJtn9LKO/z2wkYwuybBhBRTQmFw5Se0CSvFq8ZEPSaDjskG15nmUx0iFKfXYEDase6yTEVlqQKoleQQ==
   VAULTURL: http://localhost:8200
-  CONSUMER_STS_SECRET: fGznFfHH2skwmCJ4
-  PROVIDER_STS_SECRET: DA9ujfJuoWgPPafQ
   PROVIDER_MANAGEMENT: http://localhost:39010/management
   CONSUMER_MANAGEMENT: http://localhost:29010/management
   PROVIDER_DATAPLANE_PUBLIC: http://localhost:9500/public
@@ -22,14 +17,11 @@ vars {
   ISS_ID: did:web:local-issuer-wallet:con-x-issuer
   CONS_ID: did:web:consumer-wallet:user:consumer
   PROV_ID: did:web:provider-wallet:user:provider
-  cons_access_token: eyJraWQiOiJkaWQ6d2ViOmNvbnN1bWVyLXdhbGxldDp1c2VyOmNvbnN1bWVyI2tleS0xIiwiYWxnIjoiRWQyNTUxOSJ9.eyJhdWQiOiJkaWQ6d2ViOmNvbnN1bWVyLXdhbGxldDp1c2VyOmNvbnN1bWVyIiwic3ViIjoiZGlkOndlYjpwcm92aWRlci13YWxsZXQ6dXNlcjpwcm92aWRlciIsIm5iZiI6MTc4ODI1NzYxOCwic2NvcGUiOiJvcmcuZWNsaXBzZS5kc3BhY2UuZGNwLnZjLnR5cGU6TWVtYmVyc2hpcENyZWRlbnRpYWw6cmVhZCIsImlzcyI6ImRpZDp3ZWI6Y29uc3VtZXItd2FsbGV0OnVzZXI6Y29uc3VtZXIiLCJleHAiOjE3ODgyNTc5MTgsImlhdCI6MTc4ODI1NzYxOCwianRpIjoiYWNjZXNzdG9rZW4tNjc1NDk4Y2QtOTQ3ZC00NjZmLWI0OTMtZjgxZTRhMjNlMDg3In0.su14qdbmn1zgBAbhSeamzEOC8Gk66pdb9XUFTQKuLRG3Om7MefQUzUTyjcNNzpqbUCGC2DV6h1jK6RmHfFdYAA
-  prov_access_token: eyJraWQiOiJkaWQ6d2ViOnByb3ZpZGVyLXdhbGxldDp1c2VyOnByb3ZpZGVyI2tleS0xIiwiYWxnIjoiRWQyNTUxOSJ9.eyJzdWIiOiJkaWQ6d2ViOnByb3ZpZGVyLXdhbGxldDp1c2VyOnByb3ZpZGVyIiwiYXVkIjoiZGlkOndlYjpjb25zdW1lci13YWxsZXQ6dXNlcjpjb25zdW1lciIsIm5iZiI6MTc4ODI1NzYxOSwiaXNzIjoiZGlkOndlYjpwcm92aWRlci13YWxsZXQ6dXNlcjpwcm92aWRlciIsImV4cCI6MTc4ODI1NzkxOSwiaWF0IjoxNzg4MjU3NjE5LCJqdGkiOiJhOTY5ODA4Zi1lZjU0LTRjNWEtOTE3YS05Mjk2NTc3YjQzYWUiLCJ0b2tlbiI6ImV5SnJhV1FpT2lKa2FXUTZkMlZpT21OdmJuTjFiV1Z5TFhkaGJHeGxkRHAxYzJWeU9tTnZibk4xYldWeUkydGxlUzB4SWl3aVlXeG5Jam9pUldReU5UVXhPU0o5LmV5SmhkV1FpT2lKa2FXUTZkMlZpT21OdmJuTjFiV1Z5TFhkaGJHeGxkRHAxYzJWeU9tTnZibk4xYldWeUlpd2ljM1ZpSWpvaVpHbGtPbmRsWWpwd2NtOTJhV1JsY2kxM1lXeHNaWFE2ZFhObGNqcHdjbTkyYVdSbGNpSXNJbTVpWmlJNk1UYzRPREkxTnpZeE9Dd2ljMk52Y0dVaU9pSnZjbWN1WldOc2FYQnpaUzVrYzNCaFkyVXVaR053TG5aakxuUjVjR1U2VFdWdFltVnljMmhwY0VOeVpXUmxiblJwWVd3NmNtVmhaQ0lzSW1semN5STZJbVJwWkRwM1pXSTZZMjl1YzNWdFpYSXRkMkZzYkdWME9uVnpaWEk2WTI5dWMzVnRaWElpTENKbGVIQWlPakUzT0RneU5UYzVNVGdzSW1saGRDSTZNVGM0T0RJMU56WXhPQ3dpYW5ScElqb2lZV05qWlhOemRHOXJaVzR0TmpjMU5EazRZMlF0T1RRM1pDMDBOalptTFdJME9UTXRaamd4WlRSaE1qTmxNRGczSW4wLnN1MTRxZGJtbjF6Z0JBYmhTZWFtekVPQzhHazY2cGRiOVhVRlRRS3VMUkczT203TWVmUVV6VVR5amNOTnpwcWJVQ0dDMkRWNmgxaks2Um1IZkZkWUFBIn0.-1wCoJjyw-KNOerivpCBmT0_hBV6wf2DySFScBKuN9HBt23AjckxNJ7NrQJNlfU5LlWf3RJr3jr6iXDlwryRDw
-  offerId: MQ==:YXNzZXRJZA==:N2RjZjc1OTktZTQzMy00NmY3LThlOTEtMWVjZTc3YzNlOWM1
-  negotiation-id: 50dc06d7-bc96-40b1-9274-1eb7117d6dbb
-  transferId: 175f3962-2fc2-46ab-ba9e-1da78b7ad685
-  pullSecret: eyJraWQiOiJwcm92X3B1YiIsImFsZyI6IlJTMjU2In0.eyJpc3MiOiJhbm9ueW1vdXMiLCJhdWQiOiJkaWQ6d2ViOmNvbnN1bWVyLXdhbGxldDp1c2VyOmNvbnN1bWVyIiwic3ViIjoiYW5vbnltb3VzIiwiaWF0IjoxNzg4MjU3NjQxLCJqdGkiOiIxMzQwZmI3YS1lNDhjLTQ5ODQtYTEwZi0yODI0NGIwOTc2NjkifQ.RmjZ_Ac5iUoWnbRWm3Lz3ylSka5qPGXtAS_Ono1vzE-qUGerYKthdfXMmI0Qa11RLas2ZPbzaYctoHYvIVHoQkv9dYkjjffb_I48QgSMNIJmxOF9snagBmo6ehwMpd0GSO_B2fjeh_qYcLuiHofz8bp6Ff7N1K1dsPKeM5KsPrr1ClBoSzxWB1uCVsh8zM7QIhdliGuVvkPLcWHqIrks4smj4PfNMgkpZTE3PwEu-1LKKPY95_5cbaqPD1F9yeqL1rkr39ZJ-P0hlmVs13a5oSThl1wdtqijfpNeDPvgX-h0TJ4UCSSnTqO8aKCxyjVMhqfBsaz_mCI7VFrC9HOHBQ
   ISS_PART_CONT: con-x-issuer
   CONS_PART_CONT: user-consumer
   PROV_PART_CONT: user-provider
-  contractId: 6fba2299-5a7e-4bdf-b1b6-c0b609fde33c
+  MEM_CRED_ID: https://w3id.org/constructx/credentials/v1.0/ConstructXMembershipCredential
+  CUSTOM_CRED_ID: https://foo.org/constructx/bar/credentials/v1/Baustelle123Credential
+  TARGET_ASSET_ID: demoAssetIdOne
+  CRFORMAT: VC1_0_JWT
 }

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Inspect Outcome/ShowConsumerCredentials.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{CONSUMER_IDHUB_ID_API}}/v1alpha/credentials
+  url: {{CONSUMER_IDHUB_ID_API}}/v1beta/credentials
   body: none
   auth: none
 }

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Inspect Outcome/ShowProviderCredentials.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{PROVIDER_IDHUB_ID_API}}/v1alpha/credentials
+  url: {{PROVIDER_IDHUB_ID_API}}/v1beta/credentials
   body: none
   auth: none
 }

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Consumer ID/CreateConsumerParticipant.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{CONSUMER_IDHUB_ID_API}}/v1alpha/participants
+  url: {{CONSUMER_IDHUB_ID_API}}/v1beta/participants
   body: json
   auth: inherit
 }
@@ -26,7 +26,7 @@ body:json {
       {
         "id": "ConsumerIssuerService-ID",
         "type": "IssuerService",
-        "serviceEndpoint": "http://consumer-wallet:13132/api/issuance/v1alpha/participants/{{CONS_PART_CONT}}"
+        "serviceEndpoint": "http://consumer-wallet:13132/api/issuance/v1beta/participants/{{CONS_PART_CONT}}"
       }
     ],
     "active": true,
@@ -52,11 +52,11 @@ script:pre-request {
 script:post-response {
   const apiKey = res.getBody().apiKey.trim();
   if (apiKey) {
-    bru.setEnvVar("CONSUMER_IH_APIKEY", apiKey);
+    bru.setVar("CONSUMER_IH_APIKEY", apiKey);
   }
   const stsSecret = res.getBody().clientSecret.trim();
   if (stsSecret) {
-    bru.setEnvVar("CONSUMER_STS_SECRET", stsSecret)
+    bru.setVar("CONSUMER_STS_SECRET", stsSecret)
   }
 }
 

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Consumer ID/Get Consumer DID Doc.bru

@@ -1,7 +1,7 @@
 meta {
   name: Get Consumer DID Doc
   type: http
-  seq: 3
+  seq: 4
 }
 
 get {

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Consumer ID/RequestConsumerDevMemCredential.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{CONSUMER_IDHUB_ID_API}}/v1alpha/participants/{{CONS_PART_CONT}}/credentials/request
+  url: {{CONSUMER_IDHUB_ID_API}}/v1beta/participants/{{CONS_PART_CONT}}/credentials/request
   body: json
   auth: none
 }
@@ -14,8 +14,8 @@ body:json {
   {
       "issuerDid": "{{ISS_ID}}",
       "credentials": [{
-          "format": "VC1_0_JWT",
-          "type": "MembershipCredential", 
+          "format": "{{CRFORMAT}}",
+          "type": "{{MEM_CRED_ID}}", 
           "id": "dev-credential-def-1"
       }]
   }
@@ -25,7 +25,7 @@ script:pre-request {
   const cons_id = bru.getEnvVar("CONS_ID");
   const participantContext = cons_id.split(":").slice(3).join(":").replace(/:/g, "-");
   bru.setEnvVar("CONS_PART_CONT", participantContext);
-  req.setHeader("x-api-key", bru.getEnvVar("CONSUMER_IH_APIKEY"));
+  req.setHeader("x-api-key", bru.getVar("CONSUMER_IH_APIKEY"));
 }
 
 settings {

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Consumer ID/RequestCustomCredential.bru

@@ -0,0 +1,34 @@
+meta {
+  name: RequestCustomCredential
+  type: http
+  seq: 3
+}
+
+post {
+  url: {{CONSUMER_IDHUB_ID_API}}/v1beta/participants/{{CONS_PART_CONT}}/credentials/request
+  body: json
+  auth: none
+}
+
+body:json {
+  {
+      "issuerDid": "{{ISS_ID}}",
+      "credentials": [{
+          "format": "{{CRFORMAT}}",
+          "type": "{{CUSTOM_CRED_ID}}", 
+          "id": "customCredentialTypeId"
+      }]
+  }
+}
+
+script:pre-request {
+  const cons_id = bru.getEnvVar("CONS_ID");
+  const participantContext = cons_id.split(":").slice(3).join(":").replace(/:/g, "-");
+  bru.setEnvVar("CONS_PART_CONT", participantContext);
+  req.setHeader("x-api-key", bru.getVar("CONSUMER_IH_APIKEY"));
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Consumer ID/VaultSecret test.bru

@@ -1,7 +1,7 @@
 meta {
   name: VaultSecret test
   type: http
-  seq: 5
+  seq: 6
 }
 
 get {

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Consumer ID/VaultSecret.bru

@@ -1,7 +1,7 @@
 meta {
   name: VaultSecret
   type: http
-  seq: 4
+  seq: 5
 }
 
 post {

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Issuer/CreateIssuerParticipant.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{ISSUER_ID_API}}/v1alpha/participants
+  url: {{ISSUER_ID_API}}/v1beta/participants
   body: json
   auth: inherit
 }
@@ -21,7 +21,7 @@ body:json {
       {
         "id": "IssuerIssuerService-ID",
         "type": "IssuerService",
-        "serviceEndpoint": "http://local-issuer-wallet:13132/api/issuance/v1alpha/participants/{{ISS_PART_CONT}}"
+        "serviceEndpoint": "http://local-issuer-wallet:13132/api/issuance/v1beta/participants/{{ISS_PART_CONT}}"
       },
       {
         "id": "IssuerCredentialService-ID",
@@ -52,7 +52,7 @@ script:pre-request {
 script:post-response {
   const apiKey = res.getBody().apiKey.trim();
   if (apiKey) {
-    bru.setEnvVar("ISSUER_APIKEY", apiKey);
+    bru.setVar("ISSUER_APIKEY", apiKey);
   }
 }
 

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Issuer/addConsumerHolder.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{ISSUER_ISS_API}}/v1alpha/participants/{{ISS_PART_CONT}}/holders
+  url: {{ISSUER_ISS_API}}/v1beta/participants/{{ISS_PART_CONT}}/holders
   body: json
   auth: inherit
 }
@@ -23,7 +23,7 @@ script:pre-request {
   const participantContext = cons_id.split(":").slice(3).join(":").replace(/:/g, "-");
   bru.setEnvVar("CONS_PART_CONT", participantContext);
 
-  req.setHeader("x-api-key", bru.getEnvVar("ISSUER_APIKEY"));
+  req.setHeader("x-api-key", bru.getVar("ISSUER_APIKEY"));
 }
 
 settings {

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Issuer/addProviderHolder.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{ISSUER_ISS_API}}/v1alpha/participants/{{ISS_PART_CONT}}/holders
+  url: {{ISSUER_ISS_API}}/v1beta/participants/{{ISS_PART_CONT}}/holders
   body: json
   auth: inherit
 }
@@ -23,7 +23,7 @@ script:pre-request {
   const participantContext = prov_id.split(":").slice(3).join(":").replace(/:/g, "-");
   bru.setEnvVar("PROV_PART_CONT", participantContext);
 
-  req.setHeader("x-api-key", bru.getEnvVar("ISSUER_APIKEY"));
+  req.setHeader("x-api-key", bru.getVar("ISSUER_APIKEY"));
 }
 
 settings {

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Issuer/createCustomAttestation.bru

@@ -0,0 +1,42 @@
+meta {
+  name: createCustomAttestation
+  type: http
+  seq: 7
+}
+
+post {
+  url: {{ISSUER_ISS_API}}/v1beta/participants/{{ISS_PART_CONT}}/attestations
+  body: json
+  auth: none
+}
+
+headers {
+  ~x-api-key: {{ISSUER_APIKEY}}
+}
+
+body:json {
+  {
+    "attestationType": "dev",
+    "id": "customAttestationID",
+    "configuration": {
+      "default": {
+        "accessLevels": {
+          "fooLevel": 3,
+          "barLevel": {
+            "role": "Sheriff"
+          }
+        }
+      },
+      "blackList": []
+    }
+  }
+}
+
+script:pre-request {
+  req.setHeader("x-api-key", bru.getVar("ISSUER_APIKEY"));
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Issuer/createCustomCredentialDef.bru

@@ -0,0 +1,42 @@
+meta {
+  name: createCustomCredentialDef
+  type: http
+  seq: 8
+}
+
+post {
+  url: {{ISSUER_ISS_API}}/v1beta/participants/{{ISS_PART_CONT}}/credentialdefinitions
+  body: json
+  auth: inherit
+}
+
+body:json {
+  {
+    "attestations": [
+      "customAttestationID"
+    ],
+    "credentialType": "{{CUSTOM_CRED_ID}}",
+    "id": "customCredentialTypeId",
+    "jsonSchema": "{}",
+    "jsonSchemaUrl": "https://example.com/schema/dev-credential.json",
+    "mappings": [
+      {
+        "input": "content",
+        "output": "credentialSubject",
+        "required": true
+      }
+    ],
+    "rules": [],
+    "format": "{{CRFORMAT}}",
+    "validity": 15552000
+  }
+}
+
+script:pre-request {
+  req.setHeader("x-api-key", bru.getVar("ISSUER_APIKEY"));
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

edc-controlplane/edc-controlplane-construct-x/local/bruno/con-x-local-test/identities/Prepare Issuer/createDevAttestation.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{ISSUER_ISS_API}}/v1alpha/participants/{{ISS_PART_CONT}}/attestations
+  url: {{ISSUER_ISS_API}}/v1beta/participants/{{ISS_PART_CONT}}/attestations
   body: json
   auth: none
 }
@@ -19,34 +19,16 @@ body:json {
     "attestationType": "dev",
     "id": "dev-def-1",
     "configuration": {
-      "{{CONS_ID}}": {
-        "isConsumer": true,
-        "isProvider": false,
-        "foo": {
-          "bar": 123
-        }
-      },
-      "{{PROV_ID}}": {
-        "isConsumer": false,
-        "isProvider": true,
-        "foo": {
-          "bar": 789
-        }
-      },
       "default": {
-        "isConsumer": false,
-        "isProvider": false,
-        "foo": {
-          "bar": 0
-        }
+        "isMember": true
       },
       "blackList": []
     }
   }
 }
 
 script:pre-request {
-  req.setHeader("x-api-key", bru.getEnvVar("ISSUER_APIKEY"));
+  req.setHeader("x-api-key", bru.getVar("ISSUER_APIKEY"));
 }
 
 settings {