From ce45ef5702e072e869fa9d1b703f99dc740eb000 Mon Sep 17 00:00:00 2001
From: Jameson Rollins <jrollins@finestructure.net>
Date: Fri, 15 Jan 2010 19:19:15 -0500
Subject: Major rework of monkeysphere-host to handle multiple host keys.

This rework removes any assumption that monkeysphere-host is just
managing a single host key, or that the keys are used specifically for
ssh.  The UI is exactly backwards compatible except that hostnames
('example.com') must be replaced by full service names
('ssh://example.com').  This incarnation passes the old tests with
those changes only.

There are a couple of things that still need to be done:

- need to see if a transition script is needed (some local file names
  have changed)

- need to fill in check_service_name function to verify that a
  specified service name fits the expected format.

- update diagnostics appropriately
---
 src/share/mh/set_expire | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

(limited to 'src/share/mh/set_expire')

diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index 9889e76..049c2c5 100644
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -11,18 +11,32 @@
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 #
-# They are Copyright 2008-2009, and are all released under the GPL,
+# They are Copyright 2008-2010, and are all released under the GPL,
 # version 3 or later.
 
 set_expire() {
 
-local extendTo
+local extendBy
+local keyID
+
+if [ -z "$1" ] ; then
+    cat <<EOF >&2
+Must specify expiration.  The possibilities are:
+    0 = key does not expire
+ <n>  = key expires in n days
+ <n>w = key expires in n weeks
+ <n>m = key expires in n months
+ <n>y = key expires in n years
+EOF
+    failure
+fi
+extendBy="$1"
+shift
 
-# get the new expiration date
-extendTo=$(get_gpg_expiration "$1")
+keyID=$(check_key_input "$@")
 
 if [ "$PROMPT" = "true" ] ; then
-    printf "Are you sure you want to change the expiration on the host key to '%s'? (Y/n) " "$extendTo" >&2
+    printf "Are you sure you want to change the expiration on key '$keyID' by '%s'? (Y/n) " "$extendBy" >&2
     read OK; OK=${OK:-Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
 	failure "expiration not set."
@@ -31,18 +45,18 @@ else
     log debug "extending without prompting."
 fi
 
-log info "setting host key expiration to ${extendTo}."
+log info "setting key expiration to ${extendBy}."
 
-log debug "executing host expire script..."
-gpg_host_edit expire <<EOF
-$extendTo
+log debug "executing key expire script..."
+gpg_host_edit "0x${keyID}!" expire <<EOF
+$extendBy
 save
 EOF
 
 update_gpg_pub_file
 
 log info <<EOF
-NOTE: Host key expiration date adjusted, but not yet published.
+NOTE: Key expiration date adjusted, but not yet published.
 Run '$PGRM publish-key' to publish the new expiration date.
 EOF
 
-- 
cgit v1.2.3