From 14c6dae001fe533e4e999a74ced5a5ad26ac526d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sat, 27 Apr 2024 11:56:53 +0200
Subject: [PATCH] sshtool: handle sudo passwords that contain quotes or
 backslashes

---
 sshtool | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sshtool b/sshtool
index 6841bd6..474cb6d 100755
--- a/sshtool
+++ b/sshtool
@@ -26,7 +26,7 @@ else
 fi
 
 if [ -z "$ROOT_PASS" ]; then
-	read -s -p "Enter remote sudo password: " ROOT_PASS
+	read -r -s -p "Enter remote sudo password: " ROOT_PASS
 	echo
 fi
 
@@ -37,11 +37,11 @@ function header {
 	cat <<EOF
 cat > /tmp/deploytool_askpass_$RANDNAME <<EOG
 #!/usr/bin/env sh
-echo "\\\$DEPLOYTOOL_ROOT_PASSWORD"
+echo "\\\$DEPLOYTOOL_ROOT_PASSWORD" | base64 -d
 EOG
 chmod +x /tmp/deploytool_askpass_$RANDNAME
 export SUDO_ASKPASS=/tmp/deploytool_askpass_$RANDNAME
-export DEPLOYTOOL_ROOT_PASSWORD="$ROOT_PASS"
+export DEPLOYTOOL_ROOT_PASSWORD=$(echo $ROOT_PASS | base64)
 sudo -A sh - <<'EOEVERYTHING'
 set -e
 EOF