X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-server;h=e05b4b71c8253ac7d8c335705253f8a52c8433d2;hb=fa49fb68ca77761682fd4547debfabda403f0212;hp=a109cf533229c78074e1fe543e37569b49618321;hpb=f049fa104308997359dcd4eb7fd68cabe06a43ba;p=monkeysphere.git

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index a109cf5..e05b4b7 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -28,14 +28,15 @@ GREP_OPTIONS=
 usage() {
 cat <<EOF
 usage: $PGRM <subcommand> [args]
-Monkeysphere server admin tool.
+MonkeySphere server admin tool.
 
 subcommands:
   update-users (s) [USER]...            update users authorized_keys files
   gen-key (g)                           generate gpg key for the server
   publish-key (p)                       publish server key to keyserver
   trust-keys (t) KEYID...               mark keyids as trusted
-  update-user-userids (u) USER UID...   add/update userids for a user
+  update-user-userids (u) USER UID...   add/update user IDs for a user
+  remove-user-userids (r) USER UID...   remove user IDs for a user
   help (h,?)                            this help
 
 EOF
@@ -46,7 +47,7 @@ gen_key() {
     # set key defaults
     KEY_TYPE=${KEY_TYPE:-"RSA"}
     KEY_LENGTH=${KEY_LENGTH:-"2048"}
-    KEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
+    KEY_USAGE=${KEY_USAGE:-"auth,encrypt"}
     SERVICE=${SERVICE:-"ssh"}
     HOSTNAME_FQDN=${HOSTNAME_FQDN:-$(hostname -f)}
 
@@ -70,7 +71,7 @@ EOF
 )
     fi
 
-    log "The following key parameters will be used:"
+    echo "The following key parameters will be used:"
     echo "$keyParameters"
 
     read -p "generate key? [Y|n]: " OK; OK=${OK:=Y}
@@ -90,25 +91,10 @@ EOF
 EOF
 )
 
-    echo "generating server key..."
+    log "generating server key..."
     echo "$keyParameters" | gpg --batch --gen-key
 }
 
-# publish server key to keyserver
-publish_key() {
-    read -p "publish key to $KEYSERVER? [Y|n]: " OK; OK=${OK:=Y}
-    if [ ${OK/y/Y} != 'Y' ] ; then
-	failure "aborting."
-    fi
-
-    keyID=$(gpg --list-key --with-colons ="$USERID" 2> /dev/null | grep '^pub:' | cut -d: -f5)
-
-    # dummy command so as not to publish fakes keys during testing
-    # eventually:
-    #gpg --send-keys --keyserver "$KEYSERVER" "$keyID"
-    echo "NOT PUBLISHED: gpg --send-keys --keyserver $KEYSERVER $keyID"
-}
-
 ########################################################################
 # MAIN
 ########################################################################
@@ -129,7 +115,6 @@ GNUPGHOME=${GNUPGHOME:-"$MS_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}
-STAGING_AREA=${STAGING_AREA:-"$LIB"/stage}
 
 export GNUPGHOME
 
@@ -137,7 +122,7 @@ export GNUPGHOME
 mkdir -p -m 0700 "$GNUPGHOME"
 
 case $COMMAND in
-    'update-users'|'s')
+    'update-users'|'update-user'|'s')
 	if [ "$1" ] ; then
 	    unames="$@"
 	else
@@ -149,13 +134,17 @@ case $COMMAND in
 
 	    log "----- user: $uname -----"
 
+	    # set variables for the user
 	    AUTHORIZED_USER_IDS="$MS_HOME"/authorized_user_ids/"$uname"
-	    cacheDir="$STAGING_AREA"/"$uname"/user_keys
-	    msAuthorizedKeys="$STAGING_AREA"/"$uname"/authorized_keys
+	    msAuthorizedKeys="$CACHE"/"$uname"/authorized_keys
+	    cacheDir="$CACHE"/"$uname"/user_keys
+
+            # make sure user's authorized_user_ids file exists
+	    touch "$AUTHORIZED_USER_IDS"
 
-            # make sure authorized_user_ids file exists
+	    # skip if the user's authorized_user_ids file is empty
 	    if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then
-		log "authorized_user_ids file for '$uname' is empty or does not exist."
+		log "authorized_user_ids file for '$uname' is empty."
 		continue
 	    fi
 
@@ -166,7 +155,7 @@ case $COMMAND in
 	    fi
 
 	    # update authorized_keys
-	    update_authorized_keys "$cacheDir" "$msAuthorizedKeys" "$userAuthorizedKeys"
+	    update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$cacheDir"
 	done
 
 	log "----- done. -----"
@@ -177,19 +166,47 @@ case $COMMAND in
 	;;
 
     'publish-key'|'p')
-	publish_key
+	publish_server_key
 	;;
 
-    'trust-keys'|'t')
+    'trust-keys'|'trust-key'|'t')
 	if [ -z "$1" ] ; then
 	    failure "you must specify at least one key to trust."
 	fi
+
+	# process key IDs
 	for keyID ; do
 	    trust_key "$keyID"
 	done
 	;;
 
-    'update-user-userids'|'u')
+    'update-user-userids'|'update-user-userid'|'u')
+	uname="$1"
+	shift
+	if [ -z "$uname" ] ; then
+	    failure "you must specify user."
+	fi
+	if [ -z "$1" ] ; then
+	    failure "you must specify at least one userid."
+	fi
+
+	# set variables for the user
+	AUTHORIZED_USER_IDS="$MS_HOME"/authorized_user_ids/"$uname"
+	cacheDir="$CACHE"/"$uname"/user_keys
+
+        # make sure user's authorized_user_ids file exists
+	touch "$AUTHORIZED_USER_IDS"
+
+	# process the user IDs
+	for userID ; do
+	    update_userid "$userID" "$cacheDir"
+	done
+
+	log "run the following to update user's authorized_keys file:"
+	log "$PGRM update-users $uname"
+	;;
+
+    'remove-user-userids'|'remove-user-userid'|'r')
 	uname="$1"
 	shift
 	if [ -z "$uname" ] ; then
@@ -198,11 +215,20 @@ case $COMMAND in
 	if [ -z "$1" ] ; then
 	    failure "you must specify at least one userid."
 	fi
+
+	# set variables for the user
 	AUTHORIZED_USER_IDS="$MS_HOME"/authorized_user_ids/"$uname"
-	userKeysCacheDir="$STAGING_AREA"/"$uname"/user_keys
+
+        # make sure user's authorized_user_ids file exists
+	touch "$AUTHORIZED_USER_IDS"
+
+	# process the user IDs
 	for userID ; do
-	    update_userid "$userID" "$userKeysCacheDir"
+	    remove_userid "$userID"
 	done
+
+	log "run the following to update user's authorized_keys file:"
+	log "$PGRM update-users $uname"
 	;;
 
     'help'|'h'|'?')
@@ -211,6 +237,6 @@ case $COMMAND in
 
     *)
         failure "Unknown command: '$COMMAND'
-Type 'cereal-admin help' for usage."
+Type '$PGRM help' for usage."
         ;;
 esac