X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Frevoke_hostname;h=5dc327f02c8a65a97e1fa4dd4dae1289bb15bc85;hb=dfd67a14003fbfb4b1ba2269e7d47f4d0c44fcf8;hp=06b5810f886f99800a1cac53109917db66cdf64b;hpb=0ae461de6b7bf10d3b085dfd9a5d6d29ffd29116;p=monkeysphere.git

diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 06b5810..5dc327f 100644
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -28,9 +28,9 @@ if [ -z "$1" ] ; then
 fi
 
 echo "WARNING: There is a known bug in this function."
-echo "This function has been known to occasionally revoke the wrong user ID."
+echo "This function has been known to occasionally revoke the wrong hostname."
 echo "Please see the following bug report for more information:"
-echo "http://web.monkeysphere.info/bugs/revoke-hostname-revoking-wrong-userid/"
+echo "https://labs.riseup.net/code/issues/show/422"
 read -p "Are you sure you would like to proceed? (y/N) " OK; OK=${OK:=N}
 if [ ${OK/y/Y} != 'Y' ] ; then
     failure "aborting."
@@ -38,46 +38,36 @@ 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%%:*}
+# make sure the user ID to revoke
+uidIndex=$(find_host_userid) || \
+    failure "No non-revoked user ID found matching '$userID'."
+
+if [ "$PROMPT" = "true" ] ; then
+    read -p "The following host key user ID will be revoked:
+  $userID
+Are you sure you would like to revoke this user ID? (Y/n) " OK; OK=${OK:=Y}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
+	failure "User ID not revoked."
+    fi
 else
-    failure "No non-revoked user ID '$userID' is found."
+    log debug "revoking user ID without prompting."
 fi
 
-echo "The following host key user ID will be revoked:"
-echo "  $userID"
-read -p "Are you sure you would like to revoke this user ID? (y/N) " OK; OK=${OK:=N}
-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
+revuidCommand="$uidIndex
 revuid
 y
 4
-$message
+Hostname removed by monkeysphere-host: $DATE
 
 y
-save
-EOF
-    )	
+save"
+# end script
 
 # 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
+
+    update_gpg_pub_file
 
     show_key