X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-ssh-proxycommand;h=438db87e993f30a2afa07a849731235cc9aae599;hb=4dc13cb9a6c5a82e31875d8b69f060c9eab0cf8f;hp=6dcb723e244a6d32d5f114dc02a6f336fcae2a58;hpb=70cf71b1d716e2ec16fae03cd89da3f088f5f4c4;p=monkeysphere.git

diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index 6dcb723..438db87 100755
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 
 # monkeysphere-ssh-proxycommand: MonkeySphere ssh ProxyCommand hook
 #
@@ -39,26 +39,28 @@ if [ -z "$HOST" ] ; then
     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
 	# do not check the keyserver
 	# FIXME: more nuanced checking should be done here to properly
@@ -72,12 +74,21 @@ else
 	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
-    exec nc "$HOST" "$PORT"
+    if (which nc 2>/dev/null >/dev/null); then
+	exec nc "$HOST" "$PORT"
+    elif (which socat 2>/dev/null >/dev/null); then
+	exec socat STDIO "TCP:$HOST:$PORT"
+    else
+	log "Neither netcat nor socat found -- could not complete monkeysphere-ssh-proxycommand connection to $HOST:$PORT"
+	exit 1
+    fi
 fi