Skip to content

KNOX-3310: Fix redundant ALIAS_PASSPHRASE assignment and improve logging #1216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smolnar82 merged 1 commit into from
Apr 28, 2026
+3 −2
Merged

KNOX-3310: Fix redundant ALIAS_PASSPHRASE assignment and improve logging #1216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions gateway-docker/src/main/resources/docker/gateway-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ set -o pipefail

## Helper function used to import certs into truststore
## Function takes cert file as argument
## At this time ALIAS_PASSPHRASE is already initialized
importMultipleCerts() {
FILE=$1
local import_failed=0
ALIAS_PASSPHRASE=$(/bin/cat "${KEYSTORE_PASSWORD_FILE}")
# number of certs in the PEM file
CERTS=$(/bin/grep 'END CERTIFICATE' "$FILE"| /usr/bin/wc -l)
# For every cert in the PEM file, extract it and import into the JKS keystore
Expand Down Expand Up @@ -139,10 +139,11 @@ fi

if [[ -n ${KEYSTORE_PASSWORD_FILE} ]] && [[ -f ${KEYSTORE_PASSWORD_FILE} ]]
then
echo "Using provided keystore password file"
echo "Setting ALIAS_PASSPHRASE from provided keystore password file: ${KEYSTORE_PASSWORD_FILE}"
ALIAS_PASSPHRASE=$(/bin/cat "${KEYSTORE_PASSWORD_FILE}" 2> /dev/null)
else
# If keystore password is not provided use master secret as alias passphrase
echo "Setting ALIAS_PASSPHRASE to MASTER_SECRET"
ALIAS_PASSPHRASE="${MASTER_SECRET}"
fi

Expand Down
Loading