feat: upgrade amphora to enable secure truple provisioning

Signed-off-by: Sebastian Becker <[email protected]>
carbynestack · Aug 1, 2023 · d5619bc · d5619bc
1 parent 90fefcc
commit d5619bc
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 16 deletions.
diff --git a/3RD-PARTY-LICENSES/sbom.xml b/3RD-PARTY-LICENSES/sbom.xml
@@ -4,7 +4,7 @@
          <name>amphora-common</name>
          <groupId>io.carbynestack</groupId>
          <artifactId>amphora-common</artifactId>
-         <version>0.1-SNAPSHOT-4205214333-22-2fa009a</version>
+         <version>0.1.1</version>
          <licenses>
             <license>
                <name>Apache-2.0</name>
@@ -16,7 +16,7 @@
          <name>amphora-java-client</name>
          <groupId>io.carbynestack</groupId>
          <artifactId>amphora-java-client</artifactId>
-         <version>0.1-SNAPSHOT-4205214333-22-2fa009a</version>
+         <version>0.1.1</version>
          <licenses>
             <license>
                <name>Apache-2.0</name>
@@ -102,6 +102,32 @@
             </license>
          </licenses>
       </dependency>
+      <dependency>
+         <name>Apache HttpComponents Core HTTP/1.1</name>
+         <groupId>org.apache.httpcomponents.core5</groupId>
+         <artifactId>httpcore5</artifactId>
+         <version>5.2</version>
+         <projectUrl>https://hc.apache.org/httpcomponents-core-5.2.x/5.2/httpcore5/</projectUrl>
+         <licenses>
+            <license>
+               <name>Apache License, Version 2.0</name>
+               <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            </license>
+         </licenses>
+      </dependency>
+      <dependency>
+         <name>Apache HttpComponents Core HTTP/2</name>
+         <groupId>org.apache.httpcomponents.core5</groupId>
+         <artifactId>httpcore5-h2</artifactId>
+         <version>5.2</version>
+         <projectUrl>https://hc.apache.org/httpcomponents-core-5.2.x/5.2/httpcore5-h2/</projectUrl>
+         <licenses>
+            <license>
+               <name>Apache License, Version 2.0</name>
+               <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            </license>
+         </licenses>
+      </dependency>
       <dependency>
          <name>Apache HttpCore</name>
          <groupId>org.apache.httpcomponents</groupId>

diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
         <maven-license-plugin.version>2.0.0</maven-license-plugin.version>
 
         <!-- Carbyne Stack dependency versions -->
-        <amphora-java-client.version>0.1-SNAPSHOT-4205214333-22-2fa009a</amphora-java-client.version>
+        <amphora-java-client.version>0.1.1</amphora-java-client.version>
         <castor-common.version>0.1-SNAPSHOT-4191841095-22-1721229</castor-common.version>
         <castor-java-client.version>0.1-SNAPSHOT-4191841095-22-1721229</castor-java-client.version>
         <castor-upload-java-client.version>0.1-SNAPSHOT-4191841095-22-1721229</castor-upload-java-client.version>

diff --git a/...va/io/carbynestack/cli/client/amphora/command/GetSecretAmphoraClientCliCommandRunner.java b/...va/io/carbynestack/cli/client/amphora/command/GetSecretAmphoraClientCliCommandRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - for information on the respective copyright owner
+ * Copyright (c) 2021-2023 - for information on the respective copyright owner
  * see the NOTICE file and/or the repository https://github.com/carbynestack/cli.
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -8,7 +8,7 @@
 
 import io.carbynestack.amphora.client.Secret;
 import io.carbynestack.amphora.common.exceptions.AmphoraClientException;
-import io.carbynestack.amphora.common.exceptions.SecretVerificationException;
+import io.carbynestack.amphora.common.exceptions.IntegrityVerificationException;
 import io.carbynestack.cli.client.amphora.command.config.GetSecretAmphoraClientCliCommandConfig;
 import io.carbynestack.cli.client.amphora.util.SecretPrinter;
 import io.carbynestack.cli.exceptions.CsCliConfigurationException;
@@ -31,7 +31,7 @@ public void run() throws CsCliRunnerException {
       Secret result = this.getAmphoraClient().getSecret(this.getConfig().getSecretId());
       log.debug(getMessages().getString("get.log.success"), result);
       System.out.println(SecretPrinter.secretToString(result));
-    } catch (AmphoraClientException | SecretVerificationException e) {
+    } catch (AmphoraClientException | IntegrityVerificationException e) {
       throw new CsCliRunnerException("Failed fetching secret.", e);
     }
   }

diff --git a/src/test/java/io/carbynestack/cli/client/amphora/AmphoraClientCliTest.java b/src/test/java/io/carbynestack/cli/client/amphora/AmphoraClientCliTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 - for information on the respective copyright owner
+ * Copyright (c) 2021-2023 - for information on the respective copyright owner
  * see the NOTICE file and/or the repository https://github.com/carbynestack/cli.
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -24,7 +24,7 @@
 import io.carbynestack.amphora.common.TagFilter;
 import io.carbynestack.amphora.common.TagFilterOperator;
 import io.carbynestack.amphora.common.exceptions.AmphoraClientException;
-import io.carbynestack.amphora.common.exceptions.SecretVerificationException;
+import io.carbynestack.amphora.common.exceptions.IntegrityVerificationException;
 import io.carbynestack.amphora.common.paging.Sort;
 import io.carbynestack.cli.CsClientCli;
 import io.carbynestack.cli.TemporaryConfiguration;
@@ -151,8 +151,7 @@ public void downloadMissingIdOptionTest() throws CsCliRunnerException, CsCliLogi
 
   @Test(expected = CsCliRunnerException.class)
   public void downloadFailedTest()
-      throws CsCliException, CsCliRunnerException, AmphoraClientException,
-          SecretVerificationException, CsCliLoginException {
+      throws CsCliException, CsCliRunnerException, AmphoraClientException, CsCliLoginException {
     when(amphoraClientMock.getSecret(any(UUID.class))).thenThrow(new AmphoraClientException(""));
     getCliWithArgs(
             GetSecretAmphoraClientCliCommandConfig.COMMAND_NAME, UUID.randomUUID().toString())
@@ -329,8 +328,8 @@ public void downloadFailInvalidNumberOfMainParameters()
   @SneakyThrows
   @Test
   public void downloadSecretVerificationFails() {
-    SecretVerificationException expectedCause =
-        new SecretVerificationException("Verification failed.");
+    IntegrityVerificationException expectedCause =
+        new IntegrityVerificationException("Verification failed.");
     Secret expectedSecret =
         Secret.of(
             UUID.randomUUID(),
@@ -351,8 +350,7 @@ public void downloadSecretVerificationFails() {
 
   @Test
   public void downloadLargeSecretSuccessTest()
-      throws CsCliException, CsCliRunnerException, AmphoraClientException,
-          SecretVerificationException, CsCliLoginException {
+      throws CsCliException, CsCliRunnerException, AmphoraClientException, CsCliLoginException {
     Secret expectedSecret =
         Secret.of(
             UUID.randomUUID(),
@@ -368,8 +366,7 @@ public void downloadLargeSecretSuccessTest()
 
   @Test
   public void downloadSuccessWithTagsTest()
-      throws CsCliException, CsCliRunnerException, AmphoraClientException,
-          SecretVerificationException, CsCliLoginException {
+      throws CsCliException, CsCliRunnerException, AmphoraClientException, CsCliLoginException {
     Secret expectedSecret =
         Secret.of(
             UUID.randomUUID(),