Feed openssl.cnf.in when generating certs

Author: MarcialRosales

selenium/.gitignore

@@ -7,3 +7,6 @@ suites/screens/*
 test/oauth/*/h2/*.trace.db
 test/oauth/*/h2/*.lock.db
 */target/*
+tls-gen
+test/oauth/*/*.pem
+test/oauth/*/*.p12

selenium/bin/suite_template

@@ -398,10 +398,19 @@ do_generate-ca-server-client-kpi() {
 
   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
   #make PASSWORD=foobar
-  make verify
-  make info
+  #make verify
+  #make info
+  cp openssl.cnf.bak openssl.cnf  
   cd $CUR_DIR
 
   cp $ROOT/tls-gen/basic/result/ca_certificate.pem $FOLDER/ca_${NAME}_certificate.pem
@@ -456,13 +465,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++)) {

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

selenium/test/oauth/env.docker.uaa

@@ -1 +1 @@
-export UAA_URL=http://uaa:8080
+export UAA_URL=https://uaa:8443

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=selenium/test/oauth/keycloak/ca_certificate.pem
+export OAUTH_PROVIDER_CA_CERT=selenium/test/oauth/keycloak/ca_keycloak_certificate.pem

selenium/test/oauth/env.local.uaa

@@ -1 +1 @@
-export UAA_URL=http://localhost:8080
+export UAA_URL=https://localhost:8443

selenium/test/oauth/keycloak/openssl.cnf.in

@@ -0,0 +1,3 @@
+[ client_alt_names ]
+email.1 = rabbit_client@localhost
+URI.1 = rabbit_client_id_uri

selenium/test/oauth/rabbitmq.uaa-oauth-provider.conf

@@ -3,4 +3,4 @@ management.oauth_client_secret = ${OAUTH_CLIENT_SECRET}
 
 # configure static signing keys and the oauth provider used by the plugin
 auth_oauth2.default_key = ${OAUTH_SIGNING_KEY_ID}
-auth_oauth2.signing_keys.${OAUTH_SIGNING_KEY_ID} = ${OAUTH_SERVER_CONFIG_DIR}/signing-key.pem
+#auth_oauth2.signing_keys.${OAUTH_SIGNING_KEY_ID} = ${OAUTH_SERVER_CONFIG_DIR}/signing-key.pem