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

refactor(ssh-agent): clean up and reorganize code

Browse Source
This commit is contained in:
Marc Cornellà 2021-08-26 12:40:16 +02:00
parent 7692881d2a
commit 3f0672ff94
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,25 @@
# Get the filename to store/lookup the environment from
ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
function _start_agent() { function _start_agent() {
# Check if ssh-agent is already running
if [[ -f "$ssh_env_cache" ]]; then
. "$ssh_env_cache" > /dev/null
{
[[ "$USERNAME" = root ]] && command ps ax || command ps x
} | command grep ssh-agent | command grep -q $SSH_AGENT_PID && return 0
fi
# Set a maximum lifetime for identities added to ssh-agent
local lifetime local lifetime
zstyle -s :omz:plugins:ssh-agent lifetime lifetime zstyle -s :omz:plugins:ssh-agent lifetime lifetime
# start ssh-agent and setup environment # start ssh-agent and setup environment
echo Starting ssh-agent... echo Starting ssh-agent...
ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache ssh-agent -s ${lifetime:+-t} ${lifetime} | sed '/^echo/d' >! "$ssh_env_cache"
chmod 600 $_ssh_env_cache chmod 600 "$ssh_env_cache"
. $_ssh_env_cache > /dev/null . "$ssh_env_cache" > /dev/null
} }
function _add_identities() { function _add_identities() {
@ -71,26 +84,12 @@ function _add_identities() {
ssh-add "${args[@]}" ${^not_loaded} ssh-add "${args[@]}" ${^not_loaded}
} }
# Get the filename to store/lookup the environment from
_ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
# test if agent-forwarding is enabled # test if agent-forwarding is enabled
zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding zstyle -b :omz:plugins:ssh-agent agent-forwarding agent_forwarding
if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then # Add a nifty symlink for screen/tmux if agent forwarding
# Add a nifty symlink for screen/tmux if agent forwarding if [[ $agent_forwarding = "yes" && -n "$SSH_AUTH_SOCK" && ! -L "$SSH_AUTH_SOCK" ]]; then
[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
elif [[ -f "$_ssh_env_cache" ]]; then
# Source SSH settings, if applicable
. $_ssh_env_cache > /dev/null
if [[ $USERNAME == "root" ]]; then
FILTER="ax"
else
FILTER="x"
fi
ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
_start_agent
}
else else
_start_agent _start_agent
fi fi
@ -104,15 +103,15 @@ fi
ret=\$? ret=\$?
command rm -rf '$ZSH_CACHE_DIR/ssh-agent.lock' command rm -rf '$ZSH_CACHE_DIR/ssh-agent.lock'
unset _agent_forwarding _ssh_env_cache unset agent_forwarding ssh_env_cache
unfunction _start_agent _add_identities 2>/dev/null unfunction _start_agent _add_identities 2>/dev/null
return \$ret return \$ret
" EXIT INT QUIT " EXIT INT QUIT
_add_identities _add_identities
} }
# tidy up after ourselves unset agent_forwarding ssh_env_cache
unset _agent_forwarding _ssh_env_cache
unfunction _start_agent _add_identities unfunction _start_agent _add_identities