Fix HTTPS configuration on PDP-A

This review enables HTTPS for health check on PDP-A

Issue-ID: POLICY-1732
Change-Id: I139a4c3ba043f978d1a75ae560037f713def1c1f
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
index 9798fa5..ad176ce 100644 (file)
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
@@ -50,12 +50,20 @@ if defined APEX_HOME (
     exit /b
 )
 
+:: Environment variables for HTTPS
+set KEYSTORE=%APEX_HOME%/etc/ssl/policy-keystore"
+set KEYSTORE_PASSWD="Pol1cy_0nap"
+set TRUSTSTORE=%APEX_HOME%/etc/ssl/policy-truststore"
+set TRUSTSTORE_PASSWD="Pol1cy_0nap"
+
+:: HTTPS parameters
+set HTTPS_PARAMETERS=-Djavax.net.ssl.keyStore=%KEYSTORE% -Djavax.net.ssl.keyStorePassword=%KEYSTORE_PASSWD% -Djavax.net.ssl.trustStore=%TRUSTSTORE% -Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWD%
 
 :: script name for output
 set MOD_SCRIPT_NAME=apexApps
 
 :: config for CP apps
-SET _CONFIG=-Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -Dhazelcast.config=%APEX_HOME%\etc\hazelcast.xml -Dhazelcast.mancenter.enabled=false
+SET _CONFIG=%HTTPS_PARAMETERS% -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -Dhazelcast.config=%APEX_HOME%\etc\hazelcast.xml -Dhazelcast.mancenter.enabled=false
 
 :: Maven/APEX version
 set /p _VERSION=<%APEX_HOME%\etc\app-version.txt

diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
index 52e1f3d..4c0d0fc 100755 (executable)
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
@@ -33,7 +33,6 @@
 ## DO NOT CHANGE CODE BELOW, unless you know what you are doing
 ##
 
-
 if [ -z $APEX_HOME ]
 then
     APEX_HOME="/opt/app/policy/apex-pdp"
@@ -47,6 +46,14 @@ then
     exit
 fi
 
+## Environment variables for HTTPS
+KEYSTORE="${APEX_HOME}/etc/ssl/policy-keystore"
+KEYSTORE_PASSWD="Pol1cy_0nap"
+TRUSTSTORE="${APEX_HOME}/etc/ssl/policy-truststore"
+TRUSTSTORE_PASSWD="Pol1cy_0nap"
+
+## HTTPS parameters
+HTTPS_PARAMETERS="-Djavax.net.ssl.keyStore=${KEYSTORE} -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWD} -Djavax.net.ssl.trustStore=${TRUSTSTORE} -Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWD}"
 
 ## script name for output
 MOD_SCRIPT_NAME=`basename $0`
@@ -60,12 +67,11 @@ if [ "${BASH_VERSION:0:1}" -lt 4 ] ; then
 fi
 
 ## config for CP apps
-_config="-Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -Dhazelcast.config=$APEX_HOME/etc/hazelcast.xml -Dhazelcast.mancenter.enabled=false"
+_config="${HTTPS_PARAMETERS} -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -Dhazelcast.config=$APEX_HOME/etc/hazelcast.xml -Dhazelcast.mancenter.enabled=false"
 
 ## Maven/APEX version
 _version=`cat $APEX_HOME/etc/app-version.txt`
 
-
 ## system to get CygWin paths
 system=`uname -s | cut -c1-6`
 cpsep=":"
@@ -77,7 +83,6 @@ fi
 ## CP for CP apps
 CLASSPATH="$APEX_HOME/etc${cpsep}$APEX_HOME/etc/hazelcast${cpsep}$APEX_HOME/etc/infinispan${cpsep}$APEX_HOME/lib/*"
 
-
 ## array of applications with name=command
 declare -A APEX_APP_MAP
 APEX_APP_MAP["ws-console"]="java -jar $APEX_HOME/lib/applications/simple-wsclient-$_version-jar-with-dependencies.jar -c"