canonicalize prompting to prompt if MONKEYSPHERE_PROMPT != 'false'

[monkeysphere.git] / src / share / ma / add_certifier

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 1b484f547954ee341a772a7f3dde7ff4aa5c177b..bd3819006ef27b72a6e4b74417877ef176cc728c 100644 (file)
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -31,7 +31,6 @@ local domain=
 local trust=full
 local depth=1
 local keyID
-local importinfo
 local fingerprint
 local ltsignCommand
 local trustval
@@ -51,6 +50,9 @@ while true ; do
            depth="$2"
            shift 2
            ;;
+       -)
+           break
+           ;;
        *)
            if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then
                failure "Unknown option '$1'.
@@ -62,81 +64,103 @@ Type '$PGRM help' for usage."
 done
 
 keyID="$1"
+
+# check that key ID or file is specified
 if [ -z "$keyID" ] ; then
     failure "You must specify the key ID of a key to add, or specify a file to read the key from."
 fi
-if [ -f "$keyID" ] ; then
-    log info "Reading key from file '$keyID':"
 
-    fingerprints=$(su_monkeysphere_user \
+# check the trust value
+case "$trust" in
+    'marginal')
+       trustval=1
+       ;;
+    'full')
+       trustval=2
+       ;;
+    *)
+       failure "Trust value requested ('$trust') was unclear (only 'marginal' or 'full' are supported)."
+       ;;
+esac
+
+# if file is specified
+if [ -f "$keyID" -o "$keyID" = '-' ] ; then
+    # load the key from stdin
+    if [ "$keyID" = '-' ] ; then
+       # make a temporary file to hold the key from stdin
+       keyID=$(msmktempfile)
+       trap "rm -f $keyID" EXIT
+       log verbose "reading key from stdin..."
+       cat > "$keyID"
+
+    # load the key from the file
+    elif [ -f "$keyID" ] ; then
+       log verbose "reading key from file '$keyID'..."
+    fi
+
+    # check the key is ok as monkeysphere user before loading
+    log debug "checking keys in file..."
+    fingerprint=$(su_monkeysphere_user \
        ". ${SYSSHAREDIR}/common; list_primary_fingerprints" < "$keyID")
 
-    if [ $(printf "%s" "$fingerprints" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
+    if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
        failure "There was not exactly one gpg key in the file."
     fi
 
-    gpg_sphere "--import" < "$keyID" || failure "could not read key from '$keyID'"
+    # load the key
+    gpg_sphere "--import" <"$keyID" 2>/dev/null \
+       || failure "could not read key from '$keyID'"
 
-    keyID="$fingerprints"
+# else, get the key from the keyserver
 else
-    # get the key from the key server
-    log debug "retrieving key from keyserver..."
-    gpg_sphere "--keyserver $KEYSERVER --recv-key '0x${keyID}!'" || failure "Could not receive a key with this ID from the '$KEYSERVER' keyserver."
-fi
-
-export keyID
-
-# get the full fingerprint of new certifier key
-log debug "getting fingerprint of certifier key..."
-fingerprint=$(gpg_sphere "--list-key --with-colons --with-fingerprint 0x${keyID}!" \
-    | grep '^fpr:' | grep "$keyID" | cut -d: -f10)
-
-if [ -z "$fingerprint" ] ; then
-    failure "Key '$keyID' not found."
-fi
-
-log info "key found:"
-gpg_sphere "--fingerprint 0x${fingerprint}!"
+    log verbose "searching keyserver $KEYSERVER for keyID $keyID..."
+    gpg_sphere "--keyserver $KEYSERVER --recv-key '0x${keyID}!'" \
+       || failure "Could not receive a key with this ID from the '$KEYSERVER' keyserver."
+
+    # get the full fingerprint of new certifier key
+    log debug "getting fingerprint of certifier key..."
+    fingerprint=$(gpg_sphere "--list-key --with-colons --with-fingerprint 0x${keyID}!" \
+       | grep '^fpr:' | cut -d: -f10)
+
+    # test that there is only a single fingerprint
+    if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then
+       cat <<EOF
+More than one fingerprint found:
+$fingerprint
+Please use a more specific key ID.
+EOF
+       failure
+    fi
 
-if [ "$PROMPT" = "true" ] ; then
-    echo "Are you sure you want to add the above key as a"
-    read -p "certifier of users on this system? (Y/n) " OK; OK=${OK:-Y}
-    if [ "${OK/y/Y}" != 'Y' ] ; then
-       failure "Identity certifier not added."
+    log info "key found:"
+    gpg_sphere "--fingerprint 0x${fingerprint}!"
+
+    if [ "$PROMPT" != "false" ] ; then
+       printf "Are you sure you want to add the above key as a certifier\nof users on this system? (Y/n) " >&2
+       read OK; OK=${OK:-Y}
+       if [ "${OK/y/Y}" != 'Y' ] ; then
+           failure "Identity certifier not added."
+       fi
+    else
+       log debug "adding key without prompting."
     fi
-else
-    log debug "adding key without prompting."
 fi
 
 # export the key to the core keyring so that the core can sign the
 # new certifier key
-log debug "exporting retrieved certifier key to core keyring..."
+log debug "loading key into core keyring..."
 gpg_sphere "--export 0x${fingerprint}!" | gpg_core --import
 
-case "$trust" in
-    'marginal')
-       trustval=1
-       ;;
-    'full')
-       trustval=2
-       ;;
-    *)
-       failure "Trust value requested ('$trust') was unclear (only 'marginal' or 'full' are supported)."
-       ;;
-esac
-
 # edit-key script to ltsign key
 # NOTE: *all* user IDs will be ltsigned
-ltsignCommand=$(cat <<EOF
-ltsign
+ltsignCommand="ltsign
 y
 $trustval
 $depth
 $domain
 y
-save
-EOF
-    )
+save"
+# end script
 
 # core ltsigns the newly imported certifier key
 log debug "executing core ltsign script..."
@@ -148,7 +172,7 @@ if echo "$ltsignCommand" | \
 
     # update the sphere trustdb
     log debug "updating sphere trustdb..."
-    gpg_sphere "--check-trustdb"
+    gpg_sphere "--check-trustdb" 2>&1 | log debug
 
     log info "Identity certifier added."
 else