Skip to content

save the keystore passphrase when agent.properties is missing on a new kvm host #14361

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

Open
Damans227 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

save the keystore passphrase when agent.properties is missing on a new kvm host #14361

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
30 changes: 17 additions & 13 deletions scripts/util/keystore-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,25 @@ fi

$LOGGER_CMD "$(date) - starting keystore-setup"

# Create the props file if missing, so the new password can be saved
if [ ! -f "$PROPS_FILE" ]; then
$LOGGER_CMD "Props file does not exist, creating it"
touch "$PROPS_FILE"
chmod 600 "$PROPS_FILE" || $LOGGER_CMD "Cannot chmod $PROPS_FILE"
fi

# Re-use existing password or use the one provided
if [ -f "$PROPS_FILE" ]; then
$LOGGER_CMD "Previous props file exists, trying to extract password"
OLD_PASS=$(sed -n '/^keystore.passphrase/p' "$PROPS_FILE" | sed 's/^keystore.passphrase=//g')
if [ -n "${OLD_PASS// }" ]; then
KS_PASS="$OLD_PASS"
$LOGGER_CMD "Password extraction successful"
OLD_PASS=$(sed -n '/^keystore.passphrase/p' "$PROPS_FILE" | sed 's/^keystore.passphrase=//g')
if [ -n "${OLD_PASS// }" ]; then
KS_PASS="$OLD_PASS"
$LOGGER_CMD "Password extraction successful"
else
sed -i "/^keystore.passphrase.*/d" "$PROPS_FILE" 2>&1 | $LOGGER_CMD || true
echo "keystore.passphrase=$KS_PASS" >> "$PROPS_FILE"
if [ $? != 0 ]; then
$LOGGER_CMD "Could not add new password to agent.properties"
else
sed -i "/^keystore.passphrase.*/d" "$PROPS_FILE" 2>&1 | $LOGGER_CMD || true
echo "keystore.passphrase=$KS_PASS" >> "$PROPS_FILE"
if [ $? != 0 ]; then
$LOGGER_CMD "Could not add new password to agent.properties"
else
$LOGGER_CMD "New keystore password set"
fi
$LOGGER_CMD "New keystore password set"
fi
fi

Expand Down
Loading