Rename oauth-proxy to forward-proxy

Author: MarcialRosales

selenium/bin/components/oauth-proxy renamed to selenium/bin/components/forward-proxy

@@ -1,16 +1,16 @@
 
 HTTPD_DOCKER_IMAGE=httpd:latest
 
-ensure_oauth-proxy() {
-  if docker ps | grep oauth-proxy &> /dev/null; then
-     print "oauth-proxy already running ..."
+ensure_forward-proxy() {
+  if docker ps | grep forward-proxy &> /dev/null; then
+     print "forward-proxy already running ..."
  else
-   start_oauth-proxy
+   start_forward-proxy
  fi
 }
-init_oauth-proxy() {
-  HTTPD_CONFIG_DIR=${TEST_CONFIG_DIR}/oauth-proxy
-  PROXY_HOSTNAME=oauth-proxy 
+init_forward-proxy() {
+  HTTPD_CONFIG_DIR=${TEST_CONFIG_DIR}/forward-proxy
+  PROXY_HOSTNAME=forward-proxy 
   PROXY_PORT=9092 
 
   print "> HTTPD_CONFIG: ${HTTPD_CONFIG_DIR}"
@@ -19,11 +19,11 @@ init_oauth-proxy() {
   print "> PROXY_PORT: ${PROXY_PORT}"
 
 }
-start_oauth-proxy() {
-  begin "Starting oauth-proxy ..."
+start_forward-proxy() {
+  begin "Starting forward-proxy ..."
 
-  init_oauth-proxy
-  kill_container_if_exist oauth-proxy
+  init_forward-proxy
+  kill_container_if_exist forward-proxy
 
   MOUNT_HTTPD_CONFIG_DIR=$CONF_DIR/httpd
 
@@ -33,12 +33,12 @@ start_oauth-proxy() {
 
   docker run \
     --detach \
-    --name oauth-proxy \
+    --name forward-proxy \
     --net ${DOCKER_NETWORK} \
     --publish 9092:9092 \
     --mount "type=bind,source=${MOUNT_HTTPD_CONFIG_DIR},target=/usr/local/apache2/conf" \
     ${HTTPD_DOCKER_IMAGE}
 
   wait_for_url $OAUTH_PROVIDER_URL ${PROXY_HOSTNAME}:${PROXY_PORT}
-  end "oauth-proxy is ready"
+  end "forward-proxy is ready"
 }

selenium/bin/suite_template

@@ -568,6 +568,12 @@ run_on_docker_with() {
   trap teardown_components EXIT
 
   start_components
+  TEST_RESULT=$?
+  if [ $TEST_RESULT -ne 0 ]; then
+    teardown_components
+    exit $TEST_RESULT
+  fi
+
   test
   TEST_RESULT=$?
   save_logs

selenium/suites/authnz-mgt/oauth-with-keycloak-via-proxy.sh renamed to selenium/suites/authnz-mgt/oauth-with-keycloak-via-forward-proxy.sh

@@ -4,7 +4,7 @@ SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 TEST_CASES_PATH=/oauth/with-sp-initiated
 TEST_CONFIG_PATH=/oauth
-PROFILES="oauth-proxy keycloak proxy-oauth-provider keycloak-mgt-oauth-provider tls"
+PROFILES="forward-proxy keycloak forward-proxy-oauth-provider keycloak-mgt-oauth-provider tls"
 
 source $SCRIPT/../../bin/suite_template $@
-runWith keycloak oauth-proxy
+runWith keycloak forward-proxy

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

@@ -0,0 +1,3 @@
+export FORWARD_PROXY_CERTS=/config/oauth/forward-proxy
+export FORWARD_PROXY_CA_CERT=${FORWARD_PROXY_CERTS}/ca_forward-proxy_certificate.pem
+export FORWARD_PROXY_URL=https://forward-proxy:9092/realms/test

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

@@ -0,0 +1,3 @@
+export FORWARD_PROXY_CERTS=/config/oauth/forward-proxy
+export FORWARD_PROXY_CA_CERT=${FORWARD_PROXY_CERTS}/ca_forward-proxy_certificate.pem
+export FORWARD_PROXY_URL=https://localhost:9092/realms/test

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

@@ -238,7 +238,7 @@ ServerAdmin [email protected]
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
 #
-ServerName oauth-proxy
+ServerName forward-proxy
 
 #
 # Deny access to the entirety of your server's filesystem. You must
@@ -503,15 +503,17 @@ SSLRandomSeed connect builtin
 </IfModule>
 
 <VirtualHost *:9092>
-  ServerName "oauth-proxy"
+  ServerName "forward-proxy"
   ProxyRequests On
   ProxyVia On
+  SSLEngine on
+  SSLCertificateKeyFile ${FORWARD_PROXY_CERTS}/server_forward-proxy_key.pem
+  SSLCertificateFile ${FORWARD_PROXY_CERTS}/server_forward-proxy_certificate.pem
+
   SSLProxyEngine On
-  SSLProxyVerify require
+  SSLProxyVerify none
   SSLProxyVerifyDepth 10
 
-  SSLProxyCACertificateFile /etc/httpd/conf/certs/ca.pem
- 
   <Proxy "*">
     Allow from all
   </Proxy>

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

@@ -0,0 +1,5 @@
+auth_oauth2.issuer = ${OAUTH_PROVIDER_URL}
+auth_oauth2.https.cacertfile = ${FORWARD_PROXY_CA_CERT}
+auth_oauth2.proxy = ${FORWARD_PROXY_URL}
+#auth_oauth2.proxy_username = ${FORWARD_PROXY_USERNAME}
+#auth_oauth2.proxy_password = ${FORWARD_PROXY_PASSWORD}