Added mutable encryption config to BasicFunctionalityIT

adorsys · Jun 23, 2024 · 4200e5c · 4200e5c
1 parent d61b499
commit 4200e5c
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 15 deletions.
diff --git a/datasafe-business/pom.xml b/datasafe-business/pom.xml
@@ -184,6 +184,12 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.15.4</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...fe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java b/...fe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java
@@ -1,8 +1,14 @@
 package de.adorsys.datasafe.business.impl.e2e;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
+import com.google.common.io.Resources;
 import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices;
 import de.adorsys.datasafe.encrypiton.api.types.UserID;
 import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth;
+import de.adorsys.datasafe.encrypiton.api.types.encryption.MutableEncryptionConfig;
 import de.adorsys.datasafe.storage.api.StorageService;
 import de.adorsys.datasafe.teststorage.WithStorageProvider;
 import de.adorsys.datasafe.types.api.actions.ListRequest;
@@ -21,11 +27,11 @@
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.testcontainers.shaded.com.google.common.collect.ImmutableSet;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.security.UnrecoverableKeyException;
 import java.util.Arrays;
 import java.util.List;
@@ -54,6 +60,7 @@ class BasicFunctionalityIT extends BaseE2EIT {
 
     private StorageService storage;
     private Uri location;
+    private static ObjectMapper mapper = createMapper();
 
 
     /**
@@ -277,6 +284,37 @@ void testWriteToPrivateListPrivateReadPrivateAndSendToAndReadFromInbox(
         removeFromPrivate(jane, privateJane.getResource().asPrivate());
         removeFromInbox(john, inboxJohn.getResource().asPrivate());
     }
+    @ParameterizedTest
+    @MethodSource("allStorages")
+    void testWriteToPrivateListPrivateReadPrivateAndSendToAndReadFromInboxCustom( WithStorageProvider.StorageDescriptor descriptor) {
+        String yamlFixture = "config/mutable.yaml";
+        customInit(descriptor, yamlFixture);
+
+        registerJohnAndJane();
+
+        writeDataToPrivate(jane, PRIVATE_FILE_PATH, MESSAGE_ONE);
+
+        AbsoluteLocation<ResolvedResource> privateJane = getFirstFileInPrivate(jane);
+
+        String privateContentJane = readPrivateUsingPrivateKey(jane, privateJane.getResource().asPrivate());
+
+        sendToInbox(jane, john.getUserID(), SHARED_FILE_PATH, privateContentJane);
+
+        AbsoluteLocation<ResolvedResource> inboxJohn = getFirstFileInInbox(john);
+
+        String result = readInboxUsingPrivateKey(john, inboxJohn.getResource().asPrivate());
+
+        assertThat(result).isEqualTo(MESSAGE_ONE);
+        assertThat(privateJane.getResource().asPrivate().decryptedPath())
+                .extracting(Uri::toASCIIString).isEqualTo(PRIVATE_FILE_PATH);
+        assertThat(privateJane.getResource().asPrivate().encryptedPath())
+                .extracting(Uri::toASCIIString).isNotEqualTo(PRIVATE_FILE_PATH);
+        validateInboxStructAndEncryption(inboxJohn);
+        validatePrivateStructAndEncryption(privateJane);
+
+        removeFromPrivate(jane, privateJane.getResource().asPrivate());
+        removeFromInbox(john, inboxJohn.getResource().asPrivate());
+    }
 
     @ParameterizedTest
     @MethodSource("allStorages")
@@ -387,4 +425,28 @@ private void init(WithStorageProvider.StorageDescriptor descriptor) {
         this.location = descriptor.getLocation();
         this.storage = descriptor.getStorageService().get();
     }
+    private void customInit(WithStorageProvider.StorageDescriptor descriptor, String yamlFixture) {
+        MutableEncryptionConfig config = readResource(mapper, yamlFixture, MutableEncryptionConfig.class);
+        DefaultDatasafeServices datasafeServices = DatasafeServicesProvider
+                .customConfigDatasafeServices(descriptor.getStorageService().get(), descriptor.getLocation(), config);
+        initialize(DatasafeServicesProvider.dfsConfig(descriptor.getLocation()), datasafeServices);
+
+        this.location = descriptor.getLocation();
+        this.storage = descriptor.getStorageService().get();
+    }
+
+    private static <T> T readResource(ObjectMapper mapper, String path, Class<T> type) {
+        try (Reader reader = Resources.asCharSource(Resources.getResource(path), StandardCharsets.UTF_8).openStream()) {
+            return mapper.readValue(reader, type);
+        }
+        catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static ObjectMapper createMapper() {
+        ObjectMapper mapper = new ObjectMapper(new YAMLFactory().enable(YAMLGenerator.Feature.MINIMIZE_QUOTES));
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        return mapper;
+    }
 }
diff --git a/...usiness/src/test/java/de/adorsys/datasafe/business/impl/e2e/DatasafeServicesProvider.java b/...usiness/src/test/java/de/adorsys/datasafe/business/impl/e2e/DatasafeServicesProvider.java
@@ -6,6 +6,7 @@
 import de.adorsys.datasafe.business.impl.service.VersionedDatasafeServices;
 import de.adorsys.datasafe.directory.api.config.DFSConfig;
 import de.adorsys.datasafe.directory.impl.profile.config.DefaultDFSConfig;
+import de.adorsys.datasafe.encrypiton.api.types.encryption.MutableEncryptionConfig;
 import de.adorsys.datasafe.storage.api.StorageService;
 import de.adorsys.datasafe.types.api.resource.Uri;
 import de.adorsys.datasafe.types.api.types.ReadStorePassword;
@@ -26,6 +27,14 @@ public static DefaultDatasafeServices defaultDatasafeServices(StorageService sto
                 .storage(storageService)
                 .build();
     }
+    public static DefaultDatasafeServices customConfigDatasafeServices(StorageService storageService, Uri systemRoot, MutableEncryptionConfig config) {
+        return DaggerDefaultDatasafeServices
+                .builder()
+                .config(dfsConfig(systemRoot))
+                .encryption(config.toEncryptionConfig())
+                .storage(storageService)
+                .build();
+    }
 
     public static VersionedDatasafeServices versionedDatasafeServices(StorageService storageService, Uri systemRoot) {
         return DaggerVersionedDatasafeServices

diff --git a/datasafe-business/src/test/resources/config/mutable.yaml b/datasafe-business/src/test/resources/config/mutable.yaml
@@ -0,0 +1,30 @@
+---
+keystore:
+  type: BCFKS
+  encryptionAlgo: AES256_KWP
+  pbkdf:
+    scrypt:
+      cost: 1
+      blockSize: 2
+      parallelization: 3
+      saltLength: 32
+  macAlgo: HmacSHA3_512
+  passwordKeysAlgo: PBEWithHmacSHA256AndAES_256
+keys:
+  encKeyNumber: 1
+  signKeyNumber: 2
+  secret:
+    algo: AES
+    size: 512
+  encrypting:
+    algo: RSA
+    size: 256
+    sigAlgo: SHA256withRSA
+#    curve:
+  signing:
+    algo: RSA
+    size: 256
+    sigAlgo: SHA256withRSA
+#    curve: curve
+cms:
+  algo: SHA256withRSA
diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/main/resources/config/mutable.yaml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/main/resources/config/mutable.yaml
@@ -1,28 +1,30 @@
+---
 keystore:
-  type: store-type
-  encryptionAlgo: store-enc
+  type: BCFKS
+  encryptionAlgo: AES256_KWP
   pbkdf:
-    pbkdf2:
-      algo: pbkdf-algo
-      saltLength: 2
-      iterCount: 3
-  macAlgo: store-mac
-  passwordKeysAlgo: store-pwd-keys
+    scrypt:
+      cost: 1
+      blockSize: 2
+      parallelization: 3
+      saltLength: 4
+  macAlgo: HmacSHA3_512
+  passwordKeysAlgo: PBEWithHmacSHA256AndAES_256
 keys:
   encKeyNumber: 1
   signKeyNumber: 2
   secret:
-    algo: sec-algo
+    algo: AES
     size: 12
   encrypting:
-    algo: enc-algo
+    algo: RSA
     size: 13
     sigAlgo: srv-sig-algo
-    curve: curve
+    curve:
   signing:
     algo: sig-algo
     size: 14
-    sigAlgo: srv-sig-algo
+    sigAlgo: SHA256withRSA
     curve: curve
 cms:
   algo: cms-algo1