From 068131e32da95d2d19be947d0835aed5d67c818d Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Fri, 30 Aug 2024 11:43:41 +0900
Subject: [PATCH] Add message if key was alrady added or removed

---
 bin/admin-remove-old-ssh-keys.sh                 | 2 ++
 bin/admin-rotate-ssh-keys.sh                     | 2 ++
 bin/{admin-test-ssh-keys.sh => test-ssh-keys.sh} | 0
 bin/user-add-ssh-key.sh                          | 4 +++-
 bin/user-remove-ssh-key.sh                       | 4 +++-
 5 files changed, 10 insertions(+), 2 deletions(-)
 rename bin/{admin-test-ssh-keys.sh => test-ssh-keys.sh} (100%)
 mode change 100644 => 100755 bin/user-add-ssh-key.sh
 mode change 100644 => 100755 bin/user-remove-ssh-key.sh

diff --git a/bin/admin-remove-old-ssh-keys.sh b/bin/admin-remove-old-ssh-keys.sh
index 48faeea..5aa5750 100755
--- a/bin/admin-remove-old-ssh-keys.sh
+++ b/bin/admin-remove-old-ssh-keys.sh
@@ -99,6 +99,8 @@ remove_ssh_key() {
 			sed -i "/${pub_key_escaped}/d" "${AUTH_KEY_FILE}";
 			${RMV_CHMOD_UW} "${AUTH_KEY_FILE}";
 			${ADD_CHATTR_I} "${AUTH_KEY_FILE}";
+		else
+			echo "[!] Already removed";
 		fi;
 		EOF
 	);
diff --git a/bin/admin-rotate-ssh-keys.sh b/bin/admin-rotate-ssh-keys.sh
index 983414c..fde049e 100755
--- a/bin/admin-rotate-ssh-keys.sh
+++ b/bin/admin-rotate-ssh-keys.sh
@@ -163,6 +163,8 @@ add_ssh_key() {
 				echo "${pub_key_write}" >> "${AUTH_KEY_FILE}" || exit 1;
 			${RMV_CHMOD_UW} "${AUTH_KEY_FILE}";
 			${ADD_CHATTR_I} "${AUTH_KEY_FILE}";
+		else
+			echo "[!] Already added";
 		fi;
 		EOF
 	);
diff --git a/bin/admin-test-ssh-keys.sh b/bin/test-ssh-keys.sh
similarity index 100%
rename from bin/admin-test-ssh-keys.sh
rename to bin/test-ssh-keys.sh
diff --git a/bin/user-add-ssh-key.sh b/bin/user-add-ssh-key.sh
old mode 100644
new mode 100755
index c79f2e6..6837c0b
--- a/bin/user-add-ssh-key.sh
+++ b/bin/user-add-ssh-key.sh
@@ -127,6 +127,8 @@ add_ssh_key() {
 				echo "${pub_key_write}" >> "${AUTH_KEY_FILE}" || exit 1;
 			${RMV_CHMOD_UW} "${AUTH_KEY_FILE}";
 			${ADD_CHATTR_I} "${AUTH_KEY_FILE}";
+		else
+			echo "[!] Already added";
 		fi;
 		EOF
 	);
@@ -171,7 +173,7 @@ while read -r line; do
 		continue;
 	fi
 
-	echo "[+] Add new public key '${SSH_KEY_PUB_FILE}' to: ${username}@${hostname}";
+	echo "[+] Add new public key '${USER_PUBLIC_KEY}' to: ${username}@${hostname}";
 
 	# flags: (not used at the moment)
 	# Possible: U (add to .ssh/authorized_keys)
diff --git a/bin/user-remove-ssh-key.sh b/bin/user-remove-ssh-key.sh
old mode 100644
new mode 100755
index c1f77f6..09976c7
--- a/bin/user-remove-ssh-key.sh
+++ b/bin/user-remove-ssh-key.sh
@@ -109,6 +109,8 @@ remove_ssh_key() {
 			sed -i "/${pub_key_escaped}/d" "${AUTH_KEY_FILE}";
 			${RMV_CHMOD_UW} "${AUTH_KEY_FILE}";
 			${ADD_CHATTR_I} "${AUTH_KEY_FILE}";
+		else
+			echo "[!] Already removed";
 		fi;
 		EOF
 	);
@@ -147,7 +149,7 @@ while read -r line; do
 		continue;
 	fi
 
-	echo "[-] Remove public key '${SSH_KEY_PUB_FILE}' from: ${username}@${hostname}";
+	echo "[-] Remove public key '${USER_PUBLIC_KEY}' from: ${username}@${hostname}";
 
 	uninstall_ssh_key "${hostname}" "${username}" "${SSH_KEY_PUB_FILE}" "/etc/ssh/authorized_keys/${username}"