X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-server;h=154c1462915739110f2af49269d05b43caa6ed11;hb=1fa2912aac2636bc6a4d8eda089c0e285f88d141;hp=58eafaa05c3bd21a3d9c8fd4a4edb774425b4347;hpb=5ff6e131ad52ce4de7172e56170ea4f37e397a9e;p=monkeysphere.git

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 58eafaa..154c146 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -32,11 +32,10 @@ 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
+  show-fingerprint (f)                  show server's host key fingerprint
   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
-  remove-user-userids (r) USER UID...   remove user IDs for a user
   help (h,?)                            this help
 
 EOF
@@ -44,14 +43,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)}
+    KEY_USAGE=${KEY_USAGE:-"auth"}
+    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,10 +70,14 @@ Key-Type: $KEY_TYPE
 Key-Length: $KEY_LENGTH
 Key-Usage: $KEY_USAGE
 Name-Real: $USERID
+Expire-Date: $EXPIRE
 EOF
 )
 
     # add the revoker field if requested
+# FIXME: the 1: below assumes that $REVOKER's key is an RSA key.  why?
+# FIXME: why is this marked "sensitive"?  how will this signature ever
+# be transmitted to the expected revoker?
     if [ "$REVOKER" ] ; then
 	keyParameters="${keyParameters}"$(cat <<EOF
 
@@ -91,8 +106,14 @@ EOF
 EOF
 )
 
-    log "generating server key..."
+    log -n "generating server key... "
     echo "$keyParameters" | gpg --batch --gen-key
+    loge "done."
+    fingerprint_server_key
+}
+
+fingerprint_server_key() {
+    gpg --fingerprint --list-secret-keys =ssh://$(hostname --fqdn)
 }
 
 ########################################################################
@@ -111,58 +132,85 @@ 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}
+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}
+AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"%h/.config/monkeysphere/authorized_user_ids"}
+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
+	    # get users from command line
 	    unames="$@"
 	else
-	    unames=$(ls -1 "$MS_HOME"/authorized_user_ids)
+	    # or just look at all users if none specified
+	    unames=$(getent passwd | cut -d: -f1)
 	fi
 
+	# loop over users
 	for uname in $unames ; do
 	    MODE="authorized_keys"
 
-	    log "----- user: $uname -----"
+	    # set authorized_user_ids variable,
+	    # translate ssh-style path variables
+	    authorizedUserIDs=$(translate_ssh_variables "$uname" "$AUTHORIZED_USER_IDS")
+
+	    # skip user if authorized_user_ids file does not exist
+	    if [ ! -f "$authorizedUserIDs" ] ; then
+		continue
+	    fi
 
-	    # set variables for the user
-	    AUTHORIZED_USER_IDS="$MS_HOME"/authorized_user_ids/"$uname"
-	    msAuthorizedKeys="$CACHE"/"$uname"/authorized_keys
-	    cacheDir="$CACHE"/"$uname"/user_keys
+	    log "----- user: $uname -----"
 
-            # make sure user's authorized_user_ids file exists
-	    touch "$AUTHORIZED_USER_IDS"
+	    # temporary authorized_keys file
+	    AUTHORIZED_KEYS=$(mktemp)
 
 	    # 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."
+	    if [ ! -s "$authorizedUserIDs" ] ; then
+		log "authorized_user_ids file '$authorizedUserIDs' is empty."
 		continue
 	    fi
 
-	    # set user-controlled authorized_keys file path
-	    if [ "$USER_CONTROLLED_AUTHORIZED_KEYS" ] ; then
-		userHome=$(getent passwd "$uname" | cut -d: -f6)
-		userAuthorizedKeys=${USER_CONTROLLED_AUTHORIZED_KEYS/\%h/"$userHome"}
+	    # process authorized_user_ids file
+	    log "processing authorized_user_ids file..."
+	    process_authorized_user_ids "$authorizedUserIDs"
+
+	    # add user-controlled authorized_keys file path if specified
+	    if [ "$USER_CONTROLLED_AUTHORIZED_KEYS" != '-' ] ; then
+		userAuthorizedKeys=$(translate_ssh_variables "$uname" "$USER_CONTROLLED_AUTHORIZED_KEYS")
+		if [ -f "$userAuthorizedKeys" ] ; then
+		    log -n "adding user's authorized_keys file... "
+		    cat "$userAuthorizedKeys" >> "$AUTHORIZED_KEYS"
+		    loge "done."
+		fi
 	    fi
 
-	    # update authorized_keys
-	    update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$cacheDir"
+	    # move the temp authorized_keys file into place
+	    mv -f "$AUTHORIZED_KEYS" "${CACHE}/authorized_keys/${uname}"
+
+	    log "authorized_keys file updated."
 	done
 
 	log "----- done. -----"
 	;;
 
     'gen-key'|'g')
-	gen_key
+	gen_key "$1"
+	;;
+
+    'show-fingerprint'|'f')
+	fingerprint_server_key
 	;;
 
     'publish-key'|'p')
@@ -171,7 +219,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
@@ -180,57 +228,6 @@ case $COMMAND in
 	done
 	;;
 
-    '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
-	    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"
-
-        # make sure user's authorized_user_ids file exists
-	touch "$AUTHORIZED_USER_IDS"
-
-	# process the user IDs
-	for userID ; do
-	    remove_userid "$userID"
-	done
-
-	log "run the following to update user's authorized_keys file:"
-	log "$PGRM update-users $uname"
-	;;
-
     'help'|'h'|'?')
         usage
         ;;