X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-server;h=560d249867d780183f9b070ed341c099bf948963;hb=b92675786ac883551528b3870c71c98066d60c0f;hp=e05b4b71c8253ac7d8c335705253f8a52c8433d2;hpb=28c7489bb830c8ef9bb7c6e40e3fc4d47a702614;p=monkeysphere.git

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index e05b4b7..560d249 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # monkeysphere-server: MonkeySphere server admin tool
 #
@@ -32,7 +32,7 @@ MonkeySphere server admin tool.
 
 subcommands:
   update-users (s) [USER]...            update users authorized_keys files
-  gen-key (g)                           generate gpg key for the server
+  gen-key (g) [HOSTNAME]                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 user IDs for a user
@@ -44,14 +44,26 @@ EOF
 
 # generate server gpg key
 gen_key() {
+    local hostName
+
+    hostName=${1:-$(hostname --fqdn)}
+
     # set key defaults
     KEY_TYPE=${KEY_TYPE:-"RSA"}
     KEY_LENGTH=${KEY_LENGTH:-"2048"}
     KEY_USAGE=${KEY_USAGE:-"auth,encrypt"}
-    SERVICE=${SERVICE:-"ssh"}
-    HOSTNAME_FQDN=${HOSTNAME_FQDN:-$(hostname -f)}
+    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? ($EXPIRE) " EXPIRE; EXPIRE=${EXPIRE:-"0"}
 
-    USERID=${USERID:-"$SERVICE"://"$HOSTNAME_FQDN"}
+    SERVICE=${SERVICE:-"ssh"}
+    USERID=${USERID:-"$SERVICE"://"$hostName"}
 
     # set key parameters
     keyParameters=$(cat <<EOF
@@ -59,6 +71,7 @@ Key-Type: $KEY_TYPE
 Key-Length: $KEY_LENGTH
 Key-Usage: $KEY_USAGE
 Name-Real: $USERID
+Expire-Date: $EXPIRE
 EOF
 )
 
@@ -91,8 +104,9 @@ EOF
 EOF
 )
 
-    log "generating server key..."
+    log -n "generating server key... "
     echo "$keyParameters" | gpg --batch --gen-key
+    loge "done."
 }
 
 ########################################################################
@@ -111,22 +125,27 @@ MS_CONF=${MS_CONF:-"$MS_HOME"/monkeysphere-server.conf}
 [ -e "$MS_CONF" ] && . "$MS_CONF"
 
 # set empty config variable with defaults
-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}
+GNUPGHOME=${GNUPGHOME:-"${MS_HOME}/gnupg"}
+KEYSERVER=${KEYSERVER:-"subkeys.pgp.net"}
+CHECK_KEYSERVER=${CHECK_KEYSERVER:="true"}
+REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
+USER_CONTROLLED_AUTHORIZED_KEYS=${USER_CONTROLLED_AUTHORIZED_KEYS:-"%h/.ssh/authorized_keys"}
 
 export GNUPGHOME
 
+# make sure the monkeysphere home directory exists
+mkdir -p "${MS_HOME}/authorized_user_ids"
 # make sure gpg home exists with proper permissions
 mkdir -p -m 0700 "$GNUPGHOME"
+# make sure the authorized_keys directory exists
+mkdir -p "${CACHE}/authorized_keys"
 
 case $COMMAND in
     'update-users'|'update-user'|'s')
 	if [ "$1" ] ; then
 	    unames="$@"
 	else
-	    unames=$(ls -1 "$MS_HOME"/authorized_user_ids)
+	    unames=$(ls -1 "${MS_HOME}/authorized_user_ids")
 	fi
 
 	for uname in $unames ; do
@@ -135,12 +154,14 @@ case $COMMAND in
 	    log "----- user: $uname -----"
 
 	    # set variables for the user
-	    AUTHORIZED_USER_IDS="$MS_HOME"/authorized_user_ids/"$uname"
-	    msAuthorizedKeys="$CACHE"/"$uname"/authorized_keys
-	    cacheDir="$CACHE"/"$uname"/user_keys
+	    AUTHORIZED_USER_IDS="${MS_HOME}/authorized_user_ids/${uname}"
+	    # temporary authorized_keys file
+	    AUTHORIZED_KEYS="${CACHE}/authorized_keys/${uname}.tmp"
 
             # make sure user's authorized_user_ids file exists
 	    touch "$AUTHORIZED_USER_IDS"
+	    # make sure the authorized_keys file exists and is clear
+	    > "$AUTHORIZED_KEYS"
 
 	    # skip if the user's authorized_user_ids file is empty
 	    if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then
@@ -148,21 +169,30 @@ case $COMMAND in
 		continue
 	    fi
 
-	    # set user-controlled authorized_keys file path
-	    if [ "$USER_CONTROLLED_AUTHORIZED_KEYS" ] ; then
+	    # process authorized_user_ids file
+	    log "processing authorized_user_ids file..."
+	    process_authorized_user_ids
+
+	    # add user-controlled authorized_keys file path if specified
+	    if [ "$USER_CONTROLLED_AUTHORIZED_KEYS" != '-' ] ; then
 		userHome=$(getent passwd "$uname" | cut -d: -f6)
 		userAuthorizedKeys=${USER_CONTROLLED_AUTHORIZED_KEYS/\%h/"$userHome"}
+		log -n "adding user's authorized_keys file... "
+		cat "$userAuthorizedKeys" >> "$AUTHORIZED_KEYS"
+		loge "done."
 	    fi
 
-	    # update authorized_keys
-	    update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$cacheDir"
+	    # move the temp authorized_keys file into place
+	    mv -f "${CACHE}/authorized_keys/${uname}.tmp" "${CACHE}/authorized_keys/${uname}"
+
+	    log "authorized_keys file updated."
 	done
 
 	log "----- done. -----"
 	;;
 
     'gen-key'|'g')
-	gen_key
+	gen_key "$1"
 	;;
 
     'publish-key'|'p')
@@ -171,7 +201,7 @@ case $COMMAND in
 
     'trust-keys'|'trust-key'|'t')
 	if [ -z "$1" ] ; then
-	    failure "you must specify at least one key to trust."
+	    failure "You must specify at least one key to trust."
 	fi
 
 	# process key IDs
@@ -184,25 +214,24 @@ case $COMMAND in
 	uname="$1"
 	shift
 	if [ -z "$uname" ] ; then
-	    failure "you must specify user."
+	    failure "You must specify user."
 	fi
 	if [ -z "$1" ] ; then
-	    failure "you must specify at least one userid."
+	    failure "You must specify at least one user ID."
 	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"
+	    update_userid "$userID"
 	done
 
-	log "run the following to update user's authorized_keys file:"
+	log "Run the following to update user's authorized_keys file:"
 	log "$PGRM update-users $uname"
 	;;
 
@@ -210,10 +239,10 @@ case $COMMAND in
 	uname="$1"
 	shift
 	if [ -z "$uname" ] ; then
-	    failure "you must specify user."
+	    failure "You must specify user."
 	fi
 	if [ -z "$1" ] ; then
-	    failure "you must specify at least one userid."
+	    failure "You must specify at least one user ID."
 	fi
 
 	# set variables for the user
@@ -227,7 +256,7 @@ case $COMMAND in
 	    remove_userid "$userID"
 	done
 
-	log "run the following to update user's authorized_keys file:"
+	log "Run the following to update user's authorized_keys file:"
 	log "$PGRM update-users $uname"
 	;;