X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fm%2Fssh_proxycommand;h=96326dae60ab51cdff421dee27d424b0ddb58b47;hb=HEAD;hp=322937b054a9ed448425da00fa65e2d44c4c075a;hpb=b6bd17157915c420b8cda418abc4c658e2da83c6;p=monkeysphere.git

diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand
index 322937b..96326da 100644
--- a/src/share/m/ssh_proxycommand
+++ b/src/share/m/ssh_proxycommand
@@ -102,31 +102,33 @@ EOF
     if [ -z "$sshKeyOffered" ] ; then
 	log info <<EOF
 Could not retrieve RSA host key from $HOST.
+EOF
+	# check that there are any marginally valid keys
+	if echo "$gpgOut" | egrep -q '^(pub|sub):(m|f|u):' ; then
+	    log info <<EOF
 The following keys were found with marginal validity:
 EOF
+	fi
     fi
 
-    # find all 'pub' and 'sub' lines in the gpg output, which each
-    # represent a retrieved key for the user ID
+    # find all keys in the gpg output ('pub' and 'sub' lines) and
+    # output the ones that match the host key or that have marginal
+    # validity
     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 a key was retrieved from the host...
 		if [ "$sshKeyOffered" ] ; then
-
-		    # if one of keys found matches the one offered by the
-		    # host, then output info
+		    # if one of the keys matches the one offered by
+		    # the host, then output info and return
 		    if [ "$sshKeyGPG" = "$sshKeyOffered" ] ; then
 			log info <<EOF
 An OpenPGP key matching the ssh key offered by the host was found:
 EOF
-
 			show_key_info "$keyid" | 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
@@ -135,15 +137,14 @@ EOF
 			# for the ssh key offered by the host
 			return 1
 		    fi
-
-		# else if a key was not retrieved from the host
+		# else if a key was not retrieved from the host...
 		else
-
-		    # if the current key is marginal, show info
-		    if [ "$validity" = 'm' -o "$validity" = 'f' ] ; then
+		    # and the current key is marginal, show info
+		    if [ "$validity" = 'm' ] \
+			|| [ "$validity" = 'f' ] \
+			|| [ "$validity" = 'u' ] ; then
 			show_key_info "$keyid" | log info
-                    fi
-
+		    fi
 		fi
 		;;
 	esac
@@ -151,19 +152,21 @@ EOF
 
     # if no key match was made (and the "while read" subshell
     # returned 1) output how many keys were found
-    if (( returnCode != 1 )) ; then
-
+    if (( returnCode == 1 )) ; then
 	echo | log info
-
-	# output different footer messages depending on if a key had
-	# been retrieved from the host
+    else
+	# if a key was retrieved, but didn't match, note this
 	if [ "$sshKeyOffered" ] ; then
 	    log info <<EOF
 None of the found keys matched the key offered by the host.
 EOF
-	else
+	fi
+
+	# note how many invalid keys were found
+	nInvalidKeys=$(echo "$gpgOut" | egrep '^(pub|sub):[^(m|f|u)]:' | wc -l)
+	if ((nInvalidKeys > 0)) ; then
 	    log info <<EOF
-There may be other keys with less than marginal validity for this hostname.
+Keys found with less than marginal validity: $nInvalidKeys
 EOF
 	fi
 
@@ -228,8 +231,7 @@ if gpg_user --list-key ="${URI}" &>/dev/null ; then
 # 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" 2>/dev/null)
+    hostKey=$( [ ! -r "$KNOWN_HOSTS" ] || ssh-keygen -F "$HOST" -f "$KNOWN_HOSTS" 2>/dev/null)
 
     if [ "$hostKey" ] ; then
 	# do not check the keyserver