Include keycloak certs in forward-proxy image

Author: MarcialRosales

selenium/bin/components/forward-proxy

@@ -14,6 +14,7 @@ init_forward-proxy() {
   PROXY_PORT=9092 
 
   print "> HTTPD_CONFIG: ${HTTPD_CONFIG_DIR}"
+  print "> PROXIED_OAUTH_PROVIDER: ${TEST_CONFIG_DIR}/${PROXIED_OAUTH_PROVIDER}"
   print "> OAUTH_PROVIDER_URL: ${OAUTH_PROVIDER_URL}"
   print "> PROXY_HOSTNAME: ${PROXY_HOSTNAME}"
   print "> PROXY_PORT: ${PROXY_PORT}"
@@ -33,6 +34,7 @@ start_forward-proxy() {
   ${BIN_DIR}/gen-httpd-conf ${HTTPD_CONFIG_DIR} $ENV_FILE $MOUNT_HTTPD_CONFIG_DIR/httpd.conf
   print "> EFFECTIVE HTTPD_CONFIG_FILE: $MOUNT_HTTPD_CONFIG_DIR/httpd.conf"
   cp ${HTTPD_CONFIG_DIR}/*.pem $MOUNT_HTTPD_CONFIG_DIR
+  cp ${TEST_CONFIG_DIR}/${PROXIED_OAUTH_PROVIDER}/*.pem $MOUNT_HTTPD_CONFIG_DIR
 
   docker run \
     --detach \

selenium/test/oauth/env.docker.forward-proxy

@@ -2,3 +2,4 @@ export FORWARD_PROXY_CERTS=/usr/local/apache2/conf
 export FORWARD_PROXY_CA_CERT=${FORWARD_PROXY_CERTS}/ca_forward-proxy_certificate.pem
 export FORWARD_PROXY_URL=https://forward-proxy:9092
 export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}
+export PROXIED_OAUTH_PROVIDER=keycloak

selenium/test/oauth/env.local.forward-proxy

@@ -1,4 +1,5 @@
 export FORWARD_PROXY_CERTS=selenium/test/oauth/forward-proxy
 export FORWARD_PROXY_CA_CERT=${FORWARD_PROXY_CERTS}/ca_forward-proxy_certificate.pem
 export FORWARD_PROXY_URL=https://forward-proxy:9092
-export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}
+export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}
+export PROXIED_OAUTH_PROVIDER=keycloak

selenium/test/oauth/forward-proxy/httpd.conf

@@ -343,7 +343,7 @@ LogLevel warn
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog /proc/self/fd/1 common
+    CustomLog logs/access_log common
 
     #
     # If you prefer a logfile with access, agent, and referer information
@@ -506,7 +506,7 @@ SSLRandomSeed connect builtin
   SSLEngine on
   SSLCertificateKeyFile /usr/local/apache2/conf/server_forward-proxy_key.pem
   SSLCertificateFile /usr/local/apache2/conf/server_forward-proxy_certificate.pem
-  SSLProxyMachineCertificateFile /usr/local/apache2/conf/server_forward-proxy_certificate.pem
+  SSLProxyCACertificateFile /usr/local/apache2/conf/ca_keycloak_certificate.pem
   SSLProtocol all -SSLv2 -SSLv3 -TLSv1 -TLSv1.1
   SSLProxyEngine On