Skip to content

don't store secret in case prompt fails (e.g. because interrupted) #276

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
robstoll merged 1 commit into from
Apr 17, 2025
Merged

don't store secret in case prompt fails (e.g. because interrupted) #276

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
6 changes: 3 additions & 3 deletions src/utility/secret-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ function getSecretViaSecretToolOrPromptAndStore() {

# shellcheck disable=SC2310 # we are aware of that set -e has no effect for getSecretViaSecretTool
if ! getSecretViaSecretToolOrPromptAndStore_secret=$(getSecretViaSecretTool "$getSecretViaSecretToolOrPromptAndStore_group" "$getSecretViaSecretToolOrPromptAndStore_key"); then
promptForSecret "$getSecretViaSecretToolOrPromptAndStore_prompt" getSecretViaSecretToolOrPromptAndStore_secret
storeSecretViaSecretTool "$getSecretViaSecretToolOrPromptAndStore_group" "$getSecretViaSecretToolOrPromptAndStore_key" "$getSecretViaSecretToolOrPromptAndStore_label" "$getSecretViaSecretToolOrPromptAndStore_secret"
promptForSecret "$getSecretViaSecretToolOrPromptAndStore_prompt" getSecretViaSecretToolOrPromptAndStore_secret || return $?
storeSecretViaSecretTool "$getSecretViaSecretToolOrPromptAndStore_group" "$getSecretViaSecretToolOrPromptAndStore_key" "$getSecretViaSecretToolOrPromptAndStore_label" "$getSecretViaSecretToolOrPromptAndStore_secret" || return $?
fi
assignToVariableInOuterScope "$getSecretViaSecretToolOrPromptAndStore_outVar" "$getSecretViaSecretToolOrPromptAndStore_secret" || die "could not to assign a value to variable in outer scope named %s" "$getSecretViaSecretToolOrPromptAndStore_outVar"
}
Expand Down Expand Up @@ -125,7 +125,7 @@ function promptForSecret() {

# without using it, pasting secrets sometimes reveals parts of the secret (read is too slow)
stty -echo
trap "stty echo; return 130" INT
trap "stty echo; printf '\n'; return 130" INT
trap "stty echo" EXIT

# shellcheck disable=SC2059 # we want to be able to use newline in the $prompt, hence OK
Expand Down