ScriptsCollections/SSH-Rotate-Keys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore shellcheck errors in admin ssh keys, fix test ssh connection

Browse Source 
ssh without -n or </dev/null will eat all input from the while read loop
This stopped the tests in the test ssh connection to be run

see man ssh for the -n option
This commit is contained in:
Clemens Schwaighofer
2024-08-30 10:39:11 +09:00
parent 07108e5764
commit 3ab2e9c609
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/admin-remove-old-ssh-keys.sh
View File

@@ -54,6 +54,7 @@ if [ ! -f "${CONFIG_BASE}settings.ini" ]; then
exit; exit;
fi fi
# shellcheck source=../config/settings.ini # shellcheck source=../config/settings.ini
# shellcheck disable=SC1094
source <(grep "=" "${CONFIG_BASE}settings.ini" | sed 's/ *= */=/g') source <(grep "=" "${CONFIG_BASE}settings.ini" | sed 's/ *= */=/g')
if [ -z "${key_age}" ]; then if [ -z "${key_age}" ]; then
echo "A minimnum key age in days must be set in the settings"; echo "A minimnum key age in days must be set in the settings";
@@ -78,7 +79,7 @@ fi
# default ssh command # default ssh command
# -t is needed for systens when "Defaults requiretty" is set # -t is needed for systens when "Defaults requiretty" is set
SSH="ssh -a -x"; SSH="ssh -a -x -n";
remove_ssh_key() { remove_ssh_key() {
AUTH_KEY_FILE="${1}"; AUTH_KEY_FILE="${1}";

3
bin/admin-rotate-ssh-keys.sh
View File

@@ -76,6 +76,7 @@ if [ ! -f "${CONFIG_BASE}settings.ini" ]; then
exit; exit;
fi fi
# shellcheck source=../config/settings.ini # shellcheck source=../config/settings.ini
# shellcheck disable=SC1094
source <(grep "=" "${CONFIG_BASE}settings.ini" | sed 's/ *= */=/g') source <(grep "=" "${CONFIG_BASE}settings.ini" | sed 's/ *= */=/g')
if [ -z "${key_age}" ]; then if [ -z "${key_age}" ]; then
echo "A minimnum key age in days must be set in the settings"; echo "A minimnum key age in days must be set in the settings";
@@ -124,7 +125,7 @@ fi
# default ssh command # default ssh command
# -t is needed for systens when "Defaults requiretty" is set # -t is needed for systens when "Defaults requiretty" is set
SSH="ssh -a -x"; SSH="ssh -a -x -n";
# Add the SSH Key to an auth file if it does not exist yet and the auth file does exist # Add the SSH Key to an auth file if it does not exist yet and the auth file does exist
# Build bash command to run this # Build bash command to run this

5
bin/admin-test-ssh-keys.sh
View File

@@ -34,6 +34,7 @@ if [ ! -f "${CONFIG_BASE}settings.ini" ]; then
exit; exit;
fi fi
# shellcheck source=../config/settings.ini # shellcheck source=../config/settings.ini
# shellcheck disable=SC1094
source <(grep "=" "${CONFIG_BASE}settings.ini" | sed 's/ *= */=/g') source <(grep "=" "${CONFIG_BASE}settings.ini" | sed 's/ *= */=/g')
if [ -z "${key_age}" ]; then if [ -z "${key_age}" ]; then
echo "A minimnum key age in days must be set in the settings"; echo "A minimnum key age in days must be set in the settings";
@@ -49,7 +50,7 @@ if [ ! -f "${CONFIG_BASE}${server_list}" ]; then
exit; exit;
fi fi
SSH="ssh -a -x"; SSH="ssh -a -x -n";
# date command # date command
datecmd="date"; datecmd="date";
if date --version 2>&1 | grep -qi "date: illegal option"; then if date --version 2>&1 | grep -qi "date: illegal option"; then
@@ -92,7 +93,7 @@ while read -r line; do
rotate_date=""; rotate_date="";
if [ -f "${LAST_ROTATE}${hostname}_${username}.last-rotate" ]; then if [ -f "${LAST_ROTATE}${hostname}_${username}.last-rotate" ]; then
# load last rotate timestamp and get YYYY-MM-DD # load last rotate timestamp and get YYYY-MM-DD
rotate_date=$(${datecmd} -d @"$(cat "${LAST_ROTATE}${hostname}_${username}.last-rotate")" +%F); rotate_date=$(${datecmd} -d "@$(cat "${LAST_ROTATE}${hostname}_${username}.last-rotate")" +%F);
fi fi
# check for diff in username / hostname # check for diff in username / hostname
warning_string="" warning_string=""