holm/ohmyzsh
1
1
Fork 0
forked from extern/ohmyzsh
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ssh-agent: use key signatures to check loaded ids (#7504)

Browse Source 
Use fingerprint of ssh key instead of file name to control if the key is already loaded.

Also check for .ssh folder presence (#5128)
This commit is contained in:
François Scala 2019-01-14 16:38:45 +01:00 committed by Marc Cornellà
parent fabee55948
commit 2a60385659
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/ssh-agent/ssh-agent.plugin.zsh
View File

@ -12,16 +12,28 @@ function _start_agent() {
}
function _add_identities() {
local id line
local -a identities ids
local id line sig
local -a identities loaded signatures
zstyle -a :omz:plugins:ssh-agent identities identities
# get list of loaded identities
for line in ${(f)"$(ssh-add -l)"}; do ids+=${${(z)line}[3]}; done
# check for .ssh folder presence
if [[ ! -d $HOME/.ssh ]]; then
return
fi
# get list of loaded identities' signatures
for line in ${(f)"$(ssh-add -l)"}; do loaded+=${${(z)line}[2]}; done
# get signatures of private keys
for id in $identities; do
signatures+="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}') $id"
done
# add identities if not already loaded
for id in ${^identities}; do
[[ ${ids[(I)$HOME/.ssh/$id]} -le 0 ]] && ssh-add $HOME/.ssh/$id
for sig in $signatures; do
id="$(cut -f2 <<< $sig)"
sig="$(cut -f1 <<< $sig)"
[[ ${loaded[(I)$sig]} -le 0 ]] && ssh-add $HOME/.ssh/$id
done
}