X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=6853f581ff2ff1b81083ed385ba3566326be7f32;hb=b92675786ac883551528b3870c71c98066d60c0f;hp=ff4423ba11107365afb2343f46232baf35bf1b22;hpb=07cb14cdb80ef060e63ba2713ef70b67db9f5783;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index ff4423b..6853f58 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # monkeysphere: MonkeySphere client tool
 #
@@ -38,65 +38,61 @@ subcommands:
   update-userids (u) [USERID]...    add/update user IDs
   remove-userids (r) [USERID]...    remove user IDs
   update-authorized_keys (a)        update authorized_keys file
-  gen-ae-subkey (g) KEYID           generate an 'ae' capable subkey
+  gen-subkey (g) KEYID              generate an 'a' capable subkey
   help (h,?)                        this help
 
 EOF
 }
 
-# generate a subkey with the 'a' and 'e' usage flags set
-gen_ae_subkey(){
+# generate a subkey with the 'a' usage flags set
+# FIXME: this needs some tweaking to clean it up
+gen_subkey(){
     local keyID
     local gpgOut
     local userID
 
-    log "warning: this function is still not working."
-
     keyID="$1"
 
-    # set subkey defaults
-    SUBKEY_TYPE=${KEY_TYPE:-"RSA"}
-    SUBKEY_LENGTH=${KEY_LENGTH:-"1024"}
-    SUBKEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
-
-    gpgOut=$(gpg --fixed-list-mode --list-keys --with-colons \
+    gpgOut=$(gpg --quiet --fixed-list-mode --list-keys --with-colons \
 	"$keyID" 2> /dev/null)
 
     # return 1 if there only "tru" lines are output from gpg
     if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
-	log "  key not found."
-	return 1
+	failure "Key ID '$keyID' not found."
     fi
 
-    userID=$(echo "$gpgOut" | grep "^uid:" | cut -d: -f10)
-
-    # set key parameters
-    keyParameters=$(cat <<EOF
-Subkey-Type: $SUBKEY_TYPE
-Subkey-Length: $SUBKEY_LENGTH
-Subkey-Usage: $SUBKEY_USAGE
-Name-Real: $userID
+    # set subkey defaults
+    SUBKEY_TYPE=${SUBKEY_TYPE:-"RSA"}
+    #SUBKEY_LENGTH=${SUBKEY_LENGTH:-"2048"}
+    SUBKEY_USAGE=${SUBKEY_USAGE:-"auth"}
+    SUBKEY_EXPIRE=${SUBKEY_EXPIRE:-"0"}
+    cat <<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
-)
-
-    echo "The following key parameters will be used:"
-    echo "$keyParameters"
-
-    read -p "generate key? [Y|n]: " OK; OK=${OK:=Y}
-    if [ ${OK/y/Y} != 'Y' ] ; then
-	failure "aborting."
-    fi
-
-    # add commit command
-    keyParameters="${keyParameters}"$(cat <<EOF
-
-%commit
-%echo done
+    read -p "Key is valid for? ($SUBKEY_EXPIRE) " SUBKEY_EXPIRE; SUBKEY_EXPIRE=${SUBKEY_EXPIRE:-"0"}
+
+    # generate the list of commands that will be passed to edit-key
+    editCommands=$(cat <<EOF
+addkey
+7
+S
+E
+A
+Q
+$SUBKEY_LENGTH
+$SUBKEY_EXPIRE
+save
 EOF
 )
 
-    echo "generating subkey..."
-    echo "$keyParameters" | gpg --batch --gen-key
+    log "generating subkey..."
+    echo "$editCommands" | gpg --expert --command-fd 0 --edit-key "$keyID"
+    log "done."
 }
 
 ########################################################################
@@ -118,27 +114,22 @@ MS_CONF=${MS_CONF:-"${MS_HOME}/monkeysphere.conf"}
 AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"${MS_HOME}/authorized_user_ids"}
 GNUPGHOME=${GNUPGHOME:-"${HOME}/.gnupg"}
 KEYSERVER=${KEYSERVER:-"subkeys.pgp.net"}
+CHECK_KEYSERVER=${CHECK_KEYSERVER:="true"}
 REQUIRED_HOST_KEY_CAPABILITY=${REQUIRED_HOST_KEY_CAPABILITY:-"e a"}
 REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
-USER_CONTROLLED_AUTHORIZED_KEYS=${USER_CONTROLLED_AUTHORIZED_KEYS:-"%h/.ssh/authorized_keys"}
-USER_KNOWN_HOSTS=${USER_KNOWN_HOSTS:-"${HOME}/.ssh/known_hosts"}
+KNOWN_HOSTS=${KNOWN_HOSTS:-"${HOME}/.ssh/known_hosts"}
+AUTHORIZED_KEYS=${AUTHORIZED_KEYS:-"${HOME}/.ssh/authorized_keys"}
 HASH_KNOWN_HOSTS=${HASH_KNOWN_HOSTS:-"true"}
 
 export GNUPGHOME
 
-# stagging locations
-hostKeysCacheDir="${MS_HOME}/host_keys"
-userKeysCacheDir="${MS_HOME}/user_keys"
-msAuthorizedKeys="${MS_HOME}/authorized_keys"
-
 # make sure gpg home exists with proper permissions
 mkdir -p -m 0700 "$GNUPGHOME"
 
 # make sure the user monkeysphere home directory exists
 mkdir -p -m 0700 "$MS_HOME"
-mkdir -p "$hostKeysCacheDir"
-mkdir -p "$userKeysCacheDir"
 touch "$AUTHORIZED_USER_IDS"
+touch "$AUTHORIZED_KEYS"
 
 case $COMMAND in
     'update-known_hosts'|'update-known-hosts'|'k')
@@ -146,23 +137,25 @@ case $COMMAND in
 
         # touch the known_hosts file to make sure it exists
 	# ssh-keygen complains if it doesn't exist
-	touch "$USER_KNOWN_HOSTS"
+	touch "$KNOWN_HOSTS"
 
         # if hosts are specified on the command line, process just
         # those hosts
 	if [ "$1" ] ; then
             for host ; do
-		process_host "$host" "$hostKeysCacheDir"
+		process_host_known_hosts "$host"
 	    done
+	    log "known_hosts file updated."
 
         # otherwise, if no hosts are specified, process every user
         # in the user's known_hosts file
 	else
-	    if [ ! -s "$USER_KNOWN_HOSTS" ] ; then
-		failure "known_hosts file '$USER_KNOWN_HOSTS' is empty."
+	    if [ ! -s "$KNOWN_HOSTS" ] ; then
+		failure "known_hosts file '$KNOWN_HOSTS' is empty."
 	    fi
 	    log "processing known_hosts file..."
-	    process_known_hosts "$USER_KNOWN_HOSTS" "$hostKeysCacheDir"
+	    process_known_hosts
+	    log "known_hosts file updated."
 	fi
 	;;
 
@@ -171,9 +164,9 @@ case $COMMAND in
 	    failure "you must specify at least one userid."
 	fi
 	for userID ; do
-	    update_userid "$userID" "$userKeysCacheDir"
+	    update_userid "$userID"
 	done
-	log "run the following to update your monkeysphere authorized_keys file:"
+	log "Run the following to update your monkeysphere authorized_keys file:"
 	log "$PGRM update-authorized_keys"
 	;;
 
@@ -184,7 +177,7 @@ case $COMMAND in
 	for userID ; do
 	    remove_userid "$userID"
 	done
-	log "run the following to update your monkeysphere authorized_keys file:"
+	log "Run the following to update your monkeysphere authorized_keys file:"
 	log "$PGRM update-authorized_keys"
 	;;
 
@@ -196,19 +189,18 @@ case $COMMAND in
 	    failure "$AUTHORIZED_USER_IDS is empty."
 	fi
 
-	# set user-controlled authorized_keys file path
-	userAuthorizedKeys=${USER_CONTROLLED_AUTHORIZED_KEYS/\%h/"$HOME"}
-
-	# update authorized_keys
-	update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$userKeysCacheDir"
+	# process authorized_user_ids file
+	log "processing authorized_user_ids file..."
+	process_authorized_user_ids
+	log "authorized_keys file updated."
 	;;
 
-    'gen-ae-subkey'|'g')
+    'gen-subkey'|'g')
 	keyID="$1"
 	if [ -z "$keyID" ] ; then
-	    failure "you must specify keyid of primary key."
+	    failure "You must specify the key ID of your primary key."
 	fi
-	gen_ae_subkey "$keyID"
+	gen_subkey "$keyID"
 	;;
 
     'help'|'h'|'?')