fix: replace '__' with '--' in the Sql EDR Store (eclipse-tractusx#538)

yurimssilva · Jun 27, 2023 · 14d9e59 · 14d9e59
1 parent 09d8448
commit 14d9e59
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/...l/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java b/...l/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java
@@ -46,7 +46,7 @@
 
 public class SqlEndpointDataReferenceCache extends AbstractSqlStore implements EndpointDataReferenceCache {
 
-    public static final String SEPARATOR = "__";
+    public static final String SEPARATOR = "--";
     public static final String VAULT_PREFIX = "edr" + SEPARATOR;
     private final EdrStatements statements;
     private final Clock clock;

diff --git a/...c/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java b/...c/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java
@@ -25,6 +25,7 @@
 import org.eclipse.tractusx.edc.edr.store.sql.schema.postgres.PostgresEdrStatements;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.io.IOException;
@@ -33,10 +34,15 @@
 import java.sql.SQLException;
 import java.time.Clock;
 
+import static java.util.UUID.randomUUID;
 import static org.eclipse.tractusx.edc.edr.spi.TestFunctions.edr;
+import static org.eclipse.tractusx.edc.edr.spi.TestFunctions.edrEntry;
 import static org.eclipse.tractusx.edc.edr.store.sql.SqlEndpointDataReferenceCache.SEPARATOR;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @PostgresqlDbIntegrationTest
@@ -71,6 +77,20 @@ void tearDown(PostgresqlStoreSetupExtension extension) throws SQLException {
         extension.runQuery("DROP TABLE " + statements.getEdrTable() + " CASCADE");
     }
 
+    @Test
+    void verify_unoffensive_secretKey() {
+        var tpId = "tp1";
+        var assetId = "asset1";
+        var edrId = "edr1";
+
+        var edr = edr(edrId);
+        var entry = edrEntry(assetId, randomUUID().toString(), tpId);
+
+        getStore().save(entry, edr);
+
+        verify(vault).storeSecret(argThat(s -> s.startsWith("edr--")), anyString());
+    }
+
     @Override
     protected EndpointDataReferenceCache getStore() {
         return cache;

diff --git a/...estFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java b/...estFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java
@@ -126,5 +126,5 @@ void deleteByTransferProcessId_shouldReturnError_whenNotFound() {
                 .extracting(StoreResult::reason)
                 .isEqualTo(StoreFailure.Reason.NOT_FOUND);
     }
-    
+
 }