X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-ssh-proxycommand;h=438db87e993f30a2afa07a849731235cc9aae599;hb=a354378a45cfd1afb9efa63647df244651fad2af;hp=30d511a19ebab2b47fe5159eb6e35410bfd7d249;hpb=5470209cd829eda1e75719e93fe6c69cf2c1a61d;p=monkeysphere.git

diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index 30d511a..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
 #
@@ -43,40 +43,52 @@ if [ -z "$PORT" ] ; then
 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=${CHECK_KEYSERVER:-"false"}
+    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
 	# take into consideration hosts that join monkeysphere by
 	# converting an existing and known ssh key
-	CHECK_KEYSERVER=${CHECK_KEYSERVER:-"false"}
+	CHECK_KEYSERVER="false"
 
     # if the host key is not found in the known_hosts file...
     else
 	# check the keyserver
-	CHECK_KEYSERVER=${CHECK_KEYSERVER:-"true"}
+	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