Provide client keystore for amqp10 test client

Author: MarcialRosales

selenium/amqp10-roundtriptest/src/main/java/com/rabbitmq/amqp1_0/RoundTripTest.java

@@ -31,7 +31,7 @@ public static void main(String args[]) throws Exception {
     String uri = scheme + "://" + hostname + ":" + port;
     boolean usemtls = Boolean.parseBoolean(getEnv("AMQP_USE_MTLS", "false"));
     String certsLocation = getEnv("RABBITMQ_CERTS");
-
+    
     if ("amqps".equals(scheme)) {
       List<String> connectionParams = new ArrayList<String>();
 
@@ -40,12 +40,13 @@ public static void main(String args[]) throws Exception {
       connectionParams.add("transport.verifyHost=true");      
 
       if (usemtls) {
-        connectionParams.add("transport.keyStoreLocation=" + certsLocation + "/rabbitmq.jks");
+        connectionParams.add("transport.keyStoreLocation=" + certsLocation + "/client_rabbitmq.jks");
         connectionParams.add("transport.keyStorePassword=foobar");
-        connectionParams.add("transport.keyAlias=rabbitmq-tls");
+        connectionParams.add("transport.keyAlias=client-rabbitmq-tls");
       }
       if (!connectionParams.isEmpty()) {
-        uri += "?" + java.net.URLEncoder.encode(String.join("&", connectionParams));       
+        String uri2 = uri + "?" + java.net.URLEncoder.encode(String.join("&", connectionParams));       
+        System.out.println("Using AMQP URI " + uri2);
       }
     }
 

selenium/bin/components/rabbitmq

@@ -16,7 +16,8 @@ init_rabbitmq() {
     mkdir ${RABBITMQ_CONFIG_DIR}/certs
   fi 
   generate-ca-server-client-kpi rabbitmq $RABBITMQ_CONFIG_DIR/certs
-  generate-keystore-if-required rabbitmq $RABBITMQ_CONFIG_DIR/certs
+  generate-server-keystore-if-required rabbitmq $RABBITMQ_CONFIG_DIR/certs
+  generate-client-keystore-if-required rabbitmq $RABBITMQ_CONFIG_DIR/certs
   generate-truststore-if-required rabbitmq $RABBITMQ_CONFIG_DIR/certs
 }
 

selenium/bin/components/uaa

@@ -18,7 +18,7 @@ init_uaa() {
   print "> UAA_DOCKER_IMAGE: ${UAA_DOCKER_IMAGE}"
 
   generate-ca-server-client-kpi uaa $UAA_CONFIG_DIR
-  generate-keystore-if-required uaa $UAA_CONFIG_DIR
+  generate-server-keystore-if-required uaa $UAA_CONFIG_DIR
 }
 start_uaa() {
   begin "Starting UAA ..."

selenium/bin/suite_template

@@ -434,17 +434,35 @@ generate-truststore-if-required() {
 			-noprompt
   fi
 }
-generate-keystore-if-required() {
+generate-server-keystore-if-required() {
   NAME=$1
   FOLDER=$2
   if [[ ! -f "${FOLDER}/${NAME}.jks " ]]; then
 	keytool -importkeystore \
-			-destkeystore ${FOLDER}/${NAME}.jks \
+			-destkeystore ${FOLDER}/server_${NAME}.jks \
 			-srckeystore ${FOLDER}/server_${NAME}.p12 \
 			-deststoretype pkcs12 \
 			-srcstoretype pkcs12 \
       -alias 1 \
-			-destalias ${NAME}-tls \
+			-destalias server-${NAME}-tls \
+			-deststorepass foobar \
+			-destkeypass foobar \
+			-srcstorepass "" \
+			-srckeypass "" \
+			-noprompt
+  fi
+}
+generate-client-keystore-if-required() {
+  NAME=$1
+  FOLDER=$2
+  if [[ ! -f "${FOLDER}/${NAME}.jks " ]]; then
+	keytool -importkeystore \
+			-destkeystore ${FOLDER}/client_${NAME}.jks \
+			-srckeystore ${FOLDER}/client_${NAME}.p12 \
+			-deststoretype pkcs12 \
+			-srcstoretype pkcs12 \
+      -alias 1 \
+			-destalias client-${NAME}-tls \
 			-deststorepass foobar \
 			-destkeypass foobar \
 			-srcstorepass "" \

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

@@ -37,7 +37,7 @@ describe('Having AMQP 1.0 protocol enabled and the following auth_backends: ' +
   })
 
   it('can open an AMQP 1.0 connection', function () {
-    execSync("npm run amqp10_roundtriptest -- " + username + " " + password)
+    console.log(execSync("npm run amqp10_roundtriptest -- " + username + " " + password).toString())
 
   })
 

selenium/test/authnz-msg-protocols/env.tls

@@ -1,2 +1,2 @@
-MQTT_PROTOCOL=mqtts
-RABBITMQ_MQTT_URL=mqtts://rabbitmq:8883
+export MQTT_PROTOCOL=mqtts
+export RABBITMQ_MQTT_URL=mqtts://rabbitmq:8883

selenium/test/env.tls.docker

@@ -1,3 +1,5 @@
 export RABBITMQ_SCHEME=https
 export RABBITMQ_HOSTNAME=rabbitmq
 export RABBITMQ_HOST=rabbitmq:15671
+export RABBITMQ_AMQP_SCHEME=amqps
+export RABBITMQ_AMQP_PORT=5671

selenium/test/env.tls.local

@@ -1,3 +1,6 @@
 export RABBITMQ_SCHEME=https
 export RABBITMQ_HOSTNAME=localhost
 export RABBITMQ_HOST=localhost:15671
+export RABBITMQ_AMQP_SCHEME=amqps
+export RABBITMQ_AMQP_PORT=5671
+

selenium/test/oauth/uaa/server.xml

@@ -15,7 +15,7 @@
                 secure="true"
                 clientAuth="false"
                 sslProtocol="TLS"
-                keystoreFile="/uaa/uaa.jks"
+                keystoreFile="/uaa/server_uaa.jks"
                 keystoreType="PKCS12"
                 keyAlias="uaa-tls"
                 keystorePass="foobar"