Skip to content

O
oh-my-zsh
Unverified Commit fabee559 authored by Marc Cornellà's avatar Marc Cornellà Committed by GitHub
Browse files
Options

ssh-agent: autoload identities not already loaded (#7174)

With this PR the ssh-agent plugin checks the `ssh-add -l` output for the identities added, and adds all those specified by the user that haven't been added yet. We also decouple the logic of starting ssh-agent from the logic of adding identities, meaning that even if ssh-agent has been started by some other means (like launchd) we can still ssh-add the user's identities. Fixes #3019 Fixes #6979
parent a2995014
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 7 deletions
plugins/ssh-agent/ssh-agent.plugin.zsh
View file @ fabee559
......@@ -2,20 +2,27 @@ typeset _agent_forwarding _ssh_env_cache
function _start_agent() {
local lifetime
local -a identities
# start ssh-agent and setup environment
zstyle -s :omz:plugins:ssh-agent lifetime lifetime
# start ssh-agent and setup environment
echo starting ssh-agent...
ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
chmod 600 $_ssh_env_cache
. $_ssh_env_cache > /dev/null
}
# load identies
function _add_identities() {
local id line
local -a identities ids
zstyle -a :omz:plugins:ssh-agent identities identities
echo starting ssh-agent...
ssh-add $HOME/.ssh/${^identities}
# get list of loaded identities
for line in ${(f)"$(ssh-add -l)"}; do ids+=${${(z)line}[3]}; done
# add identities if not already loaded
for id in ${^identities}; do
[[ ${ids[(I)$HOME/.ssh/$id]} -le 0 ]] && ssh-add $HOME/.ssh/$id
done
}
# Get the filename to store/lookup the environment from
......@@ -42,6 +49,8 @@ else
_start_agent
fi
_add_identities
# tidy up after ourselves
unset _agent_forwarding _ssh_env_cache
unfunction _start_agent
unfunction _start_agent _add_identities
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment