resolve conflicts in pom.xml

adorsys · Jul 16, 2024 · 93d0bcd · 93d0bcd
2 parents 6421519 + 89da57d
commit 93d0bcd
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 18 deletions.
diff --git a/SECURITY.WHITEPAPER.md b/SECURITY.WHITEPAPER.md
@@ -23,6 +23,59 @@ CMS Encryption:
 * [RSAES-PKCS1-v1_5](#RSAES-PKCS1-v1_5) - key derivation algorithm for shared files (use public key);
 * [SHA256withRSA](#SHA256withRSA) - for public keys.
 
+## ECC Update
+
+With the latest release, Datasafe has transitioned from RSA to Elliptic Curve Cryptography (ECC) to enhance security and performance. This section details the new ECC implementation:
+
+#### Encryption and Signing
+
+- **Encryption Algorithm**: ECDH (Elliptic Curve Diffie-Hellman) with curve `secp256r1`.
+- **Signing Algorithm**: SHA256withECDSA (Elliptic Curve Digital Signature Algorithm) with curve `secp256r1`.
+
+#### Benefits of ECC
+
+- **Security**: ECC offers stronger security per bit compared to RSA, making it more resistant to cryptographic attacks.
+- **Performance**: ECC algorithms generally require less computational power and are faster.
+- **Key Size**: ECC achieves comparable security to RSA with much smaller key sizes (256 bits for ECC vs. 2048 bits for RSA), resulting in reduced storage and transmission requirements.
+
+#### Implementation Details
+<details>
+<summary>Dynamically choosing between RSA and ECC</summary>
+
+```java
+private RecipientInfoGenerator getRecipientInfoGenerator(PublicKeyIDWithPublicKey keyWithId, KeyPair senderKeyPair) {
+ if ("RSA".equals(keyWithId.getPublicKey().getAlgorithm())) {
+ return new JceKeyTransRecipientInfoGenerator(keyWithId.getKeyID().getValue().getBytes(), keyWithId.getPublicKey());
+ }
+ if (Set.of("ECDH", "EC").contains(keyWithId.getPublicKey().getAlgorithm())) {
+ return getJceKeyAgreeRecipientInfoGenerator(senderKeyPair, keyWithId);
+ }
+ return null;
+}
+```
+in the updated implementation, the getRecipientInfoGenerator method dynamically chooses between RSA and ECC based on the algorithm associated with the public key. For ECC, it uses ECDH for encryption and SHA256withECDSA for signing.
+
+</details>
+
+## Release Notes
+
+##### ECC Integration
+
+#### Added
+- **Elliptic Curve Cryptography (ECC)**:
+ - Implemented ECC for improved security and performance.
+ - Encryption Algorithm: ECDH (Elliptic Curve Diffie-Hellman) with curve `secp256r1`.
+ - Signing Algorithm: SHA256withECDSA (Elliptic Curve Digital Signature Algorithm) with curve `secp256r1`.
+
+#### Changed
+- **Encryption and Signing**:
+ - Transitioned from RSA to ECC, enhancing security and reducing key sizes.
+
+#### Improved
+- **Security**:
+ - ECC offers stronger security per bit compared to RSA.
+- **Key Size Reduction**:
+ - ECC achieves comparable security to RSA with much smaller key sizes, reducing storage and transmission requirements.
 ## General information
 Datasafe is a flexible encryption library. It uses different encryption algorithms. They can be 
 configured by client application. Under the hood Datasafe uses BouncyCastle library to perform encryption.

diff --git a/datasafe-examples/datasafe-examples-multidfs/pom.xml b/datasafe-examples/datasafe-examples-multidfs/pom.xml
@@ -27,6 +27,18 @@
  <artifactId>testcontainers</artifactId>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>

diff --git a/datasafe-examples/datasafe-examples-versioned-s3/pom.xml b/datasafe-examples/datasafe-examples-versioned-s3/pom.xml
@@ -27,6 +27,18 @@
  <artifactId>testcontainers</artifactId>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>

diff --git a/datasafe-rest-impl/pom.xml b/datasafe-rest-impl/pom.xml
@@ -13,7 +13,7 @@
  <description>Spring Boot DataSafe Application</description>
 
  <properties>
- <spring-boot.version>3.1.2</spring-boot.version>
+ <spring-boot.version>3.3.1</spring-boot.version>
  <springfox-swagger.version>2.9.2</springfox-swagger.version>
  <jjwt.version>0.12.4</jjwt.version>
  <spring-restdocs.version>3.0.0</spring-restdocs.version>
@@ -33,6 +33,8 @@
  <mockito.version>5.5.0</mockito.version>
  <jakarta.version>6.0.0</jakarta.version>
  <slf4j.version>2.0.7</slf4j.version>
+ <springdoc-openapi-starter-webmvc-ui.version>2.3.0</springdoc-openapi-starter-webmvc-ui.version>
+ <maven.compiler.parameters>true</maven.compiler.parameters>
  </properties>
 
  <dependencies>
@@ -76,7 +78,17 @@
  <groupId>jakarta.validation</groupId>
  <artifactId>jakarta.validation-api</artifactId>
  <version>${jakarta.validation-api.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <version>${spring-boot.version}</version>
+ <optional>true</optional>
  </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ <version>${spring-boot.version}</version>
+ </dependency>
+
  <dependency>
  <groupId>io.jsonwebtoken</groupId>
  <artifactId>jjwt-api</artifactId>
@@ -92,6 +104,12 @@
  <groupId>io.jsonwebtoken</groupId>
  <artifactId>jjwt-jackson</artifactId>
  <version>${jjwt.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
  <scope>runtime</scope>
  </dependency>
  <dependency>

diff --git a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/DatasafeRestApplication.java
@@ -3,10 +3,9 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
 public class DatasafeRestApplication {
 
  public static void main(String[] args) {

diff --git a/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/MvcConfig.java b/datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/MvcConfig.java
@@ -6,12 +6,12 @@
 import org.springframework.lang.NonNull;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Slf4j
 @Configuration
 @RequiredArgsConstructor
-public class MvcConfig extends WebMvcConfigurationSupport {
+public class MvcConfig implements WebMvcConfigurer {
 
  private final DatasafeProperties datasafeProperties;
 

diff --git a/...afe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/InboxController.java b/...afe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/InboxController.java
@@ -13,7 +13,6 @@
 import de.adorsys.datasafe.types.api.resource.PrivateResource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -30,7 +29,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 

diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml b/datasafe-simple-adapter/datasafe-simple-adapter-spring/pom.xml
@@ -8,13 +8,17 @@
  <version>2.0.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>datasafe-simple-adapter-spring</artifactId>
+
  <properties>
+ <spring.framework.version>6.1.10</spring.framework.version>
+ <spring.framework.boot.version>3.3.1</spring.framework.boot.version>
+ <snakeyaml.version>2.2</snakeyaml.version>
  <junit.version>4.13.2</junit.version>
  <jetbrains.annotations.version>17.0.0</jetbrains.annotations.version>
  </properties>
 
- <artifactId>datasafe-simple-adapter-spring</artifactId>
-
  <dependencies>
  <dependency>
  <groupId>org.springframework.boot</groupId>
@@ -86,6 +90,11 @@
  </exclusions>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>
@@ -121,6 +130,11 @@
  <type>test-jar</type>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
  <dependency>
  <groupId>jakarta.annotation</groupId>
  <artifactId>jakarta.annotation-api</artifactId>

diff --git a/datasafe-storage/datasafe-storage-impl-db/pom.xml b/datasafe-storage/datasafe-storage-impl-db/pom.xml
@@ -11,6 +11,10 @@
 
  <artifactId>datasafe-storage-impl-db</artifactId>
 
+ <properties>
+ <spring.framework.version>6.1.10</spring.framework.version>
+ </properties>
+
  <dependencies>
  <dependency>
  <groupId>de.adorsys</groupId>
@@ -26,6 +30,7 @@
  <dependency>
  <groupId>org.springframework</groupId>
  <artifactId>spring-jdbc</artifactId>
+ <version>${spring.framework.version}</version>
  </dependency>
  <dependency>
  <groupId>com.zaxxer</groupId>

diff --git a/datasafe-storage/datasafe-storage-impl-s3/pom.xml b/datasafe-storage/datasafe-storage-impl-s3/pom.xml
@@ -51,6 +51,18 @@
  <artifactId>testcontainers</artifactId>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>

diff --git a/datasafe-test-storages/pom.xml b/datasafe-test-storages/pom.xml
@@ -28,6 +28,18 @@
  <artifactId>testcontainers</artifactId>
  <scope>compile</scope>
  </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>compile</scope>
+ </dependency>
  <dependency>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-storage-api</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -83,14 +83,14 @@
  <dagger.version>2.50</dagger.version>
  <guava.version>32.1.1-jre</guava.version>
  <picocli.version>4.0.3</picocli.version>
- <jupiter.version>5.10.0</jupiter.version>
+ <jupiter.version>5.11.0-M2</jupiter.version>
  <assertj.version>3.12.2</assertj.version>
  <mockito.version>5.5.0</mockito.version>
  <surefire.version>3.1.2</surefire.version>
  <compress.version>1.26.0</compress.version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <deploy.disabled>false</deploy.disabled>
- <testcontainers.version>1.18.3</testcontainers.version>
+ <testcontainers.version>1.19.8</testcontainers.version>
  <jacoco.version>0.8.11</jacoco.version>
  <commons.io.version>2.5</commons.io.version>
  <slf4j-simple.version>2.0.7</slf4j-simple.version>
@@ -109,8 +109,6 @@
  <h2.database>2.2.220</h2.database>
  <mysql.version>8.4.0</mysql.version>
  <liquibase>4.23.1</liquibase>
- <spring.framework.version>6.0.11</spring.framework.version>
- <spring.framework.boot.version>3.1.2</spring.framework.boot.version>
  <siv-mode.version>1.4.4</siv-mode.version>
  <jackson.version>2.16.1</jackson.version>
  <keymanagement.version>0.0.11</keymanagement.version>
@@ -224,11 +222,27 @@
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-java-sdk-s3</artifactId>
  <version>${amazon.aws.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-java-sdk-core</artifactId>
  <version>${amazon.aws.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
 
  <!--
@@ -318,11 +332,6 @@
  <artifactId>liquibase-core</artifactId>
  <version>${liquibase}</version>
  </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.framework.version}</version>
- </dependency>
  <dependency>
  <groupId>com.zaxxer</groupId>
  <artifactId>HikariCP</artifactId>