X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-ssh-proxycommand;h=6d6d3c0f65a4ad4dfe8836952d12c7f0d437b4e4;hb=c8b42c1d77005ab3f41d20cc2524f4307086ec4f;hp=f4d4b0d9affb8835ae812e22c9fa58f5388c3fbf;hpb=f659da8ba2e184a9eb60da2d65c1e81c33f06772;p=monkeysphere.git

diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index f4d4b0d..6d6d3c0 100755
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -31,48 +31,55 @@ 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"
+    HOSTP="${HOST}:${PORT}"
+else
+    HOSTP="${HOST}"
 fi
+URI="ssh://${HOSTP}"
 
 # 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"
+
 # 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="false"
+
     # if the host key is not found in the known_hosts file...
     else
 	# check the keyserver
 	CHECK_KEYSERVER="true"
     fi
 fi
-export CHECK_KEYSERVER
+
+MONKEYSPHERE_CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:="$CHECK_KEYSERVER"}
+export MONKEYSPHERE_CHECK_KEYSERVER
 
 # update the known_hosts file for the host
-monkeysphere update-known_hosts "$HOST"
+monkeysphere update-known_hosts "$HOSTP"
 
 # exec a netcat passthrough to host for the ssh connection
 if [ -z "$NO_CONNECT" ] ; then