Allow for passing CHECK_KEYSERVER variable to proxycommand

[monkeysphere.git] / src / monkeysphere-ssh-proxycommand

diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index f4d4b0d9affb8835ae812e22c9fa58f5388c3fbf..30d511a19ebab2b47fe5159eb6e35410bfd7d249 100755 (executable)
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -31,42 +31,44 @@ fi
 HOST="$1"
 PORT="$2"
 
+MS_HOME=${MS_HOME:-"${HOME}/.config/monkeysphere"}
+
 if [ -z "$HOST" ] ; then
     log "host must be specified."
     usage
     exit 1
 fi
 if [ -z "$PORT" ] ; then
-    log "port must be specified."
-    usage
-    exit 1
+    PORT=22
 fi
 
 # set the host URI
 URI="ssh://${HOST}"
 if [ "$PORT" != '22' ] ; then
-    URI="${URI}:$PORT"
+    URI="${URI}:${PORT}"
 fi
 
 # if the host is in the gpg keyring...
 if gpg --list-key ="${URI}" 2>&1 >/dev/null ; then
     # do not check the keyserver
-    CHECK_KEYSERVER="false"
+    CHECK_KEYSERVER=${CHECK_KEYSERVER:-"false"}
+
 # if the host is NOT in the keyring...
 else
     # if the host key is found in the known_hosts file...
     # FIXME: this only works for default known_hosts location
     hostKey=$(ssh-keygen -F "$HOST")
     if [ "$hostKey" ] ; then
-       # if the check keyserver variable is NOT set to true...
-       if  [ "$CHECK_KEYSERVER" != 'true' ] ; then
-           # schedule a keyserver check for host at a later time
-           echo "monkeysphere update-known_hosts $HOST" | at noon
-       fi
+       # do not check the keyserver
+       # FIXME: more nuanced checking should be done here to properly
+       # take into consideration hosts that join monkeysphere by
+       # converting an existing and known ssh key
+       CHECK_KEYSERVER=${CHECK_KEYSERVER:-"false"}
+
     # if the host key is not found in the known_hosts file...
     else
        # check the keyserver
-       CHECK_KEYSERVER="true"
+       CHECK_KEYSERVER=${CHECK_KEYSERVER:-"true"}
     fi
 fi
 export CHECK_KEYSERVER