diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-07-24 15:20:58 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-07-24 15:20:58 -0400 |
| commit | e3fe7faea819ac499ff851539f9af86959741c3a (patch) | |
| tree | 13c4808d429b3402d6cca46082e614544c657b00 /src | |
| parent | 478dfc8331177d7397a8430e5d04bffcd601ab2b (diff) | |
| parent | ee5e8c8c627a9175a142f2a6381bbd50b7810d49 (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/share/common | 10 | ||||
| -rw-r--r-- | src/share/m/ssh_proxycommand | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/share/common b/src/share/common index c10e71b..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,12 +898,15 @@ 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" + # 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 - 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" diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand index 33bd8a1..96326da 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 |