Merge pull request #1128 from smallrye/backport-#1124-to-3.x

[3.x] Backport Fix MQTT Client when the keystore/truststore password is missing

Author: cescoffier

smallrye-reactive-messaging-mqtt/src/main/java/io/smallrye/reactive/messaging/mqtt/MqttHelpers.java

@@ -71,8 +71,9 @@ private static KeyCertOptions getKeyCertOptions(MqttConnectorCommonConfiguration
                         .setPath(keyStoreLocation)
                         .setPassword(keyStorePassword);
             } else {
-                new IllegalArgumentException("The attribute `ssl.keystore.password` on connector 'smallrye-mqtt' (channel: "
-                        + config.getChannel() + ") must be set for `ssl.keystore.type`" + sslKeystoreType);
+                throw new IllegalArgumentException(
+                        "The attribute `ssl.keystore.password` on connector 'smallrye-mqtt' (channel: "
+                                + config.getChannel() + ") must be set for `ssl.keystore.type`" + sslKeystoreType);
             }
         }
         return null;
@@ -108,8 +109,9 @@ private static TrustOptions getTrustOptions(MqttConnectorCommonConfiguration con
                         .setPath(truststoreLocation)
                         .setPassword(truststorePassword);
             } else {
-                new IllegalArgumentException("The attribute `ssl.keystore.password` on connector 'smallrye-mqtt' (channel: "
-                        + config.getChannel() + ") must be set for `ssl.keystore.type`" + truststoreType);
+                throw new IllegalArgumentException(
+                        "The attribute `ssl.keystore.password` on connector 'smallrye-mqtt' (channel: "
+                                + config.getChannel() + ") must be set for `ssl.keystore.type`" + truststoreType);
             }
         }
         return null;

smallrye-reactive-messaging-mqtt/src/test/java/io/smallrye/reactive/messaging/mqtt/MutualTlsMqttSourceTest.java

@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
+import static org.junit.Assert.assertThrows;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -75,4 +76,26 @@ void pause() {
         }
     }
 
+    @Test
+    public void testMutualTLSMissingPassword() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            String topic = UUID.randomUUID().toString();
+            Map<String, Object> config = new HashMap<>();
+            config.put("topic", topic);
+            config.put("host", address);
+            config.put("port", port);
+            config.put("username", "user");
+            config.put("password", "foo");
+            config.put("channel-name", topic);
+            config.put("ssl", true);
+            config.put("ssl.keystore.type", "jks");
+            config.put("ssl.keystore.location", "mosquitto-tls/client/client.ks");
+            config.put("ssl.truststore.type", "jks");
+            config.put("ssl.truststore.location", "mosquitto-tls/client/client.ts");
+
+            new MqttSource(vertx, new MqttConnectorIncomingConfiguration(new MapBasedConfig(config)));
+        });
+
+    }
+
 }