From d7435499ca77fb169b2d222b6c19ffbfb97e93fc Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Wed, 18 Oct 2023 14:49:25 +0200 Subject: [PATCH] feat: use data encryptor in the HTTP pull inmem test --- .../lifecycle/TestRuntimeConfiguration.java | 2 ++ .../edc/tests/edr/DeleteEdrInMemoryTest.java | 18 +++++++++++++++++ .../tests/edr/NegotiateEdrInMemoryTest.java | 18 +++++++++++++++++ .../edc/tests/edr/RenewalEdrInMemoryTest.java | 18 +++++++++++++++++ .../proxy/DataPlaneProxyInMemoryTest.java | 20 ++++++++++++++++++- ...AbstractHttpConsumerPullWithProxyTest.java | 1 + ...HttpConsumerPullWithProxyInMemoryTest.java | 18 +++++++++++++++++ .../runtime/runtime-memory/build.gradle.kts | 2 +- 8 files changed, 95 insertions(+), 2 deletions(-) diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java index 71a6aa38f..c0ba7ad11 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java @@ -111,6 +111,7 @@ public static Map sokratesConfiguration() { put("edc.receiver.http.dynamic.endpoint", "http://localhost:" + SOKRATES_CONNECTOR_PORT + "/api/consumer/datareference"); put("tractusx.businesspartnervalidation.log.agreement.validation", "true"); put("edc.agent.identity.key", "BusinessPartnerNumber"); + put("edc.data.encryption.keys.alias", "test-alias"); } }; } @@ -145,6 +146,7 @@ public static Map platoConfiguration() { put("edc.agent.identity.key", "BusinessPartnerNumber"); put("tx.dpf.proxy.gateway.aas.proxied.path", "http://localhost:" + PLATO_PROXIED_AAS_BACKEND_PORT + PROXIED_PATH); put("tx.dpf.proxy.gateway.aas.authorization.type", "none"); + put("edc.data.encryption.keys.alias", "test-alias"); } }; } diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/DeleteEdrInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/DeleteEdrInMemoryTest.java index 2ca557532..b530e4da0 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/DeleteEdrInMemoryTest.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/DeleteEdrInMemoryTest.java @@ -15,10 +15,15 @@ package org.eclipse.tractusx.edc.tests.edr; +import com.nimbusds.jose.util.Base64; import org.eclipse.edc.junit.annotations.EndToEndTest; +import org.eclipse.edc.spi.security.Vault; import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.extension.RegisterExtension; +import java.security.SecureRandom; + import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN; @@ -45,4 +50,17 @@ public class DeleteEdrInMemoryTest extends AbstractDeleteEdrTest { PLATO_BPN, renewalConfiguration(platoConfiguration()) ); + + @BeforeAll + static void prepare() { + var bytes = new byte[32]; + + new SecureRandom().nextBytes(bytes); + var value = Base64.encode(bytes).toString(); + var vault = SOKRATES_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + vault = PLATO_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + + } } diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java index 072131805..1248a0eec 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java @@ -15,10 +15,15 @@ package org.eclipse.tractusx.edc.tests.edr; +import com.nimbusds.jose.util.Base64; import org.eclipse.edc.junit.annotations.EndToEndTest; +import org.eclipse.edc.spi.security.Vault; import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.extension.RegisterExtension; +import java.security.SecureRandom; + import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN; @@ -44,4 +49,17 @@ public class NegotiateEdrInMemoryTest extends AbstractNegotiateEdrTest { PLATO_BPN, platoConfiguration() ); + + @BeforeAll + static void prepare() { + var bytes = new byte[32]; + + new SecureRandom().nextBytes(bytes); + var value = Base64.encode(bytes).toString(); + var vault = SOKRATES_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + vault = PLATO_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + + } } diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/RenewalEdrInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/RenewalEdrInMemoryTest.java index da6f80ccb..1bcc7df8f 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/RenewalEdrInMemoryTest.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/RenewalEdrInMemoryTest.java @@ -15,10 +15,15 @@ package org.eclipse.tractusx.edc.tests.edr; +import com.nimbusds.jose.util.Base64; import org.eclipse.edc.junit.annotations.EndToEndTest; +import org.eclipse.edc.spi.security.Vault; import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.extension.RegisterExtension; +import java.security.SecureRandom; + import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN; @@ -45,4 +50,17 @@ public class RenewalEdrInMemoryTest extends AbstractRenewalEdrTest { PLATO_BPN, renewalConfiguration(platoConfiguration()) ); + + @BeforeAll + static void prepare() { + var bytes = new byte[32]; + + new SecureRandom().nextBytes(bytes); + var value = Base64.encode(bytes).toString(); + var vault = SOKRATES_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + vault = PLATO_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + + } } diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyInMemoryTest.java index 828383b19..ede482fe9 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyInMemoryTest.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyInMemoryTest.java @@ -14,10 +14,15 @@ package org.eclipse.tractusx.edc.tests.proxy; +import com.nimbusds.jose.util.Base64; import org.eclipse.edc.junit.annotations.EndToEndTest; +import org.eclipse.edc.spi.security.Vault; import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.extension.RegisterExtension; +import java.security.SecureRandom; + import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN; @@ -27,7 +32,7 @@ @EndToEndTest public class DataPlaneProxyInMemoryTest extends AbstractDataPlaneProxyTest { - + @RegisterExtension protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime( ":edc-tests:runtime:runtime-memory", @@ -43,4 +48,17 @@ public class DataPlaneProxyInMemoryTest extends AbstractDataPlaneProxyTest { PLATO_BPN, platoConfiguration() ); + + @BeforeAll + static void prepare() { + var bytes = new byte[32]; + + new SecureRandom().nextBytes(bytes); + var value = Base64.encode(bytes).toString(); + var vault = SOKRATES_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + vault = PLATO_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + + } } diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java index 56cf54b06..28e1dc5ac 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java @@ -58,6 +58,7 @@ public abstract class AbstractHttpConsumerPullWithProxyTest { @BeforeEach void setup() throws IOException { server = new MockWebServer(); + } @Test diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java index b786cebd6..bb94a1599 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java @@ -14,10 +14,15 @@ package org.eclipse.tractusx.edc.tests.transfer; +import com.nimbusds.jose.util.Base64; import org.eclipse.edc.junit.annotations.EndToEndTest; +import org.eclipse.edc.spi.security.Vault; import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.extension.RegisterExtension; +import java.security.SecureRandom; + import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME; import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN; @@ -43,4 +48,17 @@ public class HttpConsumerPullWithProxyInMemoryTest extends AbstractHttpConsumerP PLATO_BPN, platoConfiguration() ); + + @BeforeAll + static void prepare() { + var bytes = new byte[32]; + + new SecureRandom().nextBytes(bytes); + var value = Base64.encode(bytes).toString(); + var vault = SOKRATES_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + vault = PLATO_RUNTIME.getContext().getService(Vault.class); + vault.storeSecret("test-alias", value); + + } } diff --git a/edc-tests/runtime/runtime-memory/build.gradle.kts b/edc-tests/runtime/runtime-memory/build.gradle.kts index a2042f9c0..8be6581c4 100644 --- a/edc-tests/runtime/runtime-memory/build.gradle.kts +++ b/edc-tests/runtime/runtime-memory/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { exclude("org.eclipse.edc", "oauth2-core") exclude("org.eclipse.edc", "oauth2-daps") - exclude(module = "data-encryption") +// exclude(module = "data-encryption") exclude(module = "json-ld-core") exclude(module = "ssi-identity-core") exclude(module = "ssi-miw-credential-client")