diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-08-21 01:45:39 -0400 |
---|---|---|
committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-08-21 01:45:39 -0400 |
commit | 39f3516d7f57397cb61c5a28d3d199ad9bb1a719 (patch) | |
tree | 9aeece41afd84d0d08f4e7d477f76535d945b22c /src/monkeysphere | |
parent | a41b10c287cda37cbb36ae1c56afd1512ea84d00 (diff) |
made monkeysphere subkey-to-ssh-agent more user-friendly.
Diffstat (limited to 'src/monkeysphere')
-rwxr-xr-x | src/monkeysphere | 57 |
1 files changed, 51 insertions, 6 deletions
diff --git a/src/monkeysphere b/src/monkeysphere index 8f44bf5..2ca3636 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -182,25 +182,63 @@ function subkey_to_ssh_agent() { local subkey local workingdir local kname + local sshaddresponse + local keysuccess + # if there's no agent running, don't bother: + if [ -z "$SSH_AUTH_SOCK" ] || ! which ssh-add >/dev/null ; then + failure "No ssh-agent available." + fi + + # and if it looks like it's running, but we can't actually talk to + # it, bail out: + ssh-add -l >/dev/null + sshaddresponse="$?" + if [ "$sshaddresponse" = "2" ]; then + failure "Could not connect to ssh-agent" + fi + # get list of secret keys (to work around https://bugs.g10code.com/gnupg/issue945): secretkeys=$(gpg --list-secret-keys --with-colons --fixed-list-mode --fingerprint | grep '^fpr:' | cut -f10 -d: | awk '{ print "0x" $1 "!" }') + + if [ -z "$secretkeys" ]; then + failure "You have no secret keys in your keyring! +You might want to 'gpg --gen-key'" + fi authsubkeys=$(gpg --list-secret-keys --with-colons --fixed-list-mode --fingerprint --fingerprint $secretkeys | cut -f1,5,10,12 -d: | grep -A1 '^ssb:[^:]*::[^:]*a[^:]*$' | grep '^fpr::' | cut -f3 -d: | sort -u) + if [ -z "$authsubkeys" ]; then + failure "no authentication-capable subkeys available. +You might want to 'monkeysphere gen-subkey'" + fi + + if ! test_gnu_dummy_s2k_extension ; then + failure "Your version of GnuTLS does not seem capable of using with gpg's exported subkeys. +You may want to consider patching or upgrading. + +For more details, see: + http://lists.gnu.org/archive/html/gnutls-devel/2008-08/msg00005.html" + fi + workingdir=$(mktemp -d) umask 077 mkfifo "$workingdir/passphrase" + keysuccess=1 # FIXME: we're currently allowing any other options to get passed # through to ssh-add. should we limit it to known ones? For # example: -d or -c and/or -t <lifetime> - # FIXME: how do we know if we succeeded or failed? ssh-add gives - # weird return values under setsid, and if there are more than one - for subkey in $authsubkeys; do - kname="MonkeySphere Key $subkey" + # choose a label by which this key will be known in the agent: + # we are labelling the key by User ID instead of by + # fingerprint, but filtering out all / characters to make sure + # the filename is legit. + + primaryuid=$(gpg --with-colons --list-key "0x${subkey}!" | grep '^pub:' | cut -f10 -d: | tr -d /) + + kname="[monkeysphere] $primaryuid" if [ "$1" = '-d' ]; then # we're removing the subkey: @@ -214,13 +252,20 @@ function subkey_to_ssh_agent() { --export-secret-subkeys "0x${subkey}!" | openpgp2ssh "$subkey" > "$workingdir/$kname" & (cd "$workingdir" && DISPLAY=nosuchdisplay SSH_ASKPASS=/bin/false ssh-add "$@" "$kname" </dev/null )& - passphrase_prompt "Enter passphrase for MonkeySphere Key $subkey: " "$workingdir/passphrase" - wait + passphrase_prompt "Enter passphrase for key for $primaryuid: " "$workingdir/passphrase" + wait %2 fi + keysuccess="$?" + rm -f "$workingdir/$kname" done rm -rf "$workingdir" + + # FIXME: sort out the return values: we're just returning the + # success or failure of the final authentication subkey in this + # case. What if earlier ones failed? + exit "$keysuccess" } ######################################################################## |