Modify mqtt test suite to use mtls

Author: MarcialRosales

selenium/full-suite-authnz-messaging

@@ -1,10 +1,9 @@
 authnz-messaging/auth-cache-http-backends.sh
 authnz-messaging/auth-cache-ldap-backends.sh
-authnz-messaging/auth-http-backend.sh
+authnz-messaging/auth-http-backend-with-mtls.sh
 authnz-messaging/auth-http-internal-backends-with-internal.sh
 authnz-messaging/auth-http-internal-backends.sh
 authnz-messaging/auth-internal-backend.sh
 authnz-messaging/auth-internal-mtls-backend.sh
 authnz-messaging/auth-internal-http-backends.sh
 authnz-messaging/auth-ldap-backend.sh
-authnz-messaging/auth-http-backend.sh

selenium/suites/authnz-messaging/auth-http-backend.sh renamed to selenium/suites/authnz-messaging/auth-http-backend-with-mtls.sh

@@ -3,7 +3,7 @@
 SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 TEST_CASES_PATH=/authnz-msg-protocols
-PROFILES="http-user auth-http auth_backends-http"
+PROFILES="internal-user auth-http auth_backends-http auth-mtls"
 
 source $SCRIPT/../../bin/suite_template
 runWith mock-auth-backend-http

selenium/test/authnz-msg-protocols/mqtt.js

@@ -23,11 +23,25 @@ describe('Having MQTT protocol enbled and the following auth_backends: ' + backe
   let password = process.env.RABBITMQ_AMQP_PASSWORD
   let client_id = process.env.RABBITMQ_AMQP_USERNAME || 'selenium-client'
 
-  before(function () {
-    if (backends.includes("http") && username.includes("http")) {
+  before(function () {    
+    if (backends.includes("http") && (username.includes("http") || usemtls)) {
       reset()
-      expectations.push(expectUser({ "username": username, "password": password, "client_id": client_id, "vhost": "/" }, "allow"))
+      if (!usemtls) {
+        console.log("Expect %s %s %s", username, password, client_id)
+        expectations.push(expectUser({ 
+          "username": username, 
+          "password": password, 
+          "client_id": client_id, 
+          "vhost": "/" }, "allow"))
+      } else {
+        console.log("Expect (mtls) %s %s", username, client_id)
+        expectations.push(expectUser({ 
+          "username": username, 
+          "client_id": client_id, 
+          "vhost": "/" }, "allow"))
+      }
       expectations.push(expectVhost({ "username": username, "vhost": "/"}, "allow"))
+
     } else if (backends.includes("oauth") && username.includes("oauth")) {
       let oauthProviderUrl = process.env.OAUTH_PROVIDER_URL
       let oauthClientId = process.env.OAUTH_CLIENT_ID
@@ -58,15 +72,20 @@ describe('Having MQTT protocol enbled and the following auth_backends: ' + backe
     }
   })
 
-  it('can open an MQTT connection', function () {
+  it('can open an MQTT connection', async function () {
     var client = mqtt.connect(mqttUrl, mqttOptions)
-    client.on('error', function(err) {
-      assert.fail("Mqtt connection failed due to " + err)
-      client.end()
-    })
-    client.on('connect', function(err) {
-      client.end()
+    let done = new Promise((resolve, reject) => {
+      client.on('error', function(err) {
+        reject(err)
+        client.end()
+        assert.fail("Mqtt connection failed due to " + err)        
+      }),
+      client.on('connect', function(err) {
+        resolve("ok")
+        client.end()
+      })
     })
+    assert.equal("ok", await done)
   })
 
   after(function () {