diff --git a/selenium/.gitignore b/selenium/.gitignore index 63c36b351eb4..ee78120fba98 100644 --- a/selenium/.gitignore +++ b/selenium/.gitignore @@ -7,3 +7,10 @@ suites/screens/* test/oauth/*/h2/*.trace.db test/oauth/*/h2/*.lock.db */target/* +tls-gen +test/*/certs/*.pem +test/*/certs/*.p12 +test/*/certs/*.jks +test/*/*/*.pem +test/*/*/*.p12 +test/*/*/*.jks \ No newline at end of file diff --git a/selenium/bin/components/devkeycloak b/selenium/bin/components/devkeycloak index 352544372c4a..87062b67465b 100644 --- a/selenium/bin/components/devkeycloak +++ b/selenium/bin/components/devkeycloak @@ -9,6 +9,9 @@ init_devkeycloak() { print "> DEVKEYCLOAK_CONFIG_DIR: ${DEVKEYCLOAK_CONFIG_DIR}" print "> DEVKEYCLOAK_URL: ${DEVKEYCLOAK_URL}" print "> DEVKEYCLOAK_DOCKER_IMAGE: ${KEYCLOAK_DOCKER_IMAGE}" + + generate-ca-server-client-kpi devkeycloak $DEVKEYCLOAK_CONFIG_DIR + } ensure_devkeycloak() { if docker ps | grep devkeycloak &> /dev/null; then @@ -45,7 +48,7 @@ start_devkeycloak() { --https-certificate-key-file=/opt/keycloak/data/import/server_devkeycloak_key.pem \ --hostname=devkeycloak --hostname-admin=devkeycloak --https-port=8442 - wait_for_oidc_endpoint devkeycloak $DEVKEYCLOAK_URL $MOUNT_DEVKEYCLOAK_CONF_DIR/ca_certificate.pem + wait_for_oidc_endpoint devkeycloak $DEVKEYCLOAK_URL $MOUNT_DEVKEYCLOAK_CONF_DIR/ca_devkeycloak_certificate.pem end "devkeycloak is ready" print " Note: If you modify devkeycloak configuration, make sure to run the following command to export the configuration." print " docker exec -it devkeycloak /opt/keycloak/bin/kc.sh export --users realm_file --realm test --dir /opt/keycloak/data/import/" diff --git a/selenium/bin/components/keycloak b/selenium/bin/components/keycloak index aa0d6a38a39a..f77df9f6f1c3 100644 --- a/selenium/bin/components/keycloak +++ b/selenium/bin/components/keycloak @@ -17,6 +17,9 @@ init_keycloak() { print "> KEYCLOAK_CONFIG_DIR: ${KEYCLOAK_CONFIG_DIR}" print "> KEYCLOAK_URL: ${KEYCLOAK_URL}" print "> KEYCLOAK_DOCKER_IMAGE: ${KEYCLOAK_DOCKER_IMAGE}" + + generate-ca-server-client-kpi keycloak $KEYCLOAK_CONFIG_DIR + } start_keycloak() { begin "Starting keycloak ..." @@ -44,7 +47,7 @@ start_keycloak() { --https-certificate-file=/opt/keycloak/data/import/server_keycloak_certificate.pem \ --https-certificate-key-file=/opt/keycloak/data/import/server_keycloak_key.pem - wait_for_oidc_endpoint keycloak $KEYCLOAK_URL $MOUNT_KEYCLOAK_CONF_DIR/ca_certificate.pem + wait_for_oidc_endpoint keycloak $KEYCLOAK_URL $MOUNT_KEYCLOAK_CONF_DIR/ca_keycloak_certificate.pem end "Keycloak is ready" print " Note: If you modify keycloak configuration. Make sure to run the following command to export the configuration." diff --git a/selenium/bin/components/prodkeycloak b/selenium/bin/components/prodkeycloak index c0e3ee16192e..9753d66ebf4b 100644 --- a/selenium/bin/components/prodkeycloak +++ b/selenium/bin/components/prodkeycloak @@ -16,6 +16,8 @@ init_prodkeycloak() { print "> PRODKEYCLOAK_CONFIG_DIR: ${PRODKEYCLOAK_CONFIG_DIR}" print "> PRODKEYCLOAK_URL: ${PRODKEYCLOAK_URL}" print "> KEYCLOAK_DOCKER_IMAGE: ${KEYCLOAK_DOCKER_IMAGE}" + + generate-ca-server-client-kpi prodkeycloak $PRODKEYCLOAK_CONFIG_DIR } start_prodkeycloak() { begin "Starting prodkeycloak ..." @@ -44,7 +46,7 @@ start_prodkeycloak() { --https-certificate-key-file=/opt/keycloak/data/import/server_prodkeycloak_key.pem \ --hostname=prodkeycloak --hostname-admin=prodkeycloak --https-port=8443 - wait_for_oidc_endpoint prodkeycloak $PRODKEYCLOAK_URL $MOUNT_PRODKEYCLOAK_CONF_DIR/ca_certificate.pem + wait_for_oidc_endpoint prodkeycloak $PRODKEYCLOAK_URL $MOUNT_PRODKEYCLOAK_CONF_DIR/ca_prodkeycloak_certificate.pem end "prodkeycloak is ready" print " Note: If you modify prodkeycloak configuration, make sure to run the following command to export the configuration." print " docker exec -it prodkeycloak /opt/keycloak/bin/kc.sh export --users realm_file --realm test --dir /opt/keycloak/data/import/" diff --git a/selenium/bin/components/rabbitmq b/selenium/bin/components/rabbitmq index 2610a7b27948..46cbb1ee2738 100644 --- a/selenium/bin/components/rabbitmq +++ b/selenium/bin/components/rabbitmq @@ -10,6 +10,13 @@ init_rabbitmq() { [[ -z "${OAUTH_SERVER_CONFIG_BASEDIR}" ]] || print "> OAUTH_SERVER_CONFIG_BASEDIR: ${OAUTH_SERVER_CONFIG_BASEDIR}" [[ -z "${OAUTH_SERVER_CONFIG_DIR}" ]] || print "> OAUTH_SERVER_CONFIG_DIR: ${OAUTH_SERVER_CONFIG_DIR}" + if [[ ! -d "${RABBITMQ_CONFIG_DIR}/certs" ]]; then + mkdir ${RABBITMQ_CONFIG_DIR}/certs + fi + generate-ca-server-client-kpi 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 } start_rabbitmq() { diff --git a/selenium/bin/components/uaa b/selenium/bin/components/uaa index f07b535176f8..b344ee0211bd 100644 --- a/selenium/bin/components/uaa +++ b/selenium/bin/components/uaa @@ -16,6 +16,9 @@ init_uaa() { print "> UAA_CONFIG_DIR: ${UAA_CONFIG_DIR}" print "> UAA_URL: ${UAA_URL}" print "> UAA_DOCKER_IMAGE: ${UAA_DOCKER_IMAGE}" + + generate-ca-server-client-kpi uaa $UAA_CONFIG_DIR + generate-server-keystore-if-required uaa $UAA_CONFIG_DIR } start_uaa() { begin "Starting UAA ..." diff --git a/selenium/bin/suite_template b/selenium/bin/suite_template index 0b80d419908a..4b8427994dfe 100644 --- a/selenium/bin/suite_template +++ b/selenium/bin/suite_template @@ -375,6 +375,99 @@ generate_env_file() { source $ENV_FILE end "Finished generating env file." } +generate-ca-server-client-kpi() { + NAME=$1 + FOLDER=$2 + if [[ ! -f "${FOLDER}/server_${NAME}_key.pem" ]]; then + do_generate-ca-server-client-kpi $1 $2 + fi +} +do_generate-ca-server-client-kpi() { + NAME=$1 + FOLDER=$2 + ROOT=$SELENIUM_ROOT_FOLDER + + begin "Generate certs for $NAME" + + if [ ! -d "$ROOT/tls-gen" ]; then + git clone https://github.com/michaelklishin/tls-gen $ROOT/tls-gen + fi + + print "Generating CA and Server (localhost and $NAME) PKI under $FOLDER ..." + mkdir -p $FOLDER + + CUR_DIR=$(pwd) + cd $ROOT/tls-gen/basic + cp openssl.cnf openssl.cnf.bak + if [ -f "$FOLDER/openssl.cnf.in" ]; then + cp $FOLDER/openssl.cnf.in >> openssl.cnf + fi + if [[ ! -z "${DEBUG}" ]]; then + print "Used this openssl.conf" + cat openssl.cnf + fi + make CN=$NAME CLIENT_ALT_NAME=internaluser + cp openssl.cnf.bak openssl.cnf + cd $CUR_DIR + + cp $ROOT/tls-gen/basic/result/ca_certificate.pem $FOLDER/ca_${NAME}_certificate.pem + cp $ROOT/tls-gen/basic/result/server_${NAME}_certificate.pem $FOLDER + cp $ROOT/tls-gen/basic/result/server_${NAME}_key.pem $FOLDER + cp $ROOT/tls-gen/basic/result/server_${NAME}.p12 $FOLDER + cp $ROOT/tls-gen/basic/result/client_${NAME}_certificate.pem $FOLDER + cp $ROOT/tls-gen/basic/result/client_${NAME}_key.pem $FOLDER + cp $ROOT/tls-gen/basic/result/client_${NAME}.p12 $FOLDER + chmod ugo+r $FOLDER/*.pem + end "SSL Certificates generated for $NAME under $FOLDER" +} +generate-truststore-if-required() { + NAME=$1 + FOLDER=$2 + if [[ ! -f "${FOLDER}/truststore.jks" ]]; then + keytool -import \ + -trustcacerts \ + -file ${FOLDER}/ca_${NAME}_certificate.pem \ + -keystore ${FOLDER}/truststore.jks \ + -storepass foobar \ + -noprompt + fi +} +generate-server-keystore-if-required() { + NAME=$1 + FOLDER=$2 + if [ ! -f "${FOLDER}/server_${NAME}.jks" ]; then + keytool -importkeystore \ + -destkeystore ${FOLDER}/server_${NAME}.jks \ + -srckeystore ${FOLDER}/server_${NAME}.p12 \ + -deststoretype pkcs12 \ + -srcstoretype pkcs12 \ + -alias 1 \ + -destalias server-${NAME}-tls \ + -deststorepass foobar \ + -destkeypass foobar \ + -srcstorepass "" \ + -srckeypass "" \ + -noprompt + fi +} +generate-client-keystore-if-required() { + NAME=$1 + FOLDER=$2 + if [ ! -f "${FOLDER}/client_${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 "" \ + -srckeypass "" \ + -noprompt + fi +} run() { runWith rabbitmq } @@ -420,13 +513,13 @@ elif [[ "$COMMAND" == "stop-rabbitmq" ]] fi } determine_required_components_including_rabbitmq() { - if [[ "$@" != *"rabbitmq"* ]]; then - REQUIRED_COMPONENTS+=("rabbitmq") - fi for (( i=1; i<=$#; i++)) { eval val='$'$i REQUIRED_COMPONENTS+=( "$val" ) } + if [[ "$@" != *"rabbitmq"* ]]; then + REQUIRED_COMPONENTS+=("rabbitmq") + fi } determine_required_components_excluding_rabbitmq() { for (( i=1; i<=$#; i++)) { diff --git a/selenium/full-suite-management-ui b/selenium/full-suite-management-ui index 16ae3233eb31..dc58a67e0edf 100644 --- a/selenium/full-suite-management-ui +++ b/selenium/full-suite-management-ui @@ -1,10 +1,10 @@ authnz-mgt/basic-auth-behind-proxy.sh authnz-mgt/basic-auth.sh authnz-mgt/basic-auth-with-mgt-prefix.sh -authnz-mgt/multi-oauth-with-basic-auth-when-idps-down.sh authnz-mgt/multi-oauth-with-basic-auth.sh authnz-mgt/multi-oauth-without-basic-auth-and-resource-label-and-scopes.sh authnz-mgt/multi-oauth-without-basic-auth.sh +authnz-mgt/multi-oauth-with-basic-auth-when-idps-down.sh authnz-mgt/oauth-and-basic-auth.sh authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix.sh diff --git a/selenium/package.json b/selenium/package.json index a113534b77b5..7bab8c6add7d 100644 --- a/selenium/package.json +++ b/selenium/package.json @@ -20,6 +20,7 @@ "mqtt": "^5.3.3", "path": "^0.12.7", "proxy": "^1.0.2", + "rhea": "^3.0.3", "selenium-webdriver": "^4.19.0", "xmlhttprequest": "^1.8.0" }, diff --git a/selenium/run-suites.sh b/selenium/run-suites.sh index b1d16a519578..70f7e5685a45 100755 --- a/selenium/run-suites.sh +++ b/selenium/run-suites.sh @@ -30,7 +30,7 @@ do fi echo -e "=== $TEST_STATUS $SUITE ===========================================" echo " " -done <<< "$(cat $SCRIPT/$SUITE_FILE | sort)" +done <<< "$(cat $SCRIPT/$SUITE_FILE)" echo -e "=== Summary (${TOTAL_SUITES}/${GREEN}${#SUCCESSFUL_SUITES[@]}/${RED}${#FAILED_SUITES[@]}${NC}) ============================================" if [ ${#SUCCESSFUL_SUITES[@]} -gt 0 ]; then echo -e " > ${GREEN}Successful suites ${NC}"; fi diff --git a/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh b/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh index 17c83430ebc9..5fc83d8d9818 100755 --- a/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh +++ b/selenium/suites/authnz-mgt/basic-auth-behind-proxy.sh @@ -6,4 +6,4 @@ TEST_CASES_PATH=/basic-auth PROFILES="proxy" source $SCRIPT/../../bin/suite_template -runWith proxy +runWith rabbitmq proxy diff --git a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh index efbc223badc1..1217a386a998 100755 --- a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh +++ b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-and-prefix-via-proxy.sh @@ -7,4 +7,4 @@ TEST_CONFIG_PATH=/oauth PROFILES="uaa fakeportal fakeproxy fakeportal-mgt-oauth-provider idp-initiated mgt-prefix uaa-oauth-provider" source $SCRIPT/../../bin/suite_template $@ -runWith uaa fakeportal fakeproxy +runWith rabbitmq uaa fakeportal fakeproxy diff --git a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh index 1de40086af1d..fc348fb5e189 100755 --- a/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh +++ b/selenium/suites/authnz-mgt/oauth-idp-initiated-with-uaa-via-proxy.sh @@ -7,4 +7,4 @@ TEST_CONFIG_PATH=/oauth PROFILES="uaa fakeportal fakeproxy fakeportal-mgt-oauth-provider idp-initiated uaa-oauth-provider" source $SCRIPT/../../bin/suite_template $@ -runWith uaa fakeportal fakeproxy +runWith rabbitmq uaa fakeportal fakeproxy diff --git a/selenium/test/amqp.js b/selenium/test/amqp.js index 715cd079da89..fe21cfdc8f87 100644 --- a/selenium/test/amqp.js +++ b/selenium/test/amqp.js @@ -42,12 +42,12 @@ module.exports = { }) let connection = container.connect(getConnectionOptions()) let receiver = connection.open_receiver({ - source: 'examples', + source: 'my-queue', target: 'receiver-target', name: 'receiver-link' }) let sender = connection.open_sender({ - target: 'examples', + target: 'my-queue', source: 'sender-source', name: 'sender-link' }) diff --git a/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.docker b/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.docker index b1e4f12b6b53..cd05083899e2 100644 --- a/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.docker +++ b/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.docker @@ -1,2 +1,2 @@ export OAUTH_PROVIDER_URL=https://devkeycloak:8442/realms/dev -export OAUTH_NODE_EXTRA_CA_CERTS=multi-oauth/devkeycloak/ca_certificate.pem +export OAUTH_NODE_EXTRA_CA_CERTS=multi-oauth/devkeycloak/ca_devkeycloak_certificate.pem diff --git a/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.local b/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.local index b1e4f12b6b53..cd05083899e2 100644 --- a/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.local +++ b/selenium/test/authnz-msg-protocols/env.auth-oauth-dev.local @@ -1,2 +1,2 @@ export OAUTH_PROVIDER_URL=https://devkeycloak:8442/realms/dev -export OAUTH_NODE_EXTRA_CA_CERTS=multi-oauth/devkeycloak/ca_certificate.pem +export OAUTH_NODE_EXTRA_CA_CERTS=multi-oauth/devkeycloak/ca_devkeycloak_certificate.pem diff --git a/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.docker b/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.docker index 840561447fd2..935fd0dea6f2 100644 --- a/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.docker +++ b/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.docker @@ -1,2 +1,2 @@ export OAUTH_PROVIDER_URL=https://prodkeycloak:8442/realms/prod -export OAUTH_NODE_EXTRA_CA_CERTS=multi-oauth/prodkeycloak/ca_certificate.pem +export OAUTH_NODE_EXTRA_CA_CERTS=multi-oauth/prodkeycloak/ca_prodkeycloak_certificate.pem diff --git a/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.local b/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.local index 840561447fd2..935fd0dea6f2 100644 --- a/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.local +++ b/selenium/test/authnz-msg-protocols/env.auth-oauth-prod.local @@ -1,2 +1,2 @@ export OAUTH_PROVIDER_URL=https://prodkeycloak:8442/realms/prod -export OAUTH_NODE_EXTRA_CA_CERTS=multi-oauth/prodkeycloak/ca_certificate.pem +export OAUTH_NODE_EXTRA_CA_CERTS=multi-oauth/prodkeycloak/ca_prodkeycloak_certificate.pem diff --git a/selenium/test/authnz-msg-protocols/env.docker.devkeycloak b/selenium/test/authnz-msg-protocols/env.docker.devkeycloak index 2b359b653a94..8f4ac30830db 100644 --- a/selenium/test/authnz-msg-protocols/env.docker.devkeycloak +++ b/selenium/test/authnz-msg-protocols/env.docker.devkeycloak @@ -1,2 +1,2 @@ export DEVKEYCLOAK_URL=https://devkeycloak:8442/realms/dev -export DEVKEYCLOAK_CA_CERT=/config/oauth/keycloak/ca_certificate.pem +export DEVKEYCLOAK_CA_CERT=/config/oauth/keycloak/ca_devkeycloak_certificate.pem diff --git a/selenium/test/authnz-msg-protocols/env.docker.prodkeycloak b/selenium/test/authnz-msg-protocols/env.docker.prodkeycloak index e929f0246e9f..82a1215b373c 100644 --- a/selenium/test/authnz-msg-protocols/env.docker.prodkeycloak +++ b/selenium/test/authnz-msg-protocols/env.docker.prodkeycloak @@ -1,2 +1,2 @@ export PRODKEYCLOAK_URL=https://prodkeycloak:8443/realms/prod -export PRODKEYCLOAK_CA_CERT=/config/oauth/keycloak/ca_certificate.pem +export PRODKEYCLOAK_CA_CERT=/config/oauth/keycloak/ca_prodkeycloak_certificate.pem diff --git a/selenium/test/authnz-msg-protocols/env.local.devkeycloak b/selenium/test/authnz-msg-protocols/env.local.devkeycloak index 8e5a2f2e9285..23978f5c87e5 100644 --- a/selenium/test/authnz-msg-protocols/env.local.devkeycloak +++ b/selenium/test/authnz-msg-protocols/env.local.devkeycloak @@ -1,2 +1,2 @@ export DEVKEYCLOAK_URL=https://localhost:8442/realms/dev -export DEVKEYCLOAK_CA_CERT=test/multi-oauth/devkeycloak/ca_certificate.pem +export DEVKEYCLOAK_CA_CERT=test/multi-oauth/devkeycloak/ca_devkeycloak_certificate.pem diff --git a/selenium/test/authnz-msg-protocols/env.local.prodkeycloak b/selenium/test/authnz-msg-protocols/env.local.prodkeycloak index c636bf8fcd55..3b98ef1a4c3c 100644 --- a/selenium/test/authnz-msg-protocols/env.local.prodkeycloak +++ b/selenium/test/authnz-msg-protocols/env.local.prodkeycloak @@ -1,2 +1,2 @@ export PRODKEYCLOAK_URL=https://localhost:8443/realms/prod -export PRODKEYCLOAK_CA_CERT=test/multi-oauth/prodkeycloak/ca_certificate.pem +export PRODKEYCLOAK_CA_CERT=test/multi-oauth/prodkeycloak/ca_prodkeycloak_certificate.pem diff --git a/selenium/test/basic-auth/certs/ca_rabbitmq_certificate.pem b/selenium/test/basic-auth/certs/ca_rabbitmq_certificate.pem new file mode 100644 index 000000000000..772c2f9b84f3 --- /dev/null +++ b/selenium/test/basic-auth/certs/ca_rabbitmq_certificate.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDhDCCAmygAwIBAgIUGj1qIVmaPreBbuiv/5ClTnSYS+EwDQYJKoZIhvcNAQEL +BQAwSzE6MDgGA1UEAwwxVExTR2VuU2VsZlNpZ25lZFJvb3RDQSAyMDI0LTExLTI4 +VDExOjI4OjQxLjYxMjUxMDENMAsGA1UEBwwEJCQkJDAeFw0yNDExMjgxMDI4NDFa +Fw0zNDExMjYxMDI4NDFaMEsxOjA4BgNVBAMMMVRMU0dlblNlbGZTaWduZWRSb290 +Q0EgMjAyNC0xMS0yOFQxMToyODo0MS42MTI1MTAxDTALBgNVBAcMBCQkJCQwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfI5C+29ZY9phf1yyjr8kWpLDB +EAESadATme+N/C/Ogmoli8JvFcmH3Ct2QZ1UO/iMYuqnob1s4lt6Jmd4IITJEkoP +jZU4ZfpnQZ7aKp4d9k476TAP47Bon9MD5AhsOmZhTNPDwWJEDH0OzQ89Ei9zUwbH +3Y9gmRS2QNw68+pmIL5EHd+l/Yp1rmaoy+jfUpEIDqcXbLQn+1kaAgZMAttvydoR +a6ioDgAP7G4EymeUTHd2OeUFLuY1uT0yje+nUfOOtJX29DX6JZ6Dw+9J/pUnYxQ/ +169HNOOMaGC7KNkwmWj0oIQjWgunV9/cHFtTSENF2C0ltwyYdyIpnqgTAl6bAgMB +AAGjYDBeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBT9 +wcqXKAFYCcs5wMTUDmWUN3F43DAfBgNVHSMEGDAWgBT9wcqXKAFYCcs5wMTUDmWU +N3F43DANBgkqhkiG9w0BAQsFAAOCAQEAR8X86jeXZMLdjdQQBVm+RB4/sTryo79Z +SL6y1RxcvRdrE62L0yPk39shoihJhxtP9k3glN72+g4QE/1Fk4anFc9eCQ5X11Iy +oyW6cfXCMAenY66wdDvqdZOONjEXC5bwaKGEajByZmfKfB5eMoyQmixaH+NJ+q/8 +OYYlpuMBIXoFIQ3VH3+1YdWeBpkCEhyt6kHoC7ql0jD5sDwMBEMw1OfcaTEabnlS +idVDFE2tRj7l1Ni3XNUxfNHGC51N/gogF/rgyBblHE7chnrV6Qt6Uj0nnN5nkE30 +bZwTcXk0mkEnUXMl7Egreg9VRDtKWej5YATsrHvCVtahoddBSyZ4gw== +-----END CERTIFICATE----- diff --git a/selenium/test/basic-auth/certs/client_rabbitmq.jks b/selenium/test/basic-auth/certs/client_rabbitmq.jks new file mode 100644 index 000000000000..5e49d0a92181 Binary files /dev/null and b/selenium/test/basic-auth/certs/client_rabbitmq.jks differ diff --git a/selenium/test/basic-auth/certs/client_rabbitmq.p12 b/selenium/test/basic-auth/certs/client_rabbitmq.p12 new file mode 100644 index 000000000000..4fb8d5e46bb2 Binary files /dev/null and b/selenium/test/basic-auth/certs/client_rabbitmq.p12 differ diff --git a/selenium/test/basic-auth/certs/client_rabbitmq_certificate.pem b/selenium/test/basic-auth/certs/client_rabbitmq_certificate.pem new file mode 100644 index 000000000000..c03de28500c2 --- /dev/null +++ b/selenium/test/basic-auth/certs/client_rabbitmq_certificate.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDvDCCAqSgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBLMTowOAYDVQQDDDFUTFNH +ZW5TZWxmU2lnbmVkUm9vdENBIDIwMjQtMTEtMjhUMTE6Mjg6NDEuNjEyNTEwMQ0w +CwYDVQQHDAQkJCQkMB4XDTI0MTEyODEwMjg0MVoXDTM0MTEyNjEwMjg0MVowJDER +MA8GA1UEAwwIcmFiYml0bXExDzANBgNVBAoMBmNsaWVudDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAMDY0kkcAGOKMF8BgDwsyZlrxxt2M4H4pTItS5u0 +FoQfb4eOjsBsFXWsIAn0quBEa8s8bOteKOKxmU2Zd5jurlfh9Unjc9o+DQJ5Xr0z +hDq/5ZaYwTqV7KYRecR8jXCpe+NZ8JIgxneF/RPq8PeS4TZDbVmPWchTKvaRG+3R +LXhC5Op0JeBe7ttoao4kOMxd2muGNm/o04VIjY/9/43qKfNI8BVYvk0no5bim42A +SJHcpfrGZzOBKcQDWDxiHyKhRrMuw5BBuwJt3qgwaU7ZYcJf5r1+D0S07ypUs30G +0ae97v/b6D91UZTa+2uqxKUI2AtmyZYmaYasgo11FNGYvYsCAwEAAaOB0TCBzjAJ +BgNVHRMEAjAAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDAjAsBgNV +HREEJTAjgghyYWJiaXRtcYIMaW50ZXJuYWx1c2Vygglsb2NhbGhvc3QwMQYDVR0f +BCowKDAmoCSgIoYgaHR0cDovL2NybC1zZXJ2ZXI6ODAwMC9iYXNpYy5jcmwwHQYD +VR0OBBYEFC8PFNEP5PXyEIBf93c6u8DnFemPMB8GA1UdIwQYMBaAFP3BypcoAVgJ +yznAxNQOZZQ3cXjcMA0GCSqGSIb3DQEBCwUAA4IBAQBE2cTj4fXs/GusvJ01G/Dz +1wqNTYP43nG9f41apjc6NrWkVAxbVSUn6NxdOC8ufg3x2YANT7toH3l3PBGAFzXW +C1quRrz6UAG3dX1V2lXpAmxcfjUyDSo3tMx55iXTpPk9bv6EBEZFl+o9eTyHeQ1q +dlog6xr6LxQENRmrnLCWjSr7iWpI8HveJdSw5DQoFexQjOe2J8ltKFpc2/2R4rxP ++NhCUx1itUWKXIEDS5rwevl2xDzU2eYzJ3YhByLDT+mBdGW67Sw3qofsrCQN9c1q +OuExsKVpnmYI1whIdRar3zwcbuMx3fuBKvHY2nQU+XNo55qFpdOosLKKWnn3T2Tm +-----END CERTIFICATE----- diff --git a/selenium/test/basic-auth/certs/client_rabbitmq_key.pem b/selenium/test/basic-auth/certs/client_rabbitmq_key.pem new file mode 100644 index 000000000000..e4620fc1c527 --- /dev/null +++ b/selenium/test/basic-auth/certs/client_rabbitmq_key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDA2NJJHABjijBf +AYA8LMmZa8cbdjOB+KUyLUubtBaEH2+Hjo7AbBV1rCAJ9KrgRGvLPGzrXijisZlN +mXeY7q5X4fVJ43PaPg0CeV69M4Q6v+WWmME6leymEXnEfI1wqXvjWfCSIMZ3hf0T +6vD3kuE2Q21Zj1nIUyr2kRvt0S14QuTqdCXgXu7baGqOJDjMXdprhjZv6NOFSI2P +/f+N6inzSPAVWL5NJ6OW4puNgEiR3KX6xmczgSnEA1g8Yh8ioUazLsOQQbsCbd6o +MGlO2WHCX+a9fg9EtO8qVLN9BtGnve7/2+g/dVGU2vtrqsSlCNgLZsmWJmmGrIKN +dRTRmL2LAgMBAAECggEARVLsLRnizeWUQ+LfPUKAaiWDWszf8T337JS51Ewlt/Mw +/ZLyoBt6j2WD0vBgKOSPt2yOXwHnQq7DRFEB3DkY9UCmE5yvPeoGdTg6JVuKki// +kWZyN+RDQOORWV/I3JIglfbz8yPTFI5XDrzrSKRFT2NnwMU2ajvzetVpK9GBPfR2 +D9IPDr2pokoAZ4wDbXAZsrRXEatkw5DlEqBAo/TLkNjJiU8ADMTpw1mehVXAz9pf +nuKvR1ugrjfHUoxQxlIykSnVtJw1aHrF1bW4PPJUKHdp+Mrf4UpEyWxp/yDvYdgy +GzwFmthb3PU9yAIMMyaJe/ZgVWzaSrMku7nEUysNuQKBgQDs+yti3BOh/UEFW6p8 +4pdqwSapj9LjJ6QPHMdNfV5HR1TZA3IaThKSYYCJZnuvPt5KBseVbWO+bZ8DcLfm +QIQeNGV1fFB41fAHzYQwdneRlugMV8NWxN4K9ZYeRyqYq80HIgaOtSOUZhCITIwf +kq6dqe8p33WjI6eb8hTKhc5zdwKBgQDQUufNhA19DLWQGjTaRNGEtHIn6oXxxJrT +q0fJEP+CKSmUt2Dnm/iJjOKydsYdq2kz5aB0UqwHVhUqAuF2kITVyaPh/FHnSoj2 +hjlzz0JSRlALgs8ySZfSh6Q9AKB2i1lBdG21WfbpFE705T9ZqDwT87JzdQuDDY/B +yxAju21DjQKBgQCx0AxP0z3P8AyXjp4vsn1WlrMBy267DoVk6X0JwaW56eXaJ2G4 +Jxh8STh+4Cyx44Q7GzcqAbgzrGEB3dO+qm33k+0E6FAhOrUtxaEIE/vHe+mFSVzC +gFjy9C69bTyi7VWbooY1Eekuch65hmYlUpQ+rMFNM+Q6kogy1MOQ6jFsJQKBgEEZ +p1aR7aUmU5a0mc+bsd3GheXzY+gpiDidTdGHflEui8/tflriYsiZPj6G32JmLnoJ +SBsRurCQNgzq2Yozn08vtAbq0q10nVhsmYeXPSJ41orCVf1hAhDIUoq9p2dkJIBP +4fjKJF6x+fqNqT5bVGrnvNxXt0E8+6+TxXdlGsABAoGAIMLg7mGM4jTPC1MiOO95 +aqXB2S38BwAbqnJPaNCaCtmo8aqYoydzWmp7OIfnyW1hJrF484HH38wfMeOg4krl +s8OnJ/UETPbdmPclniaK1GT45AWyEarkKj6+dxe/3p/x2ymYcxg+eT9NYFAAZAwL +gi231AilSiuPDS7BYMLrZFQ= +-----END PRIVATE KEY----- diff --git a/selenium/test/basic-auth/certs/server_rabbitmq.jks b/selenium/test/basic-auth/certs/server_rabbitmq.jks new file mode 100644 index 000000000000..1bef3d0ac31c Binary files /dev/null and b/selenium/test/basic-auth/certs/server_rabbitmq.jks differ diff --git a/selenium/test/basic-auth/certs/server_rabbitmq.p12 b/selenium/test/basic-auth/certs/server_rabbitmq.p12 new file mode 100644 index 000000000000..6984224ddbfa Binary files /dev/null and b/selenium/test/basic-auth/certs/server_rabbitmq.p12 differ diff --git a/selenium/test/basic-auth/certs/server_rabbitmq_certificate.pem b/selenium/test/basic-auth/certs/server_rabbitmq_certificate.pem new file mode 100644 index 000000000000..c4238db28868 --- /dev/null +++ b/selenium/test/basic-auth/certs/server_rabbitmq_certificate.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDujCCAqKgAwIBAgIBATANBgkqhkiG9w0BAQsFADBLMTowOAYDVQQDDDFUTFNH +ZW5TZWxmU2lnbmVkUm9vdENBIDIwMjQtMTEtMjhUMTE6Mjg6NDEuNjEyNTEwMQ0w +CwYDVQQHDAQkJCQkMB4XDTI0MTEyODEwMjg0MVoXDTM0MTEyNjEwMjg0MVowJDER +MA8GA1UEAwwIcmFiYml0bXExDzANBgNVBAoMBnNlcnZlcjCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBALhd0CB3BK/pCs8QanFyn9TT+bhNU0+YlLpURMrj +h5e1fZ6qAx5ai+Taw9ZstL4bFx3sK6zrSQ6QU0EvAes+K6fgEoVkiqOLa38kVuYj +//luTORI0xI5U+U2lFwXHbgdUcbFGoIRv7H/z4G/VLUedpcvdE9ElNnsAr/mDO97 +F0HELNgdnT60qKa/9FNbx5f1OhTX508AtyL4UeVSNoAGp7SZ97B6FRff2FXkWmCn +8AOiOmMaqL7DRHcRg0LSkLCZw2u5ywc226xxf+of9n3VY2IBLH5s88cT974sahQx +6RUMXtZUSZgBS6qa7cjAquSlhRrF6bEfAFSK0ZlTkM6wQDcCAwEAAaOBzzCBzDAJ +BgNVHRMEAjAAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAqBgNV +HREEIzAhgghyYWJiaXRtcYIKV0pSN0Q0RkhHWIIJbG9jYWxob3N0MB0GA1UdDgQW +BBTX1VHnNVYib0QKY9S20UxKEBpYgzAfBgNVHSMEGDAWgBT9wcqXKAFYCcs5wMTU +DmWUN3F43DAxBgNVHR8EKjAoMCagJKAihiBodHRwOi8vY3JsLXNlcnZlcjo4MDAw +L2Jhc2ljLmNybDANBgkqhkiG9w0BAQsFAAOCAQEAhubcLC2XgHmGSMpZS/7gVE94 +DDAjjjn96PP5MwaVstC2w7ocyxttUah/LjAhb+MU8VO8HL1oMl8qESyXuT9jFSjK +w/j88K4RHPtR4ZE+0tGfYX00JM/lKbU/QinSF9YB8Z5YYZ9w1l9Nidcc9Qm3xbtS +cq6uEY1/sXvVqjJRpEI4K61EosT0v9vBbEEecDRWT0hNGbKPFVO0eB2DRutkScw3 +8OudAXD2T2fx5/DiNWr4o9IOT3ZqJQU7OYcDkhkz3l4eJgv62dNjMMBVUIdvDbSN +PirvixWuoFUZRXsZ7bSdHkOlKTBgmqvSwhQ4gEcKf66hVIIOsSkFc6rEfBOZJw== +-----END CERTIFICATE----- diff --git a/selenium/test/basic-auth/certs/server_rabbitmq_key.pem b/selenium/test/basic-auth/certs/server_rabbitmq_key.pem new file mode 100644 index 000000000000..3d6768f2d08a --- /dev/null +++ b/selenium/test/basic-auth/certs/server_rabbitmq_key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC4XdAgdwSv6QrP +EGpxcp/U0/m4TVNPmJS6VETK44eXtX2eqgMeWovk2sPWbLS+Gxcd7Cus60kOkFNB +LwHrPiun4BKFZIqji2t/JFbmI//5bkzkSNMSOVPlNpRcFx24HVHGxRqCEb+x/8+B +v1S1HnaXL3RPRJTZ7AK/5gzvexdBxCzYHZ0+tKimv/RTW8eX9ToU1+dPALci+FHl +UjaABqe0mfewehUX39hV5Fpgp/ADojpjGqi+w0R3EYNC0pCwmcNrucsHNtuscX/q +H/Z91WNiASx+bPPHE/e+LGoUMekVDF7WVEmYAUuqmu3IwKrkpYUaxemxHwBUitGZ +U5DOsEA3AgMBAAECggEACUsVTCWjs1hMZq6dpvVPsDM1McCYE/mNeaz4wL9iXNfV +qrNIL/YBejo6x+q326NS8XuvoepERvsoby826gw6uB4X4Oh2ApNrCkAjLzueUgzo +zFMNbKw+Gd478T5rDZZQwnO6B9dsMcVCyPgDhZOxB6LpOnurAycd5l1qxoGOZQ6v ++hplfHerXKIhZteo2gsj7rE+xmB3qTx4i6T3FASpT1/w0ROo/cy9tuv3+ncYook9 +SRq01qkgAwU5qgaWmulduex14FR2upC5GbhEi5xEGzVLVzdjFlTWWX3Aw2QVnRCE +f9vmZFMYKC0VqasHMl7HKvw5lFKt3Zq2j5F6iJxP4QKBgQDq0YNu6r8J4x7a84LP +H7D6tN60Gzo7ZEivg1O7GEGdIV6ddlSizs9uAJOZrFG6cyRFS18+avkc5MYgIyv7 +Jr6MOwwmBr6Fip0cyC9ywuaVV1D04/UHUuxTqy8h3lbsE4R/BU+BKF1k6DAWJVrr +K59KM41byb2tMEzFhftjAe2xlwKBgQDI/0AMjSM9BXXut18spV5TdWzmg02+1qj8 +nXg1CuAFup4uP4ir8Zg4w3VWY219ANQk4S1fwn33DJmGcPXtao0XZTRYBzlyJNEe +ofgWoPLHawVDOgKTKgnAzIBD5firAZkclLyKHSY/PHN05FKAksiA5fNY+NW+hpNa +03KsfrJ6YQKBgHUHEe/3glpVHQ2WCv1bGAL6nXs5jp4G7sq6MsKt5hV/if4D+U5i +r7JtCyKtZNX9iHgYhlE/UwP5aFyf6s1yk8ijrPxOpCk92et8QVl6lRyctbY23elW +hH12dTj17HAfkgsUBHmkOleN+FkxKMzHos2CP9MdCjEEP1651X2UenflAoGAQiaH +rNnSjCW874jYQPhX9/3AjokOUE2TpjgpNMPUgO4vWyc70uMbZysk9f6ZLTfVmiGl +7ksza9hwuqd4uN+Fefqr5IDULjXhwUQrQz9LR8h4Hez8pfSC6zoiyLXqRlWrT5XA +C3CWgt9hXEo8wOYOKSYFFfYnWqIt4wmORykXkmECgYBgfiUvs8DxQBG8CYPyO7rf +XBplYmjZM6aSnl9odFQ7V2PM4CK0povRlsvt5CzWWQQYjVFO8ukd3ldQ0kMoieay +FiFWYjpyHnffZGoJ3x0PFTalvClCD3hx02KTt8fq45VAkI9FvGAZ7dHw3RSt6DIG +jr2MtWJxMhzhsR4lRvJ6aw== +-----END PRIVATE KEY----- diff --git a/selenium/test/basic-auth/certs/truststore.jks b/selenium/test/basic-auth/certs/truststore.jks new file mode 100644 index 000000000000..deeefb0502b0 Binary files /dev/null and b/selenium/test/basic-auth/certs/truststore.jks differ diff --git a/selenium/test/multi-oauth/env.docker.devkeycloak b/selenium/test/multi-oauth/env.docker.devkeycloak index 8b1ad3234463..19fa4efa0f5d 100644 --- a/selenium/test/multi-oauth/env.docker.devkeycloak +++ b/selenium/test/multi-oauth/env.docker.devkeycloak @@ -1,2 +1,2 @@ export DEVKEYCLOAK_URL=https://devkeycloak:8442/realms/dev -export DEVKEYCLOAK_CA_CERT=/config/oauth/keycloak/ca_certificate.pem +export DEVKEYCLOAK_CA_CERT=/config/oauth/devkeycloak/ca_devkeycloak_certificate.pem diff --git a/selenium/test/multi-oauth/env.docker.prodkeycloak b/selenium/test/multi-oauth/env.docker.prodkeycloak index e929f0246e9f..d95461adff3b 100644 --- a/selenium/test/multi-oauth/env.docker.prodkeycloak +++ b/selenium/test/multi-oauth/env.docker.prodkeycloak @@ -1,2 +1,2 @@ export PRODKEYCLOAK_URL=https://prodkeycloak:8443/realms/prod -export PRODKEYCLOAK_CA_CERT=/config/oauth/keycloak/ca_certificate.pem +export PRODKEYCLOAK_CA_CERT=/config/oauth/prodkeycloak/ca_prodkeycloak_certificate.pem diff --git a/selenium/test/multi-oauth/env.local.devkeycloak b/selenium/test/multi-oauth/env.local.devkeycloak index a1e2d5d596c2..92044ba17881 100644 --- a/selenium/test/multi-oauth/env.local.devkeycloak +++ b/selenium/test/multi-oauth/env.local.devkeycloak @@ -1,2 +1,2 @@ export DEVKEYCLOAK_URL=https://localhost:8442/realms/dev -export DEVKEYCLOAK_CA_CERT=deps/rabbitmq_management/selenium/test/multi-oauth/devkeycloak/ca_certificate.pem +export DEVKEYCLOAK_CA_CERT=deps/rabbitmq_management/selenium/test/multi-oauth/devkeycloak/ca_prodkeycloak_certificate.pem diff --git a/selenium/test/multi-oauth/env.local.prodkeycloak b/selenium/test/multi-oauth/env.local.prodkeycloak index e267b558cd49..b8745aa8df98 100644 --- a/selenium/test/multi-oauth/env.local.prodkeycloak +++ b/selenium/test/multi-oauth/env.local.prodkeycloak @@ -1,2 +1,2 @@ export PRODKEYCLOAK_URL=https://localhost:8443/realms/prod -export PRODKEYCLOAK_CA_CERT=deps/rabbitmq_management/selenium/test/multi-oauth/prodkeycloak/ca_certificate.pem +export PRODKEYCLOAK_CA_CERT=deps/rabbitmq_management/selenium/test/multi-oauth/prodkeycloak/ca_prodkeycloak_certificate.pem diff --git a/selenium/test/multi-oauth/rabbitmq.tls.conf b/selenium/test/multi-oauth/rabbitmq.tls.conf index 61107323c637..7401d4079b1d 100644 --- a/selenium/test/multi-oauth/rabbitmq.tls.conf +++ b/selenium/test/multi-oauth/rabbitmq.tls.conf @@ -2,13 +2,13 @@ auth_backends.1 = rabbit_auth_backend_oauth2 listeners.ssl.1 = 5671 -ssl_options.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_certificate.pem +ssl_options.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_rabbitmq_certificate.pem ssl_options.certfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_certificate.pem ssl_options.keyfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_key.pem ssl_options.verify = verify_peer ssl_options.fail_if_no_peer_cert = true management.ssl.port = 15671 -management.ssl.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_certificate.pem +management.ssl.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_rabbitmq_certificate.pem management.ssl.certfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_certificate.pem management.ssl.keyfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_key.pem diff --git a/selenium/test/oauth/certs/ca_certificate.pem b/selenium/test/oauth/certs/ca_certificate.pem deleted file mode 100644 index cd37bea304f5..000000000000 --- a/selenium/test/oauth/certs/ca_certificate.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDezCCAmOgAwIBAgIJAOA06nrAwraBMA0GCSqGSIb3DQEBCwUAMEwxOzA5BgNV -BAMMMlRMU0dlblNlbGZTaWduZWR0Um9vdENBIDIwMjMtMTEtMTZUMTI6MjQ6NDcu -Mjg5MDkzMQ0wCwYDVQQHDAQkJCQkMB4XDTIzMTExNjExMjQ0N1oXDTMzMTExMzEx -MjQ0N1owTDE7MDkGA1UEAwwyVExTR2VuU2VsZlNpZ25lZHRSb290Q0EgMjAyMy0x -MS0xNlQxMjoyNDo0Ny4yODkwOTMxDTALBgNVBAcMBCQkJCQwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQDWJrvvUvpkiAhvIiciuTbFHRMC7VdOXdIM3y3I -Vt56Voj3dkCVitFcvTc+pkuqoQUaWRTc5M+875CaQSRIDfVyFTIGTyVXv6cZRcoz -0gcmYvopIJ4Wi5/xG9Qp8uJMtr+UBJ57ez6Urau/L3zETAVZA+y1bTylAlh4tjMH -I24bvyy4yNQbPtG4y5F9x484fn3H4x7lf6O/Xulcvy8vL1kyc/EgrF4fpjogwj58 -eQ5HLwbAlMRRxXxXX2U5tXlrv475WItp/1mhZ+j2yCMKB4tJ8tXbtpgou0JDtlN0 -8Jwm3+d5a6PxqynmgRAXStZ4Fda93Pa3FJfw1u63JrmOprG9AgMBAAGjYDBeMA8G -A1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBS2Icxjr1ucGCIx -ikeSG9igJf558jAfBgNVHSMEGDAWgBS2Icxjr1ucGCIxikeSG9igJf558jANBgkq -hkiG9w0BAQsFAAOCAQEAR0iG00uE2GnoWtaXEHYJTdvBBcStBB8qnRk19Qu/b8qd -HAhRGb31IiuYzNJxLxhOtXWQMKvsKPAKpPXP3c5XVAf2O156GoXEPkKQktF738Pp -rRlrQPqU9Qpm84rMC54EB7coxEs7HMx4do/kNaVPdqq++JIEAcWOEVKfudN+8TMR -XyUJT54jBacsTpAZNfY6boJmuQ+G6tkpQvlHOU6388IFuLPkYRO7h7CHVbDsMEXD -Ptg3PCK97nCVgs4xfQGR7nT2pawfEUQVMon/XShtXY0RIKpynwrgICHDdvMXRXlG -a4haA7sz8Wyroy6Ub5+X3s4YRumSQrhiwRzqU+f75A== ------END CERTIFICATE----- diff --git a/selenium/test/oauth/certs/server_rabbitmq_certificate.pem b/selenium/test/oauth/certs/server_rabbitmq_certificate.pem deleted file mode 100644 index ef57ff61a411..000000000000 --- a/selenium/test/oauth/certs/server_rabbitmq_certificate.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDxDCCAqygAwIBAgIBDTANBgkqhkiG9w0BAQsFADBMMTswOQYDVQQDDDJUTFNH -ZW5TZWxmU2lnbmVkdFJvb3RDQSAyMDIzLTExLTE2VDEyOjI0OjQ3LjI4OTA5MzEN -MAsGA1UEBwwEJCQkJDAeFw0yNDAyMDkwODE3MDFaFw0zNDAyMDYwODE3MDFaMCQx -ETAPBgNVBAMMCHJhYmJpdG1xMQ8wDQYDVQQKDAZzZXJ2ZXIwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQCjxmYRJeYfOnQ91ZSIZsjznnPiy0yukFnapF7Y -iIXxFCygEnw/hwqSG7ddkvDjNlc6P+K4rEEBmER87mEl0YqvAZ9/C6K4OANJFuD7 -kQYH3Uyt+aXJfeyByAjr8HM/jSHDZm5DpysVlSBMkJGg4sV9h38i0aT27+J0a4xm -Yb9pH+bbWKn4QflvOQi7IcyZ+PcB54/vCDZRtlypkT/6EuqTXqRHH9wGlYaos+Jo -XMQDWykYtN2160E1gUwW1OhdRlDHj21Tej9fYObRjb326au4e3ivTPqKYLYsSz0Y -dcRoM6SjvwGiAC131n2XeHyKTQrMeKOb+TTVHzJZG7iUM5iBAgMBAAGjgdgwgdUw -CQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG -AQUFBwMCMCkGA1UdEQQiMCCCCHJhYmJpdG1xgglsb2NhbGhvc3SCCWxvY2FsaG9z -dDAdBgNVHQ4EFgQUs9vJtNmoNWybsVgMmeRqcPGXRckwHwYDVR0jBBgwFoAUtiHM -Y69bnBgiMYpHkhvYoCX+efIwMQYDVR0fBCowKDAmoCSgIoYgaHR0cDovL2NybC1z -ZXJ2ZXI6ODAwMC9iYXNpYy5jcmwwDQYJKoZIhvcNAQELBQADggEBAHxsmfxpoGZg -AlLu+Y62TQxqp2i+PqLJHuGBdB/93NV3S3P3tlDaqHwYt0mveS7ej+JXhw9wvSZz -jmejWePL08FXD9KPggRP4/SsG6Adf/5+vcofYR23I7D4y9hsrDqZezCurWZ4LY4X -dYmIQcI6IwgcjffWhsyt3CEbU+yVg6jrjVWv5sVPi3xZUu/dwpTdrdNzeUIFM8vf -H3BS8EcLwtaNR4snLJlFIhuDfDv7Ewi1FsmM4zkSe/aHboUNDduI2poRW/EPtbdM -zD1pVXNh1Q9hkqFCD7l4Vua+JVsA7PWD7yr73pm2ak6GfgjA7Enj0a6KbAfAXLMr -otRknmbKCUU= ------END CERTIFICATE----- diff --git a/selenium/test/oauth/certs/server_rabbitmq_key.pem b/selenium/test/oauth/certs/server_rabbitmq_key.pem deleted file mode 100644 index f5df03f73df8..000000000000 --- a/selenium/test/oauth/certs/server_rabbitmq_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCjxmYRJeYfOnQ9 -1ZSIZsjznnPiy0yukFnapF7YiIXxFCygEnw/hwqSG7ddkvDjNlc6P+K4rEEBmER8 -7mEl0YqvAZ9/C6K4OANJFuD7kQYH3Uyt+aXJfeyByAjr8HM/jSHDZm5DpysVlSBM -kJGg4sV9h38i0aT27+J0a4xmYb9pH+bbWKn4QflvOQi7IcyZ+PcB54/vCDZRtlyp -kT/6EuqTXqRHH9wGlYaos+JoXMQDWykYtN2160E1gUwW1OhdRlDHj21Tej9fYObR -jb326au4e3ivTPqKYLYsSz0YdcRoM6SjvwGiAC131n2XeHyKTQrMeKOb+TTVHzJZ -G7iUM5iBAgMBAAECggEAOdYOpW+k3NJfypZqZeEmhiIm+qig4+TGVphFhmJwKrrd -J4pfpm+iJAb1sm3588N0+nUlM+Jg8pc7WIM2e4yMVVFVaiBJzpS5VE5oFW8Zmh1k -vuuyyH1X0F08CVZY3NCSY9cAiZO3e1+2kFNdmlt7MuFu3HT8tNfyOPriEiXi2tSA -qmgUmMql305wYwjIp+mTP8X7YKKdIdCXwPC2E1Kj5SseEc9NYvHdmeJ3nZCVATbS -h8aP7HB5GpsDMHbnnFzOqPfxIPxYkJ4JqE0iGpw+SMYbIGLVkMEGodpWjBwZiaaI -EMeJJk3Qs/QvVLDxhSsFXsaLGLgYN0rItYX9dUyroQKBgQDOOLKJ9OPcm3sAWo9e -byRYegDPPM06Es5s0hF0Pr0u6X8F7fDnpS74XVMlWxZzvXWgZQNwC2nYaGfNpK5t -E2FxIC0S69W4m1L6sp2sTRLSJo5NiZc4kNVjGvnmgIrNqMhJK8pLOh5xx6/kAbpo -/lydhtXWP0omw5imFkh3bGQuZwKBgQDLTsCu01OCNuQs0Y9hgW/iHzRpX1aHvp8X -u8v/AtOS3z5a3WptrLah/HHM5B/4Hh9dW4uljuR0zTsk8dFD8lQ/mdxbXjPGEcN6 -QNe1Md2nV0xAZsW1Xp1iFDomS5xSn+qWDmR0EAXvs0hHMQnX1k7+dp2mK1whRwdM -z4mv0cZg1wKBgDnuzaFZ7aVs/GoGBt7FpFVCuPV/JDxbSihh/0tD0MvcBrY4uQOq -cP6O4SvOYglTwTa1CfkxC6Qi+H5Z9DJqTmaEXoVBQYIiCHarNQZRhKcK89EuhQ/8 -CCZWTrwFgnjyIIoFxkfJ5QGb0nrgTWjvhD8wwOP2VbN8IWcPPX5nMeGjAoGBAL7b -y59T3E2d4k8A3C2ZKcOJr9ZMHhuJJClPr45SxPRYh10eB0+2mC0xpFPIxQpUnPUz -f8GIh4fvMtrX+LBkyhp7ApbztH75Jh2ayeXcTk1OctLyqCBAFleAzaYtzS7z2XHN -SRh8AlaoY+4RZ0AsfDP+frkEc5T57Sx6mLNpp2Y5AoGAXG5BGedrCMa44Ugpux41 -saTIlaXUOObxdsGTLMOy1Ppb9LW5yk4kS8ObP3SksjUUZrRUO/BagLukgcaS038/ -AbNDU5lMCmMfwxPN2lulERhaIA1BeVgmOwJYY7nqXkL5Yibu0OXnvvbCkt0eLnp2 -ATZBECwIxNuB9pixRmDhXsM= ------END PRIVATE KEY----- diff --git a/selenium/test/oauth/env.docker.keycloak b/selenium/test/oauth/env.docker.keycloak index 774a99ff3c9b..b293b57bc2b9 100644 --- a/selenium/test/oauth/env.docker.keycloak +++ b/selenium/test/oauth/env.docker.keycloak @@ -1,3 +1,3 @@ export KEYCLOAK_URL=https://keycloak:8443/realms/test export OAUTH_PROVIDER_URL=https://keycloak:8443/realms/test -export OAUTH_PROVIDER_CA_CERT=/config/oauth/keycloak/ca_certificate.pem +export OAUTH_PROVIDER_CA_CERT=/config/oauth/keycloak/ca_keycloak_certificate.pem diff --git a/selenium/test/oauth/env.local.keycloak b/selenium/test/oauth/env.local.keycloak index 1fa28ef79232..e691790c25d7 100644 --- a/selenium/test/oauth/env.local.keycloak +++ b/selenium/test/oauth/env.local.keycloak @@ -1,3 +1,3 @@ export KEYCLOAK_URL=https://localhost:8443/realms/test export OAUTH_PROVIDER_URL=https://localhost:8443/realms/test -export OAUTH_PROVIDER_CA_CERT=deps/rabbitmq_management/selenium/test/oauth/keycloak/ca_certificate.pem +export OAUTH_PROVIDER_CA_CERT=deps/rabbitmq_management/selenium/test/oauth/keycloak/ca_keycloak_certificate.pem diff --git a/selenium/test/oauth/keycloak/ca_certificate.pem b/selenium/test/oauth/keycloak/ca_certificate.pem deleted file mode 100644 index cd37bea304f5..000000000000 --- a/selenium/test/oauth/keycloak/ca_certificate.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDezCCAmOgAwIBAgIJAOA06nrAwraBMA0GCSqGSIb3DQEBCwUAMEwxOzA5BgNV -BAMMMlRMU0dlblNlbGZTaWduZWR0Um9vdENBIDIwMjMtMTEtMTZUMTI6MjQ6NDcu -Mjg5MDkzMQ0wCwYDVQQHDAQkJCQkMB4XDTIzMTExNjExMjQ0N1oXDTMzMTExMzEx -MjQ0N1owTDE7MDkGA1UEAwwyVExTR2VuU2VsZlNpZ25lZHRSb290Q0EgMjAyMy0x -MS0xNlQxMjoyNDo0Ny4yODkwOTMxDTALBgNVBAcMBCQkJCQwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQDWJrvvUvpkiAhvIiciuTbFHRMC7VdOXdIM3y3I -Vt56Voj3dkCVitFcvTc+pkuqoQUaWRTc5M+875CaQSRIDfVyFTIGTyVXv6cZRcoz -0gcmYvopIJ4Wi5/xG9Qp8uJMtr+UBJ57ez6Urau/L3zETAVZA+y1bTylAlh4tjMH -I24bvyy4yNQbPtG4y5F9x484fn3H4x7lf6O/Xulcvy8vL1kyc/EgrF4fpjogwj58 -eQ5HLwbAlMRRxXxXX2U5tXlrv475WItp/1mhZ+j2yCMKB4tJ8tXbtpgou0JDtlN0 -8Jwm3+d5a6PxqynmgRAXStZ4Fda93Pa3FJfw1u63JrmOprG9AgMBAAGjYDBeMA8G -A1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBS2Icxjr1ucGCIx -ikeSG9igJf558jAfBgNVHSMEGDAWgBS2Icxjr1ucGCIxikeSG9igJf558jANBgkq -hkiG9w0BAQsFAAOCAQEAR0iG00uE2GnoWtaXEHYJTdvBBcStBB8qnRk19Qu/b8qd -HAhRGb31IiuYzNJxLxhOtXWQMKvsKPAKpPXP3c5XVAf2O156GoXEPkKQktF738Pp -rRlrQPqU9Qpm84rMC54EB7coxEs7HMx4do/kNaVPdqq++JIEAcWOEVKfudN+8TMR -XyUJT54jBacsTpAZNfY6boJmuQ+G6tkpQvlHOU6388IFuLPkYRO7h7CHVbDsMEXD -Ptg3PCK97nCVgs4xfQGR7nT2pawfEUQVMon/XShtXY0RIKpynwrgICHDdvMXRXlG -a4haA7sz8Wyroy6Ub5+X3s4YRumSQrhiwRzqU+f75A== ------END CERTIFICATE----- diff --git a/selenium/test/oauth/keycloak/server_keycloak_certificate.pem b/selenium/test/oauth/keycloak/server_keycloak_certificate.pem deleted file mode 100644 index 242c153987b7..000000000000 --- a/selenium/test/oauth/keycloak/server_keycloak_certificate.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID0zCCArugAwIBAgIBAzANBgkqhkiG9w0BAQsFADBMMTswOQYDVQQDDDJUTFNH -ZW5TZWxmU2lnbmVkdFJvb3RDQSAyMDIzLTExLTE2VDEyOjI0OjQ3LjI4OTA5MzEN -MAsGA1UEBwwEJCQkJDAeFw0yMzExMTYxMTI0NDhaFw0zMzExMTMxMTI0NDhaMCQx -ETAPBgNVBAMMCGtleWNsb2FrMQ8wDQYDVQQKDAZzZXJ2ZXIwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQDso0G4gflW5HDiBuwrjvyYy3rUx/24IxHQzZMT -7o1qoXA/h8C0kUX7aS6XFij8hCNHdNG0GL/QPifKxwiW8JIK2Xpy6jdxDzooHaDU -+Tyk8BDFYnQtXaMsqb5zXJ/P4u8bjBP4X2+/gnbNF/1yyOZxpRObrWxX+C2IJ+vy -ruh+TCEqokJ5jE+m6GPgiqx56bytXX0KLhuI7jXT60NKGqNVCV8qn5fO4z/fh6FY -tFxRc0QHy48YHBFo+I+R9nW4xq+0pbctnjTzlfRxHYEWvnsrptc4AOa6b49HSShf -qmkxgVn3G/U5Gmtzu2IjPWfGVwRjBo4hhoeG/fV9FMhqz6fjAgMBAAGjgecwgeQw -CQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG -AQUFBwMCMDgGA1UdEQQxMC+CCGtleWNsb2Frghhtcm9zYWxlczBMVkRRLnZtd2Fy -ZS5jb22CCWxvY2FsaG9zdDAdBgNVHQ4EFgQUwxjubJIZkvDwv9aDtdNcDcfmSSQw -HwYDVR0jBBgwFoAUtiHMY69bnBgiMYpHkhvYoCX+efIwMQYDVR0fBCowKDAmoCSg -IoYgaHR0cDovL2NybC1zZXJ2ZXI6ODAwMC9iYXNpYy5jcmwwDQYJKoZIhvcNAQEL -BQADggEBAFmcToMQTRER97Mk5CK3qopzdFveJWHgyAHh35DQdCxtBadOXmC3n82p -dumNOKhSFNx6Hre38cQHBIuir2g4dvalfN7PwDttdi7TRPGS30bAbA4/VWtld9bt -66QDSh5Obsuq23dA9eEs34GfggXpTyBSyX4AWsHOmUpeoYSJEsUmxoMAgezu0p8r -kgOJQ0j63vG4S7jHMvtKHNG5LMTvIUk8FNW6SA/7AhJxmzEQiBFXMghenEqd682u -TpeRHe6+/Nyge1B1FYUgDVbaZ2/694tdT3V3tFvKhqbTZrKMdFJRpiMUjgfs1GzI -+NhzvUTa6MbV1ZgeXv3YmU+diCgiTmk= ------END CERTIFICATE----- diff --git a/selenium/test/oauth/keycloak/server_keycloak_key.pem b/selenium/test/oauth/keycloak/server_keycloak_key.pem deleted file mode 100644 index fb461404eea9..000000000000 --- a/selenium/test/oauth/keycloak/server_keycloak_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDso0G4gflW5HDi -BuwrjvyYy3rUx/24IxHQzZMT7o1qoXA/h8C0kUX7aS6XFij8hCNHdNG0GL/QPifK -xwiW8JIK2Xpy6jdxDzooHaDU+Tyk8BDFYnQtXaMsqb5zXJ/P4u8bjBP4X2+/gnbN -F/1yyOZxpRObrWxX+C2IJ+vyruh+TCEqokJ5jE+m6GPgiqx56bytXX0KLhuI7jXT -60NKGqNVCV8qn5fO4z/fh6FYtFxRc0QHy48YHBFo+I+R9nW4xq+0pbctnjTzlfRx -HYEWvnsrptc4AOa6b49HSShfqmkxgVn3G/U5Gmtzu2IjPWfGVwRjBo4hhoeG/fV9 -FMhqz6fjAgMBAAECggEBAM4lGqelcpUjxMLizPLVSW/CM2sSHhE/W9HOhIYklsWB -hcuSc2nZ9GEkLBYqk+IHKsShG94MgWzj+L5JzU3QnSkec/GP4GR5o2w3A1kFFrOI -/tM1BYhPvkq2RNcypXXwd+RDj1Ibsbnf6aaZc41/PmFaMU65MV0hMmkefgmYHamG -86kdCX1vZ2NwJWL1ALAf2rRb30QWl+W+/qDnDZ1qdxVbok8106HXBB3uXhLyaBIR -t9lGUqOoh3bdNsvPmma6T5y1cEXwcsVtfxB+myxils0XD0HsGa5FBGARh7/6jPeV -zs9nvcwVvruNGb4k4T6yEz0JutaFSgmWjAMu2pe5i4ECgYEA+k8mvt9JVmqqKLHv -Vr8BcLT2JK0/rrblth4fDiyZzKixaGnlZuXWOhiQF9+0lAk0zZjLXDZr6dWE/gMK -ZyRj1xrmB37f6/Z6F9M4r/n3RjzINkD6D5sA+Gg5nR6+nh7gNq3J6F33ZUaODeBh -EyTMXh7RT+Ug1G9BFg81tl0sNfECgYEA8gSI5otRI6i4zUZFg0ziwoIWJpdEyWwb -q7UgYzn8N8LprVibwkhnjfXysbulo/7gvRZ+uCw702xUfv1uyEKc5PHmOer4ElRU -iYdJeZblbrlk6eyOFEqucovPte82YnqFIQn6KJqNLKlG2KHIsYX1igVyGbMB2Pp/ -4iE32HefFxMCgYAEtJg13lyyky6/tRiauNx+EejOp7MaxbVrxwUubwg1ILa1D8iQ -NqHgVbXfvQTYA5RKiSTJhvxgWPM3EzeO2NBHqunIGkp7VRbWe9IE/N35JAtfebk5 -seBCyzLKEVnj/xCX9oxlId8UuE7TU/R/N6Hf4xRsPBJx6+V9VKvd0cKTAQKBgCZU -6Yn6TuOi+YIpuyDMsK22BOQf2Vk9sjRD/9k3eecrC+/UtPbUmPI3HjVgTx/mYpoQ -UgnBl8goxElIwp8dTdRFK/3IZXohuTH/J3gGmlgrLPyP5wD3wyGJW2CpfqeiWCuf -dOuxbuK//OSa2zqiyP0PV78SRxyisFaUhE/Ywm3ZAoGAYwa5t5kdPjVqtxRAsDuX -itQM5qEqLZIYlN7ehKPn8okTCc761ddaI/+fluH5S4YCo21itq38UssAjp6vbwpy -lHhvP03bpo63iz4RYwKDNEh2HD3z/a9eteColtXU8lPpfky360AwGQ1Bx7RaGGas -ttPmhm+mk3G6fRHYvk6rtJY= ------END PRIVATE KEY----- diff --git a/selenium/test/oauth/rabbitmq.tls.conf b/selenium/test/oauth/rabbitmq.tls.conf index 61107323c637..7401d4079b1d 100644 --- a/selenium/test/oauth/rabbitmq.tls.conf +++ b/selenium/test/oauth/rabbitmq.tls.conf @@ -2,13 +2,13 @@ auth_backends.1 = rabbit_auth_backend_oauth2 listeners.ssl.1 = 5671 -ssl_options.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_certificate.pem +ssl_options.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_rabbitmq_certificate.pem ssl_options.certfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_certificate.pem ssl_options.keyfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_key.pem ssl_options.verify = verify_peer ssl_options.fail_if_no_peer_cert = true management.ssl.port = 15671 -management.ssl.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_certificate.pem +management.ssl.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_rabbitmq_certificate.pem management.ssl.certfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_certificate.pem management.ssl.keyfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_key.pem