Merge remote-tracking branch 'origin/add_ECDH' into add_ECDH

# Conflicts: # datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java # pom.xml
adorsys · Jan 18, 2024 · bb2a544 · bb2a544
2 parents 4eb4c90 + 6e4a3ed
commit bb2a544
Show file tree

Hide file tree

Showing 52 changed files with 832 additions and 882 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,4 +42,6 @@ hs_err_pid*
 # node.js / frontend
 node_modules/
 dist/
+.angular/
+package-lock.json
 
diff --git a/README.md b/README.md
diff --git a/datasafe-business/pom.xml b/datasafe-business/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -113,6 +113,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>

diff --git a/datasafe-cli/pom.xml b/datasafe-cli/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
 
  <artifactId>datasafe-cli</artifactId>

diff --git a/datasafe-directory/datasafe-directory-api/pom.xml b/datasafe-directory/datasafe-directory-api/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-directory-api</artifactId>
  <dependencies>

diff --git a/datasafe-directory/datasafe-directory-impl/pom.xml b/datasafe-directory/datasafe-directory-impl/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-directory-impl</artifactId>
  <dependencies>

diff --git a/datasafe-directory/pom.xml b/datasafe-directory/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-encryption/datasafe-encryption-api/pom.xml b/datasafe-encryption/datasafe-encryption-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-encryption-api</artifactId>
  <dependencies>

diff --git a/.../src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java b/.../src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java
@@ -52,6 +52,9 @@ public static class EncryptingKeyCreationCfg {
 
  @Builder.Default
  private final String sigAlgo = "SHA256withECDSA";
+
+ @Builder.Default
+ private final String customNamedCurve = "Curve25519";
  }
 
  @Getter
@@ -66,5 +69,8 @@ public static class SigningKeyCreationCfg {
 
  @Builder.Default
  private final String sigAlgo = "SHA256withECDSA";
+
+ @Builder.Default
+ private final String customNamedCurve = "Curve25519";
  }
 }
diff --git a/datasafe-encryption/datasafe-encryption-impl/pom.xml b/datasafe-encryption/datasafe-encryption-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-encryption-impl</artifactId>
  <dependencies>

diff --git a/...-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceImpl.java b/...-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/keystore/KeyStoreServiceImpl.java
@@ -19,6 +19,8 @@
 import de.adorsys.keymanagement.api.types.template.generated.Secret;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.bouncycastle.crypto.ec.CustomNamedCurves;
+import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
 
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
@@ -89,6 +91,7 @@ public KeyStore createKeyStore(KeyStoreAuth keyStoreAuth,
  .keySize(encConf.getSize())
  .prefix("ENC")
  .password(passSupplier)
+ .paramSpec(EC5Util.convertToSpec(CustomNamedCurves.getByName(encConf.getCustomNamedCurve())))
  .build()
  .repeat(keyConfig.getEncKeyNumber())
  )

diff --git a/datasafe-encryption/pom.xml b/datasafe-encryption/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-examples/datasafe-examples-business/pom.xml b/datasafe-examples/datasafe-examples-business/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-business</artifactId>
  <dependencies>

diff --git a/datasafe-examples/datasafe-examples-customize-dagger/pom.xml b/datasafe-examples/datasafe-examples-customize-dagger/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-customize-dagger</artifactId>
  <dependencies>

diff --git a/.../java/de/adorsys/datasafe/examples/business/filesystem/CustomlyBuiltDatasafeServices.java b/.../java/de/adorsys/datasafe/examples/business/filesystem/CustomlyBuiltDatasafeServices.java
@@ -23,7 +23,7 @@
 
 /**
  * This is Datasafe services customized implementation.
- * Note, that despite is has {@code @Singleton} annotation, it is not real singleton, the only shared thing
+ * Note, that despite it has {@code @Singleton} annotation, it is not real singleton, the only shared thing
  * across all services instantiated using build() is bindings with {@code Singleton} in its Module.
  */
 @Singleton

diff --git a/datasafe-examples/datasafe-examples-multidfs/pom.xml b/datasafe-examples/datasafe-examples-multidfs/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-multidfs</artifactId>
  <dependencies>

diff --git a/datasafe-examples/datasafe-examples-versioned-s3/pom.xml b/datasafe-examples/datasafe-examples-versioned-s3/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-versioned-s3</artifactId>
  <dependencies>

diff --git a/datasafe-examples/pom.xml b/datasafe-examples/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-inbox/datasafe-inbox-api/pom.xml b/datasafe-inbox/datasafe-inbox-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-inbox-api</artifactId>
  <dependencies>

diff --git a/datasafe-inbox/datasafe-inbox-impl/pom.xml b/datasafe-inbox/datasafe-inbox-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-inbox-impl</artifactId>
  <dependencies>

diff --git a/datasafe-inbox/pom.xml b/datasafe-inbox/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml b/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-long-run-tests</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -106,6 +106,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>

diff --git a/datasafe-long-run-tests/pom.xml b/datasafe-long-run-tests/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-metainfo/datasafe-metainfo-version-api/pom.xml b/datasafe-metainfo/datasafe-metainfo-version-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-metainfo-version-api</artifactId>
  <dependencies>

diff --git a/datasafe-metainfo/datasafe-metainfo-version-impl/pom.xml b/datasafe-metainfo/datasafe-metainfo-version-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-metainfo-version-impl</artifactId>
  <dependencies>

diff --git a/datasafe-metainfo/pom.xml b/datasafe-metainfo/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-privatestore/datasafe-privatestore-api/pom.xml b/datasafe-privatestore/datasafe-privatestore-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-privatestore</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-privatestore/datasafe-privatestore-impl/pom.xml b/datasafe-privatestore/datasafe-privatestore-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-privatestore</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-privatestore/pom.xml b/datasafe-privatestore/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml
@@ -5,11 +5,11 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
 
  <artifactId>datasafe-rest-impl</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  <name>datasafe-rest-impl</name>
  <description>Spring Boot DataSafe Application</description>
 

diff --git a/datasafe-runtime-delegate/pom.xml b/datasafe-runtime-delegate/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-runtime-delegate</artifactId>
  <dependencies>

diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-api/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-simple-adapter</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-impl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-simple-adapter</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -45,6 +45,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>

diff --git a/...impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java b/...impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java
@@ -1,7 +1,6 @@
 package de.adorsys.datasafe.simple.adapter.impl;
 
 import com.amazonaws.services.s3.model.AmazonS3Exception;
-import com.sun.management.UnixOperatingSystemMXBean;
 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;
@@ -24,17 +23,13 @@
 import de.adorsys.datasafe.types.api.utils.ReadKeyPasswordTestFactory;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import net.bytebuddy.implementation.bytecode.Throw;
 import org.bouncycastle.util.io.Streams;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.ByteArrayInputStream;
 import java.io.OutputStream;
-import java.lang.management.ManagementFactory;
-import java.lang.management.OperatingSystemMXBean;
 import java.nio.file.NoSuchFileException;
 import java.security.UnrecoverableKeyException;
 import java.util.ArrayList;

diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-simple-adapter</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -126,6 +126,7 @@
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-test-storages</artifactId>
  <version>${project.version}</version>
+ <type>test-jar</type>
  <scope>test</scope>
  </dependency>
  <dependency>

diff --git a/...adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java b/...adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java
@@ -21,7 +21,6 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.Nullable;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/...orsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java b/...orsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java
@@ -11,9 +11,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
 
 import java.util.stream.Stream;