aboutsummaryrefslogtreecommitdiff
path: root/sshtool
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-03-15 17:49:09 +0100
committerAlex Auvolat <alex@adnab.me>2023-03-15 17:49:31 +0100
commit2a0eff07c0f50488e2959675ab467786e09807fe (patch)
tree45d1b4722871b996d424d9813004a3c73c93dcd1 /sshtool
parentf6c4576b6c8b45f1389498e4c8437d659a780a17 (diff)
downloadnixcfg-2a0eff07c0f50488e2959675ab467786e09807fe.tar.gz
nixcfg-2a0eff07c0f50488e2959675ab467786e09807fe.zip
fix cleanup of deploypass
Diffstat (limited to 'sshtool')
-rwxr-xr-xsshtool9
1 files changed, 5 insertions, 4 deletions
diff --git a/sshtool b/sshtool
index eb4627a..6841bd6 100755
--- a/sshtool
+++ b/sshtool
@@ -33,13 +33,14 @@ fi
SSH_CONFIG=cluster/$CLUSTER/ssh_config
function header {
+ RANDNAME=$(openssl rand -hex 12)
cat <<EOF
-cat > /tmp/deploytool_askpass <<EOG
+cat > /tmp/deploytool_askpass_$RANDNAME <<EOG
#!/usr/bin/env sh
echo "\\\$DEPLOYTOOL_ROOT_PASSWORD"
EOG
-chmod +x /tmp/deploytool_askpass
-export SUDO_ASKPASS=/tmp/deploytool_askpass
+chmod +x /tmp/deploytool_askpass_$RANDNAME
+export SUDO_ASKPASS=/tmp/deploytool_askpass_$RANDNAME
export DEPLOYTOOL_ROOT_PASSWORD="$ROOT_PASS"
sudo -A sh - <<'EOEVERYTHING'
set -e
@@ -47,8 +48,8 @@ EOF
}
function footer {
+ echo rm -v '/tmp/deploytool_askpass*'
echo EOEVERYTHING
- echo rm /tmp/deploytool_askpass
}
function message {