X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=8f44bf51ed9cc8e56c0331bfd7d97a1be4dfe9b1;hb=a41b10c287cda37cbb36ae1c56afd1512ea84d00;hp=6d9e6c3a28469880895525d2a51e64667cb8de7c;hpb=22476961b7915076e6ae7f353b563516f9931a04;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 6d9e6c3..8f44bf5 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -37,18 +37,18 @@ usage: $PGRM <subcommand> [options] [args]
 MonkeySphere client tool.
 
 subcommands:
-  update-known_hosts (k) [HOST]...  update known_hosts file
-  update-authorized_keys (a)        update authorized_keys file
-  gen-subkey (g) KEYID              generate an 'a' capable subkey
-    -l|--length BITS                  key length in bits (2048)
-    -e|--expire EXPIRE                date to expire
-  help (h,?)                        this help
+ update-known_hosts (k) [HOST]...    update known_hosts file
+ update-authorized_keys (a)          update authorized_keys file
+ gen-subkey (g) [KEYID]              generate an authentication subkey
+   --length (-l) BITS                  key length in bits (2048)
+   --expire (-e) EXPIRE                date to expire
+ subkey-to-ssh-agent (s)             store authentication subkey in ssh-agent
+ help (h,?)                          this help
 
 EOF
 }
 
 # generate a subkey with the 'a' usage flags set
-# FIXME: this needs some tweaking to clean it up
 gen_subkey(){
     local keyLength
     local keyExpire
@@ -163,10 +163,66 @@ EOF
 )
 
     log "generating subkey..."
-    echo "$editCommands" | gpg --expert --command-fd 0 --edit-key "$keyID"
+    fifoDir=$(mktemp -d)
+    (umask 077 && mkfifo "$fifoDir/pass")
+    echo "$editCommands" | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" &
+
+    passphrase_prompt  "Please enter your passphrase for $keyID: " "$fifoDir/pass"
+
+    rm -rf "$fifoDir"
+    wait
     log "done."
 }
 
+function subkey_to_ssh_agent() {
+    # try to add all authentication subkeys to the agent:
+
+    local authsubkeys
+    local secretkeys
+    local subkey
+    local workingdir
+    local kname
+
+    # 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 "!" }')
+    
+    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)
+
+    workingdir=$(mktemp -d)
+    umask 077
+    mkfifo "$workingdir/passphrase"
+
+    # 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"
+
+	if [ "$1" = '-d' ]; then
+	    # we're removing the subkey:
+	    gpg --export "0x${subkey}!" | openpgp2ssh "$subkey" > "$workingdir/$kname"
+	    (cd "$workingdir" && ssh-add -d "$kname")
+	else
+	    # we're adding the subkey:
+	    mkfifo "$workingdir/$kname"
+	    gpg --quiet --passphrase-fd 3 3<"$workingdir/passphrase" \
+		--export-options export-reset-subkey-passwd,export-minimal,no-export-attributes \
+		--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
+	fi
+	rm -f "$workingdir/$kname"
+    done
+
+    rm -rf "$workingdir"
+}
+
 ########################################################################
 # MAIN
 ########################################################################
@@ -278,7 +334,11 @@ case $COMMAND in
 	gen_subkey "$@"
 	;;
 
-    'help'|'h'|'?')
+    'subkey-to-ssh-agent'|'s')
+	subkey_to_ssh_agent "$@"
+	;;
+
+    '--help'|'help'|'-h'|'h'|'?')
         usage
         ;;