Assume certs are always located

in the same relative location to
the test configuration path

Author: MarcialRosales

selenium/.gitignore

@@ -8,6 +8,9 @@ test/oauth/*/h2/*.trace.db
 test/oauth/*/h2/*.lock.db
 */target/*
 tls-gen
-test/oauth/*/*.pem
-test/oauth/*/*.p12
-test/authnz-msg-protocols/certs
+test/*/certs/*.pem
+test/*/certs/*.p12
+test/*/certs/*.jks
+test/*/*/*.pem
+test/*/*/*.p12
+test/*/*/*.jks

selenium/bin/suite_template

@@ -333,10 +333,11 @@ _test() {
     --env SELENIUM_POLLING=${SELENIUM_POLLING} \
     --env PROFILES="${PROFILES}" \
     --env ENV_FILE="/code/.env" \
+    --env RABBITMQ_CERTS=/etc/rabbitmq/certs \
     --env NODE_EXTRA_CA_CERTS=/nodejs/ca.pem \
     -v ${MOUNT_NODE_EXTRA_CA_CERTS}:/nodejs/ca.pem \
     -v ${TEST_DIR}:/code/test \
-    -v ${SCRIPT}/../../../${RABBITMQ_LOCAL_CERTS}:${RABBITMQ_CERTS} \
+    -v ${SELENIUM_ROOT_FOLDER}/${TEST_CONFIG_PATH}/certs:/etc/rabbitmq/certs \
     -v ${SCREENS}:/screens \
     -v ${ENV_FILE}:/code/.env \
     mocha-test:${mocha_test_tag} test /code/test${TEST_CASES_PATH}
@@ -372,8 +373,9 @@ profiles_with_local_or_docker() {
 generate_env_file() {
     begin "Generating env file ..."
     mkdir -p $CONF_DIR
-    ${BIN_DIR}/gen-env-file $TEST_CONFIG_DIR $ENV_FILE
+    ${BIN_DIR}/gen-env-file $TEST_CONFIG_DIR $ENV_FILE    
     source $ENV_FILE
+    echo "export TEST_CONFIG_PATH=${TEST_CONFIG_PATH}" >> $ENV_FILE
     end "Finished generating env file."
 }
 generate-ca-server-client-kpi() {
@@ -584,7 +586,7 @@ test_local() {
   export RABBITMQ_AMQP_PASSWORD=${RABBITMQ_AMQP_PASSWORD}
   export SELENIUM_TIMEOUT=${SELENIUM_TIMEOUT:-20000}
   export SELENIUM_POLLING=${SELENIUM_POLLING:-500}
-
+  
   print "> SELENIUM_TIMEOUT: ${SELENIUM_TIMEOUT}"
   print "> SELENIUM_POLLING: ${SELENIUM_POLLING}"
   print "> RABBITMQ_HOST: ${RABBITMQ_HOST}"

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

@@ -1,3 +1 @@
 export IMPORT_DIR=selenium/test/authnz-msg-protocols/imports
-export RABBITMQ_LOCAL_CERTS=selenium/test/authnz-msg-protocols/certs
-export RABBITMQ_CERTS=$RABBITMQ_LOCAL_CERTS

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

@@ -3,7 +3,7 @@ auth_mechanisms.1 = EXTERNAL
 
 ssl_cert_login_from = subject_alternative_name
 ssl_cert_login_san_type = dns 
-ssl_cert_login_san_index = 1 
+ssl_cert_login_san_index = 1
 ssl_options.verify     =  verify_peer
 ssl_options.fail_if_no_peer_cert = true
 

selenium/test/authnz-msg-protocols/rabbitmq.auth-mtls.conf

@@ -2,3 +2,4 @@ export RABBITMQ_SCHEME=http
 export RABBITMQ_HOSTNAME=rabbitmq
 export RABBITMQ_HOST=rabbitmq:15672
 export IMPORT_DIR=/var/rabbitmq/imports
+export RABBITMQ_CERTS=/etc/rabbitmq/certs

selenium/test/env.docker

@@ -1,3 +1,4 @@
 export RABBITMQ_SCHEME=http
 export RABBITMQ_HOSTNAME=localhost
 export RABBITMQ_HOST=localhost:15672
+export RABBITMQ_CERTS=selenium/test/${TEST_CONFIG_PATH}