[#1078] Restore support of client-certificate credentials with basic-…

…auth for SaslPlainCredentialsSupplier. Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Jun 9, 2021 · 5fff3e5 · 5fff3e5
1 parent fa59422
commit 5fff3e5
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/...a/org/eclipse/ditto/connectivity/service/messaging/amqp/SaslPlainCredentialsSupplier.java b/...a/org/eclipse/ditto/connectivity/service/messaging/amqp/SaslPlainCredentialsSupplier.java
@@ -43,7 +43,7 @@ public Optional<UserPasswordCredentials> get(final Connection connection) {
         if (optionalCredentials.isPresent()) {
             final var credentials = optionalCredentials.get();
             final var requestSigning = credentials.accept(amqpConnectionSigningExtension);
-            return requestSigning.createSignedCredentials();
+            return requestSigning.createSignedCredentials().or(() -> FROM_URI.get(connection));
         }
         return FROM_URI.get(connection);
     }

diff --git a/...g/eclipse/ditto/connectivity/service/messaging/amqp/SaslPlainCredentialsSupplierTest.java b/...g/eclipse/ditto/connectivity/service/messaging/amqp/SaslPlainCredentialsSupplierTest.java
@@ -14,6 +14,7 @@
 package org.eclipse.ditto.connectivity.service.messaging.amqp;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -23,10 +24,12 @@
 
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.HmacCredentials;
+import org.eclipse.ditto.connectivity.model.MessageSendingFailedException;
+import org.eclipse.ditto.connectivity.model.SshPublicKeyCredentials;
 import org.eclipse.ditto.connectivity.model.UserPasswordCredentials;
-import org.eclipse.ditto.connectivity.service.messaging.signing.AzSaslSigning;
 import org.eclipse.ditto.connectivity.service.messaging.TestConstants;
 import org.eclipse.ditto.connectivity.service.messaging.httppush.AzMonitorRequestSigningFactory;
+import org.eclipse.ditto.connectivity.service.messaging.signing.AzSaslSigning;
 import org.eclipse.ditto.connectivity.service.messaging.signing.AzSaslSigningFactory;
 import org.eclipse.ditto.json.JsonObject;
 import org.junit.AfterClass;
@@ -38,6 +41,7 @@
 /**
  * Unit test for {@link SaslPlainCredentialsSupplier}.
  */
+@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 public final class SaslPlainCredentialsSupplierTest {
 
     private static final String SHARED_KEY_NAME = "name";
@@ -79,7 +83,8 @@ private void assertCredentialsContainCorrectSignature(final Optional<UserPasswor
 
         final Instant expiry = extractExpiryFromSharedAccessSignature(credentials.get().getPassword());
         final Instant calculationTimestamp = expiry.minus(TTL);
-        final Optional<UserPasswordCredentials> expectedCredentials = expectedSigning.createSignedCredentials(calculationTimestamp);
+        final Optional<UserPasswordCredentials> expectedCredentials =
+                expectedSigning.createSignedCredentials(calculationTimestamp);
 
         assertThat(credentials).isEqualTo(expectedCredentials);
     }
@@ -100,6 +105,32 @@ public void doesNotCreateCredentialsForConnectionWithoutCredentials() {
                 .isEmpty();
     }
 
+    @Test
+    public void createFromUriIfCredentialTypeDoesNotMatch() {
+        final Connection connection = TestConstants.createConnection()
+                .toBuilder()
+                .uri("http://user:pass@localhost:1234")
+                .credentials(SshPublicKeyCredentials.of("user", "publicKey", "privateKey"))
+                .build();
+
+        final Optional<UserPasswordCredentials> result =
+                SaslPlainCredentialsSupplier.of(actorSystem).get(connection);
+
+        assertThat(result).contains(UserPasswordCredentials.newInstance("user", "pass"));
+    }
+
+    @Test
+    public void failForUnknownHmacAlgorithm() {
+        final Connection connection = TestConstants.createConnection()
+                .toBuilder()
+                .uri("http://localhost:1234")
+                .credentials(createAzMonitorHmacCredentials())
+                .build();
+
+        assertThatExceptionOfType(MessageSendingFailedException.class)
+                .isThrownBy(() -> SaslPlainCredentialsSupplier.of(actorSystem).get(connection));
+    }
+
     private Instant extractExpiryFromSharedAccessSignature(final String password) {
         final Matcher matcher = Pattern.compile(".*&se=(?<se>\\d+).*").matcher(password);
         if (matcher.find()) {