Feat/dat 249 bring back swagger

.gitignore

@@ -42,4 +42,8 @@ hs_err_pid*
 # node.js / frontend
 node_modules/
 dist/
+.angular/
+main.js.map
+package-lock.json
+
 

datasafe-business/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-cli/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
 
  <artifactId>datasafe-cli</artifactId>

datasafe-directory/datasafe-directory-api/pom.xml

@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-directory-api</artifactId>
  <dependencies>

datasafe-directory/datasafe-directory-impl/pom.xml

@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-directory-impl</artifactId>
  <dependencies>

datasafe-directory/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-encryption/datasafe-encryption-api/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-encryption-api</artifactId>
  <dependencies>

datasafe-encryption/datasafe-encryption-api/src/main/java/de/adorsys/datasafe/encrypiton/api/types/encryption/KeyCreationConfig.java

@@ -45,26 +45,32 @@ public static class SecretKeyCreationCfg {
  public static class EncryptingKeyCreationCfg {
 
  @Builder.Default
- private final String algo = "RSA";
+ private final String algo = "ECDH";
 
  @Builder.Default
- private final int size = 2048;
+ private final int size = 256;
+
+ @Builder.Default
+ private final String sigAlgo = "SHA256withECDSA";
 
  @Builder.Default
- private final String sigAlgo = "SHA256withRSA";
+ private final String customNamedCurve = "Curve25519";
  }
 
  @Getter
  @Builder
  public static class SigningKeyCreationCfg {
 
  @Builder.Default
- private final String algo = "RSA";
+ private final String algo = "ECDH";
+
+ @Builder.Default
+ private final int size = 256;
 
  @Builder.Default
- private final int size = 2048;
+ private final String sigAlgo = "SHA256withECDSA";
 
  @Builder.Default
- private final String sigAlgo = "SHA256withRSA";
+ private final String customNamedCurve = "Curve25519";
  }
 }

datasafe-encryption/datasafe-encryption-impl/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-encryption-impl</artifactId>
  <dependencies>

datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java

@@ -36,7 +36,7 @@
 /**
  * Cryptographic message syntax document encoder/decoder - see
  *
- * @see <a href=https://en.wikipedia.org/wiki/Cryptographic_Message_Syntax">CMS
+ * @see <a href="https://en.wikipedia.org/wiki/Cryptographic_Message_Syntax">CMS
  * wiki</a>
  */
 @Slf4j

datasafe-encryption/datasafe-encryption-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())
  )

datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/pathencryption/IntegrityPreservingUriEncryption.java

@@ -24,7 +24,7 @@
  * It means that path/to/file is encrypted to cipher(path)/cipher(to)/cipher(file) and each invocation of example:
  * cipher(path) will yield same string, but cipher(path)/cipher(path) will not yield same segments -
  * it will be more like abc/cde and not like abc/abc.
- * Additionally each segment is authenticated against its parent path hash, so attacker can't
+ * Additionally, each segment is authenticated against its parent path hash, so attacker can't
  * move a/file to b/file without being detected.
  */
 @Slf4j

datasafe-encryption/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-examples/datasafe-examples-business/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-business</artifactId>
  <dependencies>

datasafe-examples/datasafe-examples-customize-dagger/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-customize-dagger</artifactId>
  <dependencies>

datasafe-examples/datasafe-examples-multidfs/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-multidfs</artifactId>
  <dependencies>

datasafe-examples/datasafe-examples-versioned-s3/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-examples</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-examples-versioned-s3</artifactId>
  <dependencies>

datasafe-examples/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-inbox/datasafe-inbox-api/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-inbox-api</artifactId>
  <dependencies>

datasafe-inbox/datasafe-inbox-impl/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-inbox</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-inbox-impl</artifactId>
  <dependencies>

datasafe-inbox/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml

@@ -5,16 +5,12 @@
  <parent>
  <artifactId>datasafe-long-run-tests</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>datasafe-business-tests-random-actions</artifactId>
 
- <properties>
- <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
- </properties>
-
  <dependencies>
  <dependency>
  <groupId>de.adorsys</groupId>
@@ -185,9 +181,8 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven.surefire.plugin.version}</version>
+ <version>${surefire.version}</version>
  <configuration>
- <forkMode>once</forkMode>
  <argLine>${testArgs}</argLine>
  </configuration>
  </plugin>

datasafe-long-run-tests/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-metainfo/datasafe-metainfo-version-api/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-metainfo-version-api</artifactId>
  <dependencies>

datasafe-metainfo/datasafe-metainfo-version-impl/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-metainfo</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <artifactId>datasafe-metainfo-version-impl</artifactId>
  <dependencies>

datasafe-metainfo/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-privatestore/datasafe-privatestore-api/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-privatestore</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-privatestore/datasafe-privatestore-impl/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe-privatestore</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-privatestore/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

datasafe-rest-impl/pom.xml

@@ -5,11 +5,11 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  </parent>
 
  <artifactId>datasafe-rest-impl</artifactId>
- <version>2.0.0</version>
+ <version>2.0.2</version>
  <name>datasafe-rest-impl</name>
  <description>Spring Boot DataSafe Application</description>
 
@@ -24,6 +24,11 @@
  </properties>
 
  <dependencies>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>2.2.0</version>
+ </dependency>
  <dependency>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-business</artifactId>