summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/share/ma/add_certifier69
-rw-r--r--src/share/mh/add_revoker84
-rw-r--r--website/getting-started-user.mdwn6
3 files changed, 75 insertions, 84 deletions
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index e2df1d3..f2cadf2 100644
--- 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
@@ -71,11 +70,25 @@ 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
+# 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
- local keyID=$(msmktempfile)
+ # 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"
@@ -98,54 +111,36 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
gpg_sphere "--import" <"$keyID" \
|| failure "could not read key from '$keyID'"
- keyID="$fingerprint"
-
# else, get the key from the keyserver
else
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."
-fi
-# 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}!"
-
-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."
+ # 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)
+
+ log info "key found:"
+ gpg_sphere "--fingerprint 0x${fingerprint}!"
+
+ 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."
+ 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
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 2275f61..638f052 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -15,14 +15,10 @@
add_revoker() {
-local domain=
-local trust=full
-local depth=1
local keyID
-local importinfo
+local tmpDir
local fingerprint
-local ltsignCommand
-local trustval
+local addrevokerCommand
keyID="$1"
@@ -31,12 +27,17 @@ if [ -z "$keyID" ] ; then
failure "You must specify the key ID of a revoker key, or specify a file to read the key from."
fi
+# make a temporary directory for storing keys during import, and set
+# the trap to delete it on exit
+tmpDir=$(msmktempdir)
+trap "rm -rf $tmpDir" EXIT
+
# if file is specified
if [ -f "$keyID" -o "$keyID" = '-' ] ; then
# load the key from stdin
if [ "$keyID" = '-' ] ; then
- local keyID=$(msmktempfile)
- trap "rm -f $keyID" EXIT
+ # make a temporary file to hold the key from stdin
+ keyID="$tmpDir"/importkey
log verbose "reading key from stdin..."
cat > "$keyID"
@@ -58,62 +59,57 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
gpg_host --import <"$keyID" \
|| failure "could not read key from '$keyID'"
- keyID="$fingerprint"
-
# else, get the key from the keyserver
else
# create a temporary directory for storing the downloaded key
- local TMPLOC=$(msmktempdir)
+ local GNUPGHOME="$tmpDir"
chmod 0700 "$GNUPGHOME"
chown "$MONKEYSPHERE_USER":"$MONKEYSPHERE_USER" "$GNUPGHOME"
+ export GNUPGHOME
# download the key from the keyserver as the monkeysphere user
log verbose "searching keyserver $KEYSERVER for keyID $keyID..."
- su_monkeysphere_user \
- "GNUPGHOME=$TMPLOC gpg --quiet --keyserver $KEYSERVER --recv-key 0x${keyID}!" \
+ su_monkeysphere_user "gpg --quiet --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 revoker key
+ log debug "getting fingerprint of revoker key..."
+ fingerprint=$(su_monkeysphere_user "gpg --list-key --with-colons --with-fingerprint 0x${keyID}!" \
+ | grep '^fpr:' | grep "$keyID" | cut -d: -f10)
+
+ log info "key found:"
+ su_monkeysphere_user "gpg --fingerprint 0x${fingerprint}!"
+
+ if [ "$PROMPT" = "true" ] ; then
+ echo "Are you sure you want to add the above key as a"
+ read -p "revoker of the host key? (Y/n) " OK; OK=${OK:-Y}
+ if [ "${OK/y/Y}" != 'Y' ] ; then
+ failure "revoker not added."
+ fi
+ else
+ log debug "adding revoker without prompting."
+ fi
+
# export the new key to the host keyring
- log verbose "loading key $keyID..."
- su_monkeysphere_user "GNUPGHOME=$TMPLOC gpg --quiet --export 0x${keyID}!" \
+ log debug "loading key into host keyring..."
+ su_monkeysphere_user "gpg --quiet --export 0x${fingerprint}!" \
| gpg_host --import
fi
-# get the full fingerprint of new revoker key
-log debug "getting fingerprint of revoker key..."
-fingerprint=$(gpg_host --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_host --fingerprint "0x${fingerprint}!"
-
-if [ "$PROMPT" = "true" ] ; then
- echo "Are you sure you want to add the above key as a"
- read -p "revoker of the host key? (Y/n) " OK; OK=${OK:-Y}
- if [ "${OK/y/Y}" != 'Y' ] ; then
- failure "revoker not added."
- fi
-else
- log debug "adding revoker without prompting."
-fi
-
# edit-key script to add revoker
addrevokerCommand=$(cat <<EOF
addrevoker
+$fingerprint
+B65D085B94117B813160B659ED34CEABE27BAABC
+y
+save
EOF
)
-# FIXME: implement!
-failure "not implemented yet!"
-
# core ltsigns the newly imported revoker key
-if echo "$addrevokerCommand" | \
- gpg_core_edit ; then
+log debug "executing add revoker script..."
+if echo "$addrevokerCommand" | gpg_host_edit ; then
update_gpg_pub_file
@@ -122,4 +118,8 @@ else
failure "Problem adding revoker."
fi
+# remove the temporary directory
+trap - EXIT
+rm -rf "$tmpDir"
+
}
diff --git a/website/getting-started-user.mdwn b/website/getting-started-user.mdwn
index d96e5b0..ec157ac 100644
--- a/website/getting-started-user.mdwn
+++ b/website/getting-started-user.mdwn
@@ -91,11 +91,7 @@ the `gen-subkey` command:
$ monkeysphere gen-subkey
If you have more than one secret key, you'll need to specify the key
-you want to add the subkey to on the command line. It have already
-have an ssh pub key that you use regularly, you can import this key
-into GPG with the `import-subkey` command:
-
- $ monkeysphere import-subkey ~/.ssh/id_rsa
+you want to add the subkey to on the command line.
Using your OpenPGP authentication key for SSH