From 27f853130a562e15bfb846edaa58b32fef410c62 Mon Sep 17 00:00:00 2001 From: ivinokur Date: Fri, 1 Nov 2024 09:12:51 +0200 Subject: [PATCH] Add conditions to the SSH agent post-start command Signed-off-by: ivinokur --- pkg/library/ssh/event.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/library/ssh/event.go b/pkg/library/ssh/event.go index 7ebdca1e4..87c08b0fe 100644 --- a/pkg/library/ssh/event.go +++ b/pkg/library/ssh/event.go @@ -22,11 +22,11 @@ import ( ) const commandLine = `SSH_ENV_PATH=$HOME/ssh-environment \ -&& if [ -f /etc/ssh/passphrase ] && command -v ssh-add >/dev/null; \ +&& if [ -f /etc/ssh/passphrase ] && [ -w $HOME ] && command -v ssh-add >/dev/null; \ then ssh-agent | sed 's/^echo/#echo/' > $SSH_ENV_PATH \ && chmod 600 $SSH_ENV_PATH && source $SSH_ENV_PATH \ -&& ssh-add /etc/ssh/dwo_ssh_key < /etc/ssh/passphrase \ -&& if [ -f $HOME/.bashrc ] && [ -w $HOME/.bashrc ]; then echo "source ${SSH_ENV_PATH}" >> $HOME/.bashrc; fi; fi` +&& if timeout 3 ssh-add /etc/ssh/dwo_ssh_key < /etc/ssh/passphrase \ +&& [ -f $HOME/.bashrc ] && [ -w $HOME/.bashrc ]; then echo "source ${SSH_ENV_PATH}" >> $HOME/.bashrc; fi; fi` // AddSshAgentPostStartEvent Start ssh-agent and add the default ssh key to it, if the ssh key has a passphrase. // Initialise the ssh-agent session env variables in the user .bashrc file.