Make SSH agent finder more accurate

1 files changed, 35 insertions, 18 deletions

diff --git a/.bashrc b/.bashrc
index 110c2f2..b224956 100644
--- a/.bashrc
+++ b/.bashrc
@@ -594,10 +594,14 @@ function get_ssh_agent
 {
     local start_agent=""
     local load_keys=""
+    local debug=""
 
     local OPTIND opt
-    while getopts "sklh" opt; do
+    while getopts "dsklh" opt; do
         case $opt in
+            d) # debug
+                debug="1"
+                ;;
             s) # start-agent
                 start_agent="1"
                 ;;
@@ -609,7 +613,8 @@ function get_ssh_agent
                 load_keys="1"
                 ;;
             h) # help
-                echo "Usage: get_ssh_agent [sklh]"
+                echo "Usage: get_ssh_agent [dsklh]"
+                echo "  -d : Emit debug messages"
                 echo "  -s : Start an agent if one is not running"
                 echo "  -k : Kill all running agents and start new ones"
                 echo "  -l : Load all known keys into agent"
@@ -619,30 +624,42 @@ function get_ssh_agent
         esac
     done
 
-    local agent_out="$HOME/.ssh/agent.out-$(hostname)"
-
-    # Check if agent is already started. This often happens early in
-    # the startup process for X11 (see /etc/X11/xinit/xinitrc-common).
-    # If the agent was already started then our local state file is
-    # probably out of date with our environment file, update it so that
-    # other sessions in other shells that may not be connected to this
-    # X11 session use the same agent.
-        if _ssh_agent_is_running; then
-        echo "SSH_AUTH_SOCK=${SSH_AUTH_SOCK}; export SSH_AUTH_SOCK;" > "$agent_out"
-        echo "SSH_AGENT_PID=${SSH_AGENT_PID}; export SSH_AGENT_PID;" >> "$agent_out"
-        echo "echo Agent pid ${SSH_AGENT_PID};" >> "$agent_out"
-    fi
+    for path in "${TMPDIR:-/tmp}"/ssh-*/agent.*; do
+        basepath=$(basename $path)
+        sockpath=$(dirname $path)
+
+        export SSH_AUTH_SOCK=${path}
+        export SSH_AGENT_PID=${basepath##agent.}
+
+        # When no files are present matching the pattern the pattern itself is
+        # passed through. shopt -s nullglob would fix this but too much
+        # fiddling to make it work without polluting the parent shell state.
+        if [[ "$SSH_AGENT_PID" == "*" ]]; then
+            [[ -n "$debug" ]] && echo "No agents found"
+            break
+        fi
 
-    source "$agent_out" &>/dev/null
+        [[ -n "$debug" ]] && echo -n "Trying ${SSH_AUTH_SOCK} for ${SSH_AGENT_PID}... "
+
+        if _ssh_agent_is_running; then
+            [[ -n "$debug" ]] && echo "Success"
+            break
+        else
+            [[ -n "$debug" ]] && echo "Failure... removing ${sockpath}"
+            rm -rf "$sockpath"
+        fi
+    done
 
     # If the agent still isn't connected after sourcing our local agent
     # state file then it probably isn't running at all. Start a new
     # agent and update the state file.
-        if ! _ssh_agent_is_running && [[ -n "$start_agent" ]]; then
-        eval $(ssh-agent | tee "$agent_out") &>/dev/null
+    if ! _ssh_agent_is_running && [[ -n "$start_agent" ]]; then
+        [[ -n "$debug" ]] && echo "Starting new agent..."
+        eval $(ssh-agent) &>/dev/null
     fi
 
     if [[ -n "$load_keys" ]]; then
+        [[ -n "$debug" ]] && echo "Adding SSH keys..."
         add_ssh_keys
     fi
 }