From 407d6106cfb53ac9f4732bbcd0aa03357a5e11f3 Mon Sep 17 00:00:00 2001
From: Peter Upfold <pgithub@upfold.org.uk>
Date: Mon, 17 Feb 2025 17:13:33 +0000
Subject: [PATCH 1/2] Fix add-cert-helper.sh to use different aliases

---
 charts/selenium-grid/certs/add-cert-helper.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/selenium-grid/certs/add-cert-helper.sh b/charts/selenium-grid/certs/add-cert-helper.sh
index d426c64323..c761cdb2d2 100755
--- a/charts/selenium-grid/certs/add-cert-helper.sh
+++ b/charts/selenium-grid/certs/add-cert-helper.sh
@@ -58,7 +58,7 @@ TARGET_CERT_DIR=${TARGET_CERT_DIR:-"/usr/local/share/ca-certificates"} # Target
 BUNDLE_CA_CERTS=${BUNDLE_CA_CERTS:-"/etc/ssl/certs/ca-certificates.crt"} # Bundle CA certificates
 NSSDB_HOME=${NSSDB_HOME:-"${HOME}/.pki/nssdb"} # Default location of the NSSDB
 APPEND_CRT_KEY="/tmp/tls.crt"
-ALIAS=${ALIAS:-"SeleniumHQ"}
+ALIAS_PREFIX=${ALIAS_PREFIX:-"SeleniumHQ"}
 
 sudo mkdir -p ${TARGET_CERT_DIR}
 
@@ -75,6 +75,7 @@ for cert_file in "${cert_files[@]}"; do
   else
     echo "Processing $cert_file"
   fi
+  ALIAS="${ALIAS_PREFIX}_$(basename $cert_file)"
   cert_file=$(append_private_key_if_exists $cert_file)
   for cert_db_file in "${cert_db_files[@]}"; do
     echo "Adding to db: $cert_db_file"

From 7fb3e512078557407a5c41b56fc0154dfa565345 Mon Sep 17 00:00:00 2001
From: Peter Upfold <pgithub@upfold.org.uk>
Date: Mon, 17 Feb 2025 18:46:27 +0000
Subject: [PATCH 2/2] Update test to support multiple custom CA certs

---
 tests/customCACert/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/customCACert/bootstrap.sh b/tests/customCACert/bootstrap.sh
index ec8efc6e8e..a16287b9c3 100755
--- a/tests/customCACert/bootstrap.sh
+++ b/tests/customCACert/bootstrap.sh
@@ -22,7 +22,7 @@ docker build ${COMMON_BUILD_ARGS} --build-arg BASE=node-edge -t ${NAMESPACE}/nod
 
 list_cert_files=($(find ./charts/selenium-grid/certs/ -name "*.crt"))
 for cert_file_path in "${list_cert_files[@]}"; do
-  cert_nick_name="SeleniumHQ"
+  cert_nick_name="SeleniumHQ_$(basename $cert_file_path)"
   docker run --entrypoint="" --rm  ${NAMESPACE}/node-chrome:${VERSION} bash -c "certutil -L -d sql:/home/seluser/.pki/nssdb -n ${cert_nick_name}"
   docker run --entrypoint="" --rm  ${NAMESPACE}/node-firefox:${VERSION} bash -c "certutil -L -d sql:/home/seluser/.pki/nssdb -n ${cert_nick_name}"
   docker run --entrypoint="" --rm  ${NAMESPACE}/node-edge:${VERSION} bash -c "certutil -L -d sql:/home/seluser/.pki/nssdb -n ${cert_nick_name}"