X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fm%2Fssh_proxycommand;h=74b0f85cd9d685b5702f26eecc61ec2719a20fde;hb=c0724b8e7aefd9ced1740a970941928f5b168b2b;hp=7ab4bec1331e265eb5b7185cc7eac0b6b753b871;hpb=4d3d6d2b49d21e5e1ed0b0d3e32d21f99b0e2588;p=monkeysphere.git

diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand
index 7ab4bec..74b0f85 100644
--- a/src/share/m/ssh_proxycommand
+++ b/src/share/m/ssh_proxycommand
@@ -36,52 +36,55 @@ output_no_valid_key() {
 
     LOG_PREFIX=
 
-    cat <<EOF | log info
--------------------- Monkeysphere warning -------------------
-Monkeysphere found OpenPGP keys for this hostname, but none had full validity.
-EOF
-
-    # retrieve the actual ssh key
-    sshKeyOffered=$(ssh-keyscan -t rsa -p "$PORT" "$HOST" 2>/dev/null | awk '{ print $2, $3 }')
-    # FIXME: should we do any checks for failed keyscans, eg. host not
-    # found?
+    # retrieve the ssh key being offered by the host
+    sshKeyOffered=$(ssh-keyscan -t rsa -p "$PORT" "$HOST" 2>/dev/null \
+	| awk '{ print $2, $3 }')
 
     # get the gpg info for userid
     gpgOut=$(gpg_user --list-key --fixed-list-mode --with-colon \
 	--with-fingerprint --with-fingerprint \
 	="$userID" 2>/dev/null)
 
-    # find all 'pub' and 'sub' lines in the gpg output, which each
-    # represent a retrieved key for the user ID
-    echo "$gpgOut" | cut -d: -f1,2,5,10,12 | \
-    while IFS=: read -r type validity keyid uidfpr usage ; do
-	case $type in
-	    'pub'|'sub')
-		# get the ssh key of the gpg key
-		sshKeyGPG=$(gpg2ssh "$keyid")
-
-		# if one of keys found matches the one offered by the
-		# host, then output info
-		if [ "$sshKeyGPG" = "$sshKeyOffered" ] ; then
-		    cat <<EOF | log info
+    # output header
+    log info <<EOF
+-------------------- Monkeysphere warning -------------------
+Monkeysphere found OpenPGP keys for this hostname, but none had full validity.
+EOF
+
+    # if the host key is retrieved from the host, check against known
+    # OpenPGP keys
+    if [ "$sshKeyOffered" ] ; then
+	# find all 'pub' and 'sub' lines in the gpg output, which each
+	# represent a retrieved key for the user ID
+	echo "$gpgOut" | cut -d: -f1,2,5,10,12 | \
+	while IFS=: read -r type validity keyid uidfpr usage ; do
+	    case $type in
+		'pub'|'sub')
+		    # get the ssh key of the gpg key
+		    sshKeyGPG=$(gpg2ssh "$keyid")
+
+		    # if one of keys found matches the one offered by the
+		    # host, then output info
+		    if [ "$sshKeyGPG" = "$sshKeyOffered" ] ; then
+			log info <<EOF
 An OpenPGP key matching the ssh key offered by the host was found:
 
 EOF
 
-		    sshKeyGPGFile=$(msmktempfile)
-		    printf "%s" "$sshKeyGPG" >"$sshKeyGPGFile"
-		    sshFingerprint=$(ssh-keygen -l -f "$sshKeyGPGFile" | \
-			awk '{ print $2 }')
-		    rm -f "$sshKeyGPGFile"
+			sshKeyGPGFile=$(msmktempfile)
+			printf "%s" "$sshKeyGPG" >"$sshKeyGPGFile"
+			sshFingerprint=$(ssh-keygen -l -f "$sshKeyGPGFile" | \
+			    awk '{ print $2 }')
+			rm -f "$sshKeyGPGFile"
 
-		    # get the sigs for the matching key
-		    gpgSigOut=$(gpg_user --check-sigs \
-			--list-options show-uid-validity \
-			"$keyid")
+			# get the sigs for the matching key
+			gpgSigOut=$(gpg_user --check-sigs \
+			    --list-options show-uid-validity \
+			    "$keyid")
 
-		    # output the sigs, but only those on the user ID
-		    # we are looking for
-		    echo "$gpgSigOut" | awk '
+			# output the sigs, but only those on the user ID
+			# we are looking for
+			echo "$gpgSigOut" | awk '
 {
 if (match($0,"^pub")) {	print; }
 if (match($0,"^uid")) { ok=0; }
@@ -89,51 +92,59 @@ if (match($0,"^uid.*'$userID'$")) { ok=1; print; }
 if (ok) { if (match($0,"^sig")) { print; } }
 }
 ' | log info
-		    echo | log info
+			echo | log info
 
-		    # output the other user IDs for reference
-		    if (echo "$gpgSigOut" | grep "^uid" | grep -v -q "$userID") ; then
-			cat <<EOF | log info
+			# output the other user IDs for reference
+			if (echo "$gpgSigOut" | grep "^uid" | grep -v -q "$userID") ; then
+			    log info <<EOF
 Other user IDs on this key:
 
 EOF
-			echo "$gpgSigOut" | grep "^uid" | grep -v "$userID" | log info
-			echo | log info
-		    fi
+			    echo "$gpgSigOut" | grep "^uid" | grep -v "$userID" | log info
+			    echo | log info
+			fi
 
-		    # output ssh fingerprint
-		    cat <<EOF | log info
+			# output ssh fingerprint
+			log info <<EOF
 RSA key fingerprint is ${sshFingerprint}.
 EOF
 
-		    # this whole process is in a "while read"
-		    # subshell.  the only way to get information out
-		    # of the subshell is to change the return code.
-		    # therefore we return 1 here to indicate that a
-		    # matching gpg key was found for the ssh key
-		    # offered by the host
-		    return 1
-		fi
-		;;
-	esac
-    done || returnCode="$?"
-
-    # if no key match was made (and the "while read" subshell returned
-    # 1) output how many keys were found
-    if (( returnCode != 1 )) ; then
-	cat <<EOF | log info
+			# this whole process is in a "while read"
+			# subshell.  the only way to get information
+			# out of the subshell is to change the return
+			# code.  therefore we return 1 here to
+			# indicate that a matching gpg key was found
+			# for the ssh key offered by the host
+			return 1
+		    fi
+		    ;;
+	    esac
+	done || returnCode="$?"
+
+	# if no key match was made (and the "while read" subshell
+	# returned 1) output how many keys were found
+	if (( returnCode != 1 )) ; then
+	    log info <<EOF
 None of the found keys matched the key offered by the host.
 Run the following command for more info about the found keys:
 gpg --check-sigs --list-options show-uid-validity =${userID}
 EOF
 
-	# FIXME: should we do anything extra here if the retrieved
-	# host key is actually in the known_hosts file and the ssh
-	# connection will succeed?  Should the user be warned?
-	# prompted?
+	    # FIXME: should we do anything extra here if the retrieved
+	    # host key is actually in the known_hosts file and the ssh
+	    # connection will succeed?  Should the user be warned?
+	    # prompted?
+	fi
+
+    # if host key could not be retrieved from the host, output message
+    else
+	log info <<EOF
+Could not retrieve RSA host key from $HOST.
+EOF
     fi
 
-    cat <<EOF | log info
+    # output footer
+    log info <<EOF
 -------------------- ssh continues below --------------------
 EOF
 }
@@ -175,7 +186,7 @@ URI="ssh://${HOSTP}"
 # CHECK_KEYSERVER variable in the monkeysphere.conf file.
 
 # if the host is in the gpg keyring...
-if gpg_user --list-key ="${URI}" 2>&1 >/dev/null ; then
+if gpg_user --list-key ="${URI}" &>/dev/null ; then
     # do not check the keyserver
     CHECK_KEYSERVER=${CHECK_KEYSERVER:="false"}
 
@@ -242,9 +253,9 @@ esac
 
 # exec a netcat passthrough to host for the ssh connection
 if [ -z "$NO_CONNECT" ] ; then
-    if (which nc 2>/dev/null >/dev/null); then
+    if (type nc &>/dev/null); then
 	exec nc "$HOST" "$PORT"
-    elif (which socat 2>/dev/null >/dev/null); then
+    elif (type socat &>/dev/null); then
 	exec socat STDIO "TCP:$HOST:$PORT"
     else
 	echo "Neither netcat nor socat found -- could not complete monkeysphere-ssh-proxycommand connection to $HOST:$PORT" >&2