diff options
Diffstat (limited to 'src/share')
-rw-r--r-- | src/share/mh/add_hostname | 16 | ||||
-rw-r--r-- | src/share/mh/revoke_hostname | 24 | ||||
-rw-r--r-- | src/share/mh/set_expire (renamed from src/share/mh/extend_key) | 17 |
3 files changed, 16 insertions, 41 deletions
diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname index 267f109..46326bb 100644 --- a/src/share/mh/add_hostname +++ b/src/share/mh/add_hostname @@ -27,18 +27,9 @@ fi userID="ssh://${1}" -fingerprint=$(fingerprint_host_key) - -# match to only ultimately trusted user IDs -tmpuidMatch="u:$(echo $userID | gpg_escape)" - -# find the index of the requsted user ID -# NOTE: this is based on circumstantial evidence that the order of -# this output is the appropriate index -if line=$(gpg_host --list-keys --with-colons --fixed-list-mode "0x${fingerprint}!" \ - | egrep '^(uid|uat):' | cut -f2,10 -d: | grep -n -x -F "$tmpuidMatch") ; then +# test that the desired user ID does not already exist +find_host_userid > /dev/null && \ failure "Host userID '$userID' already exists." -fi echo "The following user ID will be added to the host key:" echo " $userID" @@ -58,8 +49,7 @@ EOF ) # execute edit-key script -if echo "$adduidCommand" | \ - gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then +if echo "$adduidCommand" | gpg_host_edit ; then show_key diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname index 06b5810..940b5f4 100644 --- a/src/share/mh/revoke_hostname +++ b/src/share/mh/revoke_hostname @@ -38,20 +38,9 @@ fi userID="ssh://${1}" -fingerprint=$(fingerprint_host_key) - -# match to only ultimately trusted user IDs -tmpuidMatch="u:$(echo $userID | gpg_escape)" - -# find the index of the requsted user ID -# NOTE: this is based on circumstantial evidence that the order of -# this output is the appropriate index -if line=$(gpg_host --list-keys --with-colons --fixed-list-mode "0x${fingerprint}!" \ - | egrep '^(uid|uat):' | cut -f2,10 -d: | grep -n -x -F "$tmpuidMatch") ; then - uidIndex=${line%%:*} -else - failure "No non-revoked user ID '$userID' is found." -fi +# make sure the user ID to revoke +uidIndex=$(find_host_userid) || \ + failure "No non-revoked user ID found matching '$userID'." echo "The following host key user ID will be revoked:" echo " $userID" @@ -60,15 +49,13 @@ if [ ${OK/y/Y} != 'Y' ] ; then failure "User ID not revoked." fi -message="Hostname removed by monkeysphere-server $DATE" - # edit-key script command to revoke user ID revuidCommand=$(cat <<EOF $uidIndex revuid y 4 -$message +Hostname removed by monkeysphere-host: $DATE y save @@ -76,8 +63,7 @@ EOF ) # execute edit-key script -if echo "$revuidCommand" | \ - gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then +if echo "$revuidCommand" | gpg_host_edit ; then show_key diff --git a/src/share/mh/extend_key b/src/share/mh/set_expire index 79ee267..2389e57 100644 --- a/src/share/mh/extend_key +++ b/src/share/mh/set_expire @@ -1,7 +1,10 @@ # -*-shell-script-*- # This should be sourced by bash (though we welcome changes to make it POSIX sh compliant) -# Monkeysphere host extend-key subcommand +# Monkeysphere host set-expire subcommand +# +# This is a function to set the expiration date of the monkeysphere +# host key. # # The monkeysphere scripts are written by: # Jameson Rollins <jrollins@finestructure.net> @@ -11,18 +14,14 @@ # They are Copyright 2008-2009, and are all released under the GPL, # version 3 or later. -# extend the lifetime of a host key: - -extend_key() { +set-expire() { -local fpr=$(fingerprint_host_key) -local extendTo="$1" +local extendTo # get the new expiration date -extendTo=$(get_gpg_expiration "$extendTo") +extendTo=$(get_gpg_expiration "$1") -gpg_host --quiet --command-fd 0 --edit-key "$fpr" <<EOF -expire +gpg_host_edit expire <<EOF $extendTo save EOF |