From c228c4335198dbec2eebdc3d850e24b05928d58f Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Wed, 14 Oct 2020 12:57:06 -0400 Subject: behavior better --- bin/samizdat-ssh-uid | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/bin/samizdat-ssh-uid b/bin/samizdat-ssh-uid index de81a46..2612bdc 100755 --- a/bin/samizdat-ssh-uid +++ b/bin/samizdat-ssh-uid @@ -43,15 +43,6 @@ ssh_keytag_to_path_fragment() esac } -if [ ! "$SSH_USER_AUTH" ] -then - get_domain /etc/ssh/ssh_host_ed25519_key.pub || exit - printf '%s\n' "$domain" - exit -fi - -[ -f "$SSH_USER_AUTH" ] || die "file does not exist: \$SSH_USER_AUTH=${SSH_USER_AUTH}" - dispose_of_temp_pem_files() { if [ "$1" = '--copy-pem' -a "$2" ] @@ -70,6 +61,17 @@ fixup_ssh_user_auth() sed -ne 's/^publickey //p' } + +if [ "$1" = self ] +then + get_domain /etc/ssh/ssh_host_ed25519_key.pub || exit + printf '%s\n' "$domain" + exit +fi + +[ "$SSH_USER_AUTH" ] || die "empty \$SSH_USER_AUTH; try ExposeAuthInfo=yes" +[ -f "$SSH_USER_AUTH" ] || die "file does not exist: \$SSH_USER_AUTH=${SSH_USER_AUTH}" + our_pem=$SSH_USER_AUTH.pem fixup_ssh_user_auth < "$SSH_USER_AUTH" > "$our_pem" || die "could not rewrite SSH_USER_AUTH file" get_domain "$our_pem" -- cgit v1.2.3