From 52528ad66073049daf0443f05ea14c848be8d404 Mon Sep 17 00:00:00 2001
From: achmelo <37397715+achmelo@users.noreply.github.com>
Date: Wed, 27 Mar 2024 16:16:15 +0100
Subject: [PATCH] fix: set correct protocol using start script (#3486)

Signed-off-by: achmelo <a.chmelo@gmail.com>
---
 api-catalog-package/src/main/resources/bin/start.sh | 11 +++++++++++
 .../src/main/resources/bin/start.sh                 | 10 ++++++++++
 .../src/main/resources/bin/start.sh                 | 10 ++++++++++
 discovery-package/src/main/resources/bin/start.sh   | 13 +++++++++++--
 gateway-package/src/main/resources/bin/start.sh     | 10 ++++++++++
 5 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/api-catalog-package/src/main/resources/bin/start.sh b/api-catalog-package/src/main/resources/bin/start.sh
index 8a6aeb1e5d..79cbe9b853 100755
--- a/api-catalog-package/src/main/resources/bin/start.sh
+++ b/api-catalog-package/src/main/resources/bin/start.sh
@@ -158,6 +158,17 @@ truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certi
 keystore_location="${ZWE_configs_certificate_keystore_file:-${ZWE_zowe_certificate_keystore_file}}"
 truststore_location="${ZWE_configs_certificate_truststore_file:-${ZWE_zowe_certificate_truststore_file}}"
 
+if [ "${keystore_type}" = "JCERACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjce://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjce://_)
+elif [ "${keystore_type}" = "JCECCARACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+elif [ "${keystore_type}" = "JCEHYBRIDRACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+fi
+
 # NOTE: these are moved from below
 #    -Dapiml.service.ipAddress=${ZOWE_IP_ADDRESS:-127.0.0.1} \
 #    -Dapiml.service.preferIpAddress=false \
diff --git a/caching-service-package/src/main/resources/bin/start.sh b/caching-service-package/src/main/resources/bin/start.sh
index d27552d056..e98a60243f 100755
--- a/caching-service-package/src/main/resources/bin/start.sh
+++ b/caching-service-package/src/main/resources/bin/start.sh
@@ -140,6 +140,16 @@ truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certi
 keystore_location="${ZWE_configs_certificate_keystore_file:-${ZWE_zowe_certificate_keystore_file}}"
 truststore_location="${ZWE_configs_certificate_truststore_file:-${ZWE_zowe_certificate_truststore_file}}"
 
+if [ "${keystore_type}" = "JCERACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjce://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjce://_)
+elif [ "${keystore_type}" = "JCECCARACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+elif [ "${keystore_type}" = "JCEHYBRIDRACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+fi
 # NOTE: these are moved from below
 #   -Dapiml.service.ipAddress=${ZOWE_IP_ADDRESS:-127.0.0.1} \
 #   -Dapiml.service.preferIpAddress=${APIML_PREFER_IP_ADDRESS:-false} \
diff --git a/cloud-gateway-package/src/main/resources/bin/start.sh b/cloud-gateway-package/src/main/resources/bin/start.sh
index bc26165440..1fb00c2c3b 100755
--- a/cloud-gateway-package/src/main/resources/bin/start.sh
+++ b/cloud-gateway-package/src/main/resources/bin/start.sh
@@ -104,6 +104,16 @@ truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certi
 keystore_location="${ZWE_configs_certificate_keystore_file:-${ZWE_zowe_certificate_keystore_file}}"
 truststore_location="${ZWE_configs_certificate_truststore_file:-${ZWE_zowe_certificate_truststore_file}}"
 
+if [ "${keystore_type}" = "JCERACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjce://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjce://_)
+elif [ "${keystore_type}" = "JCECCARACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+elif [ "${keystore_type}" = "JCEHYBRIDRACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+fi
 
 CLOUD_GATEWAY_CODE=CG
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CLOUD_GATEWAY_CODE} java \
diff --git a/discovery-package/src/main/resources/bin/start.sh b/discovery-package/src/main/resources/bin/start.sh
index d4e285aaaf..bf9e6742b8 100755
--- a/discovery-package/src/main/resources/bin/start.sh
+++ b/discovery-package/src/main/resources/bin/start.sh
@@ -138,7 +138,7 @@ ADD_OPENS="--add-opens=java.base/java.lang=ALL-UNNAMED
         --add-opens=java.base/java.util=ALL-UNNAMED
         --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
         --add-opens=java.base/javax.net.ssl=ALL-UNNAMED"
-        
+
 keystore_type="${ZWE_configs_certificate_keystore_type:-${ZWE_zowe_certificate_keystore_type:-PKCS12}}"
 keystore_pass="${ZWE_configs_certificate_keystore_password:-${ZWE_zowe_certificate_keystore_password}}"
 key_pass="${ZWE_configs_certificate_key_password:-${ZWE_zowe_certificate_key_password:-${keystore_pass}}}"
@@ -148,7 +148,16 @@ truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certi
 keystore_location="${ZWE_configs_certificate_keystore_file:-${ZWE_zowe_certificate_keystore_file}}"
 truststore_location="${ZWE_configs_certificate_truststore_file:-${ZWE_zowe_certificate_truststore_file}}"
 #echo "keystore='$keystore_location' truststore='$truststore_location'"
-
+if [ "${keystore_type}" = "JCERACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjce://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjce://_)
+elif [ "${keystore_type}" = "JCECCARACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+elif [ "${keystore_type}" = "JCEHYBRIDRACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+fi
 # NOTE: these are moved from below
 # -Dapiml.service.ipAddress=${ZOWE_IP_ADDRESS:-127.0.0.1} \
 # -Dapiml.service.preferIpAddress=${APIML_PREFER_IP_ADDRESS:-false} \
diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh
index 18dee86e8b..6312bfa71f 100755
--- a/gateway-package/src/main/resources/bin/start.sh
+++ b/gateway-package/src/main/resources/bin/start.sh
@@ -206,6 +206,16 @@ truststore_pass="${ZWE_configs_certificate_truststore_password:-${ZWE_zowe_certi
 keystore_location="${ZWE_configs_certificate_keystore_file:-${ZWE_zowe_certificate_keystore_file}}"
 truststore_location="${ZWE_configs_certificate_truststore_file:-${ZWE_zowe_certificate_truststore_file}}"
 
+if [ "${keystore_type}" = "JCERACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjce://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjce://_)
+elif [ "${keystore_type}" = "JCECCARACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcecca://_)
+elif [ "${keystore_type}" = "JCEHYBRIDRACFKS" ]; then
+keystore_location=$(echo "${keystore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+truststore_location=$(echo "${truststore_location}" | sed s_safkeyring://_safkeyringjcehybrid://_)
+fi
 # NOTE: these are moved from below
 #    -Dapiml.service.preferIpAddress=${APIML_PREFER_IP_ADDRESS:-false} \
 #    -Dapiml.service.ipAddress=${ZOWE_IP_ADDRESS:-127.0.0.1} \