X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fcommon;h=9d7deb7c6251c7ab989f53b49e29fc6e69b6971d;hb=ec9ded739045d9532fbc4883bbeb37f7aa940ac6;hp=24decae5dec4ebc28408934c734b0015c351136d;hpb=617f03c948b66774e6765206bed2c56d30157187;p=monkeysphere.git

diff --git a/src/common b/src/common
index 24decae..9d7deb7 100644
--- a/src/common
+++ b/src/common
@@ -69,19 +69,41 @@ file_hash() {
     md5sum "$1" 2> /dev/null
 }
 
-# convert escaped characters from gpg output back into original
-# character
-# FIXME: undo all escape character translation in with-colons gpg output
-unescape() {
-    echo "$1" | sed 's/\\x3a/:/g'
+# convert escaped characters in pipeline from gpg output back into
+# original character
+# FIXME: undo all escape character translation in with-colons gpg
+# output
+gpg_unescape() {
+    sed 's/\\x3a/:/g'
 }
 
-# convert nasty chars into gpg-friendly form
+# convert nasty chars into gpg-friendly form in pipeline
 # FIXME: escape everything, not just colons!
-escape() {
-    echo "$1" | sed 's/:/\\x3a/g'
+gpg_escape() {
+    sed 's/:/\\x3a/g'
 }
 
+# prompt for GPG-formatted expiration, and emit result on stdout
+get_gpg_expiration() {
+    local keyExpire=
+
+    cat >&2 <<EOF
+Please specify how long the key should be valid.
+         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
+    while [ -z "$keyExpire" ] ; do
+	read -p "Key is valid for? (0) " keyExpire
+	if ! test_gpg_expire ${keyExpire:=0} ; then
+	    echo "invalid value" >&2
+	    unset keyExpire
+	fi
+    done
+    echo "$keyExpire"
+}
 
 # remove all lines with specified string from specified file
 remove_line() {
@@ -393,29 +415,24 @@ process_user_id() {
 		;;
 	    'uid') # user ids
 		if [ "$lastKey" != pub ] ; then
-		    log " - got a user ID after a sub key!  user IDs should only follow primary keys!"
-		    continue
-		fi
-		# don't bother with a uid if there is no valid or reasonable primary key.
-		if [ "$keyOK" != true ] ; then
+		    log " - got a user ID after a sub key?!  user IDs should only follow primary keys!"
 		    continue
 		fi
 		# if an acceptable user ID was already found, skip
-		if [ "$uidOK" ] ; then
+		if [ "$uidOK" = 'true' ] ; then
 		    continue
 		fi
-		# if the user ID does not match, skip
-		if [ "$(unescape "$uidfpr")" != "$userID" ] ; then
-		    continue
-		fi
-		# if the user ID validity is not ok, skip
-		if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
+		# if the user ID does matches...
+		if [ "$(echo "$uidfpr" | gpg_unescape)" = "$userID" ] ; then
+		    # and the user ID validity is ok
+		    if [ "$validity" = 'u' -o "$validity" = 'f' ] ; then
+			# mark user ID acceptable
+			uidOK=true
+		    fi
+		else
 		    continue
 		fi
 
-		# mark user ID acceptable
-		uidOK=true
-
 		# output a line for the primary key
 		# 0 = ok, 1 = bad
 		if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then