X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=a6ca62d7949189104cea0978e814b723b160143e;hb=c32302172e3533b2170329206ff011d6e3a26a49;hp=d652ab31ad57b236f6c1c12c3ff6f4f4cf934c98;hpb=be186e427ac34812e2b2a55489ae55fe2341f6a0;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index d652ab3..a6ca62d 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # monkeysphere: MonkeySphere client tool
 #
@@ -15,7 +15,7 @@ SHAREDIR=${SHAREDIR:-"/usr/share/monkeysphere"}
 export SHAREDIR
 . "${SHAREDIR}/common"
 
-GLOBAL_CONFIG=${GLOBAL_CONFIG:-"${ETC}"/monkeysphere.conf}
+GLOBAL_CONFIG=${GLOBAL_CONFIG:-"${ETC}/monkeysphere.conf"}
 [ -r "$GLOBAL_CONFIG" ] && . "$GLOBAL_CONFIG"
 
 # date in UTF format if needed
@@ -31,18 +31,69 @@ GREP_OPTIONS=
 usage() {
 cat <<EOF
 usage: $PGRM <subcommand> [args]
-Monkeysphere client tool.
+MonkeySphere client tool.
 
 subcommands:
-  update-known-hosts (k) [HOST]...  update known_hosts file
-  update-authorized-keys (a)        update authorized_keys file
-  update-userids (u) [USERID]...    add/update userid
-  gen-ae-subkey (g)                 generate an 'ae' capable subkey
+  update-known_hosts (k) [HOST]...  update known_hosts file
+  update-userids (u) [USERID]...    add/update user IDs
+  remove-userids (r) [USERID]...    remove user IDs
+  update-authorized_keys (a)        update authorized_keys file
+  gen-subkey (g) KEYID              generate an 'a' capable subkey
   help (h,?)                        this help
 
 EOF
 }
 
+# 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
+
+    keyID="$1"
+
+    gpgOut=$(gpg --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
+	failure "Key ID '$keyID' not found."
+    fi
+
+    # 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
+    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 "$editCommands" | gpg --expert --command-fd 0 --edit-key "$keyID"
+}
+
 ########################################################################
 # MAIN
 ########################################################################
@@ -52,36 +103,44 @@ COMMAND="$1"
 shift
 
 # set ms home directory
-MS_HOME=${MS_HOME:-"$HOME"/.config/monkeysphere}
+MS_HOME=${MS_HOME:-"${HOME}/.config/monkeysphere"}
 
 # load configuration file
-MS_CONF=${MS_CONF:-"$MS_HOME"/monkeysphere.conf}
+MS_CONF=${MS_CONF:-"${MS_HOME}/monkeysphere.conf"}
 [ -e "$MS_CONF" ] && . "$MS_CONF"
 
 # set empty config variable with defaults
-AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"$MS_HOME"/authorized_user_ids}
-GNUPGHOME=${GNUPGHOME:-"$HOME"/.gnupg}
-KEYSERVER=${KEYSERVER:-subkeys.pgp.net}
-REQUIRED_KEY_CAPABILITY=${REQUIRED_KEY_CAPABILITY:-"e a"}
-USER_CONTROLLED_AUTHORIZED_KEYS=${USER_CONTROLLED_AUTHORIZED_KEYS:-%h/.ssh/authorized_keys}
-USER_KNOWN_HOSTS=${USER_KNOWN_HOSTS:-"$HOME"/.ssh/known_hosts}
-HASH_KNOWN_HOSTS=${HASH_KNOWN_HOSTS:-}
+AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"${MS_HOME}/authorized_user_ids"}
+GNUPGHOME=${GNUPGHOME:-"${HOME}/.gnupg"}
+KEYSERVER=${KEYSERVER:-"subkeys.pgp.net"}
+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:-"${HOME}/.ssh/authorized_keys"}
+USER_KNOWN_HOSTS=${USER_KNOWN_HOSTS:-"${HOME}/.ssh/known_hosts"}
+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
+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"
+
 case $COMMAND in
-    'update-known-hosts'|'k')
+    'update-known_hosts'|'update-known-hosts'|'k')
 	MODE='known_hosts'
 
         # touch the known_hosts file to make sure it exists
+	# ssh-keygen complains if it doesn't exist
 	touch "$USER_KNOWN_HOSTS"
 
         # if hosts are specified on the command line, process just
@@ -91,63 +150,57 @@ case $COMMAND in
 		process_host "$host" "$hostKeysCacheDir"
 	    done
 
-        # otherwise, if no hosts are specified, process the user
-        # known_hosts file
+        # 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."
 	    fi
 	    log "processing known_hosts file..."
-	    process_known_hosts "$USER_KNOWN_HOSTS" "$hostKeysCacheDir"
+	    process_known_hosts "$hostKeysCacheDir"
 	fi
 	;;
 
-    'update-authorized-keys'|'a')
-	MODE='authorized_keys'
-
-	log "processing authorized_user_ids file..."
-
-        # make sure authorized_user_ids file exists
-	if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then
-	    log "authorized_user_ids file is empty or does not exist."
-	    exit
-	fi
-
-	process_authorized_ids "$AUTHORIZED_USER_IDS" "$userKeysCacheDir"
-
-        # write output key file
-	log "writing monkeysphere authorized_keys file... "
-	touch "$msAuthorizedKeys"
-	if [ "$(ls "$userKeysCacheDir")" ] ; then
-	    log -n "adding gpg keys... "
-	    cat "$userKeysCacheDir"/* > "$msAuthorizedKeys"
-	    echo "done."
-	else
-	log "no gpg keys to add."
-	fi
-	if [ "$USER_CONTROLLED_AUTHORIZED_KEYS" ] ; then
-	    userAuthorizedKeys=${USER_CONTROLLED_AUTHORIZED_KEYS/\%h/"$HOME"}
-	    if [ -s "$userAuthorizedKeys" ] ; then
-		log -n "adding user authorized_keys file... "
-		cat "$userAuthorizedKeys" >> "$msAuthorizedKeys"
-		echo "done."
-	    fi
+    'update-userids'|'update-userid'|'u')
+	if [ -z "$1" ] ; then
+	    failure "you must specify at least one userid."
 	fi
-	log "monkeysphere authorized_keys file generated:"
-	log "$msAuthorizedKeys"
+	for userID ; do
+	    update_userid "$userID" "$userKeysCacheDir"
+	done
+	log "Run the following to update your monkeysphere authorized_keys file:"
+	log "$PGRM update-authorized_keys"
 	;;
 
-    'update-userids'|'u')
+    'remove-userids'|'remove-userid'|'r')
 	if [ -z "$1" ] ; then
 	    failure "you must specify at least one userid."
 	fi
 	for userID ; do
-	    update_userid "$userID" "$userKeysCacheDir"
+	    remove_userid "$userID"
 	done
+	log "Run the following to update your monkeysphere authorized_keys file:"
+	log "$PGRM update-authorized_keys"
 	;;
 
-    'gen-ae-subkey'|)
-	failure "function not implemented yet."
+    'update-authorized_keys'|'update-authorized-keys'|'a')
+	MODE='authorized_keys'
+
+        # fail if the authorized_user_ids file is empty
+	if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then
+	    failure "$AUTHORIZED_USER_IDS is empty."
+	fi
+
+	# update authorized_keys
+	update_authorized_keys "$msAuthorizedKeys" "$USER_CONTROLLED_AUTHORIZED_KEYS" "$userKeysCacheDir"
+	;;
+
+    'gen-subkey'|'g')
+	keyID="$1"
+	if [ -z "$keyID" ] ; then
+	    failure "You must specify the key ID of your primary key."
+	fi
+	gen_subkey "$keyID"
 	;;
 
     'help'|'h'|'?')
@@ -156,6 +209,6 @@ case $COMMAND in
 
     *)
         failure "Unknown command: '$COMMAND'
-Type 'cereal-admin help' for usage."
+Type '$PGRM help' for usage."
         ;;
 esac