jimmy
/
fish-ssh-agent
mirror of https://github.com/danhper/fish-ssh-agent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

In an SSH session check forwarded agent first 

When in an SSH session, try to connect to a forwarded agent first. If
that fails, only then check if an SSH agent is already running on the
machine.

This fixes a situation where a .ssh/environment file left behind from
a dead agent is checked first, ignoring the forwarded agent and
starting a new agent on the machine.
This commit is contained in:
Sergio de Carvalho 2022-09-27 17:47:55 +01:00
parent fd70a2afdd
commit 25230a241f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
functions/__ssh_agent_is_started.fish
View File

@ -1,9 +1,18 @@
function __ssh_agent_is_started -d "check if ssh agent is already started"
if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end
if test -n "$SSH_CONNECTION"
# This is an SSH session
ssh-add -l > /dev/null 2>&1
if test $status -eq 0 -o $status -eq 1
# An SSH agent was forwarded
return 0
end
end
if begin; test -f "$SSH_ENV"; and test -z "$SSH_AGENT_PID"; end
source $SSH_ENV > /dev/null
end
if begin; test -z "$SSH_AGENT_PID"; and test -z "$SSH_CONNECTION"; end
if test -z "$SSH_AGENT_PID"
return 1
end