From b4296a152643b5c759beb7c2604812417cad0928 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 24 Jul 2009 11:17:31 -0400 Subject: make failures with unwritable known_hosts slightly less cryptic. --- src/share/common | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/share') diff --git a/src/share/common b/src/share/common index c10e71b..37e31a1 100644 --- a/src/share/common +++ b/src/share/common @@ -897,12 +897,12 @@ update_known_hosts() { # touch the known_hosts file so that the file permission check # below won't fail upon not finding the file if [ ! -f "$KNOWN_HOSTS" ]; then - [ -d $(dirname "$KNOWN_HOSTS") ] || mkdir -m 0700 $(dirname "$KNOWN_HOSTS") - touch "$KNOWN_HOSTS" + [ -d $(dirname "$KNOWN_HOSTS") ] || mkdir -m 0700 $(dirname "$KNOWN_HOSTS") || failure "Could not create path to known_hosts file '$KNOWN_HOSTS'" + touch "$KNOWN_HOSTS" || failure "Unable to create known_hosts file '$KNOWN_HOSTS'" fi # check permissions on the known_hosts file path - check_key_file_permissions $(whoami) "$KNOWN_HOSTS" || failure + check_key_file_permissions $(whoami) "$KNOWN_HOSTS" || failure "Bad permissions governing known_hosts file '$KNOWN_HOSTS'" # create a lockfile on known_hosts: lock create "$KNOWN_HOSTS" -- cgit v1.2.3 From 1639adf5465b47336075f9b51e2a58a06aecf130 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 24 Jul 2009 12:54:03 -0400 Subject: make sure we check for the host key existence in the correct known_hosts file. do not look for a host key in a non-existant file. (should close MS 1147) --- src/share/m/ssh_proxycommand | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/share') diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand index 01ca488..c90074b 100644 --- a/src/share/m/ssh_proxycommand +++ b/src/share/m/ssh_proxycommand @@ -231,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 -- cgit v1.2.3 From ee5e8c8c627a9175a142f2a6381bbd50b7810d49 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 24 Jul 2009 13:25:40 -0400 Subject: shoring up known_hosts creation with proper umask and with multi-level directory creation. --- src/share/common | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/share') diff --git a/src/share/common b/src/share/common index 37e31a1..27e088a 100644 --- a/src/share/common +++ b/src/share/common @@ -887,6 +887,7 @@ update_known_hosts() { local nHostsBAD local fileCheck local host + local newUmask # the number of hosts specified on command line nHosts="$#" @@ -897,8 +898,11 @@ update_known_hosts() { # touch the known_hosts file so that the file permission check # below won't fail upon not finding the file if [ ! -f "$KNOWN_HOSTS" ]; then - [ -d $(dirname "$KNOWN_HOSTS") ] || mkdir -m 0700 $(dirname "$KNOWN_HOSTS") || failure "Could not create path to known_hosts file '$KNOWN_HOSTS'" - touch "$KNOWN_HOSTS" || failure "Unable to create known_hosts file '$KNOWN_HOSTS'" + # make sure to create any files or directories with the appropriate write bits turned off: + newUmask=$(printf "%04o" $(( 0$(umask) | 0022 )) + [ -d $(dirname "$KNOWN_HOSTS") ] || (umask "$newUmask" && mkdir -p -m 0700 $(dirname "$KNOWN_HOSTS") ) || failure "Could not create path to known_hosts file '$KNOWN_HOSTS'" + # make sure to create this file with the appropriate bits turned off: + (umask "$newUmask" && touch "$KNOWN_HOSTS") || failure "Unable to create known_hosts file '$KNOWN_HOSTS'" fi # check permissions on the known_hosts file path -- cgit v1.2.3