From d02eefc0bb993f569c3a01c133f819400e300e37 Mon Sep 17 00:00:00 2001 From: u Date: Tue, 30 May 2023 17:08:07 -0400 Subject: read keyhash (calling ssh-keygen) later --- src/endofossil | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/endofossil b/src/endofossil index 2c5c43c..dd86bb3 100644 --- a/src/endofossil +++ b/src/endofossil @@ -22,18 +22,6 @@ do done < /proc/$pid/environ [ "$authtype" = publickey ] -keyhash= -while read -do - set -- $REPLY - if [ "$3 $5" = 'SSHFP 2' ] - then - keyhash=$6 - break - fi -done < <(ssh-keygen -f <(printf '%s\n' "$keytype $keyvalue") -r .) -[ "$keyhash" ] - case "$SSH_ORIGINAL_COMMAND" in *\"* ) exit 1 ;; : | true | /bin/true ) exit 0 ;; @@ -56,6 +44,18 @@ case "$SSH_ORIGINAL_COMMAND" in * ) exit 1 ;; esac +keyhash= +while read +do + set -- $REPLY + if [ "$3 $5" = 'SSHFP 2' ] + then + keyhash=$6 + break + fi +done < <(ssh-keygen -f <(printf '%s\n' "$keytype $keyvalue") -r .) +[ "$keyhash" ] + upstreamDatabaseDir=${upstreamDatabase%/*} readWriteDbName=${upstreamDatabase#${upstreamDatabaseDir}/} readWriteDir=$upstreamDatabaseDir/.fossil-remotes/$keyhash -- cgit v1.2.3