Upgrade to 0.1.0 of product-edc and 0.0.1-20220818-SNAPSHOT of upstream

.github/workflows/kics.yml

@@ -49,7 +49,7 @@ jobs:
       # Upload findings to GitHub Advanced Security Dashboard
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
         if: always()
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: kicsResults/results.sarif
 

.github/workflows/trivy.yml

@@ -42,7 +42,7 @@ jobs:
           severity: "CRITICAL,HIGH"
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         if: always()
         with:
           sarif_file: "trivy-results1.sarif"
@@ -76,6 +76,6 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: "trivy-results2.sarif"

api-wrapper/config/consumer-control-plane.config/configuration.properties

@@ -32,3 +32,6 @@ edc.dataplane.selector.http.properties={ "publicApiUrl": "http://consumer-data-p
 # Dataplane Token
 edc.transfer.proxy.token.signer.privatekey.alias=dp-signer-private-key
 edc.transfer.proxy.token.verifier.publickey.alias=dp-verifier-public-key
+
+# Data Encryption
+edc.data.encryption.keys.alias=data-encryption

api-wrapper/config/provider-control-plane.config/configuration.properties

@@ -32,3 +32,6 @@ edc.dataplane.selector.http.properties={ "publicApiUrl": "http://provider-data-p
 # Dataplane Token
 edc.transfer.proxy.token.signer.privatekey.alias=dp-signer-private-key
 edc.transfer.proxy.token.verifier.publickey.alias=dp-verifier-public-key
+
+# Data Encryption
+edc.data.encryption.keys.alias=data-encryption

api-wrapper/services/api-wrapper/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 val javaVersion = 11
 val edcGroup = "org.eclipse.dataspaceconnector"
-val edcVersion = "0.0.1-milestone-5"
+val edcVersion = "0.0.1-20220818-SNAPSHOT"
 
 dependencies {
     implementation("$edcGroup:core-boot:$edcVersion")

api-wrapper/vault/uploadCertsIntoVault.sh

@@ -8,6 +8,9 @@ dpVerifierPublicKeyAlias="dp-verifier-public-key"
 dpSignerPrivateKeyPath="${dpSignerPrivateKeyAlias}.pem"
 dpVerifierPublicKeyPath="${dpVerifierPublicKeyAlias}.pem"
 
+dataEncryptionKeyAlias="data-encryption"
+dataEncryptionKeyPath="${dataEncryptionKeyAlias}.aes"
+
 [ -z "$VAULT_URL" ] && VAULT_URL="http://localhost:8200"
 [ -z "$VAULT_TOKEN" ] && VAULT_TOKEN="password"
 
@@ -30,6 +33,9 @@ openssl genpkey -out "${dpSignerPrivateKeyPath}" -algorithm RSA -pkeyopt rsa_key
 # Public Key
 openssl rsa -in "${dpSignerPrivateKeyPath}" -out "${dpVerifierPublicKeyPath}" -pubout -outform PEM
 
+# DataEncryption Key
+openssl rand -base64 32 > "${dataEncryptionKeyPath}"
+
 echo "Waiting for Vault..."
 while [ "$(curl -XGET --insecure --silent -H "X-Vault-Token: ${VAULT_TOKEN}" "${VAULT_URL}/v1/sys/health" | jq '.initialized')" != "true" ]; do
     echo 'Vault is Initializing...'
@@ -44,3 +50,4 @@ vault login -non-interactive=true -no-print -address="${VAULT_URL}" token="${VAU
 echo "Adding secrets to Vault..."
 vault kv put -address="${VAULT_URL}" "secret/${dpSignerPrivateKeyAlias}" content=- < "${dpSignerPrivateKeyPath}"
 vault kv put -address="${VAULT_URL}" "secret/${dpVerifierPublicKeyAlias}" content=- < "${dpVerifierPublicKeyPath}"
+vault kv put -address="${VAULT_URL}" "secret/${dataEncryptionKeyAlias}" content=- < "${dataEncryptionKeyPath}"