X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-server;h=369555cd64387aebc4e18c7a0abcafd926b214d8;hb=c6ba2bb28cf594f2a613b989fe7cd71d9550633a;hp=693c062d5554fd858a8671e1fb303536d86a6f4c;hpb=f659da8ba2e184a9eb60da2d65c1e81c33f06772;p=monkeysphere.git

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 693c062..369555c 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -21,6 +21,9 @@ DATE=$(date -u '+%FT%T')
 # unset some environment variables that could screw things up
 GREP_OPTIONS=
 
+# default return code
+ERR=0
+
 ########################################################################
 # FUNCTIONS
 ########################################################################
@@ -31,11 +34,11 @@ usage: $PGRM <subcommand> [args]
 MonkeySphere server admin tool.
 
 subcommands:
-  update-users (s) [USER]...            update users authorized_keys files
+  update-users (u) [USER]...            update users authorized_keys files
   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
+  publish-key (p)                       publish server's host key to keyserver
+  trust-key (t) KEYID [LEVEL]           set owner trust for keyid
   help (h,?)                            this help
 
 EOF
@@ -46,11 +49,18 @@ gen_key() {
     local hostName
 
     hostName=${1:-$(hostname --fqdn)}
+    service=${SERVICE:-"ssh"}
+    userID="${service}://${hostName}"
+
+    if gpg --list-key ="$userID" > /dev/null 2>&1 ; then
+	failure "Key for '$userID' already exists"
+    fi
 
     # set key defaults
     KEY_TYPE=${KEY_TYPE:-"RSA"}
     KEY_LENGTH=${KEY_LENGTH:-"2048"}
     KEY_USAGE=${KEY_USAGE:-"auth"}
+    KEY_EXPIRE=${KEY_EXPIRE:-"0"}
     cat <<EOF
 Please specify how long the key should be valid.
          0 = key does not expire
@@ -59,25 +69,22 @@ Please specify how long the key should be valid.
       <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"}
-
-    SERVICE=${SERVICE:-"ssh"}
-    USERID=${USERID:-"$SERVICE"://"$hostName"}
+    read -p "Key is valid for? ($KEY_EXPIRE) " KEY_EXPIRE; KEY_EXPIRE=${KEY_EXPIRE:-"0"}
 
     # set key parameters
     keyParameters=$(cat <<EOF
 Key-Type: $KEY_TYPE
 Key-Length: $KEY_LENGTH
 Key-Usage: $KEY_USAGE
-Name-Real: $USERID
-Expire-Date: $EXPIRE
+Name-Real: $userID
+Expire-Date: $KEY_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?
+    # 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
 
@@ -89,15 +96,11 @@ EOF
     echo "The following key parameters will be used:"
     echo "$keyParameters"
 
-    read -p "generate key? [Y|n]: " OK; OK=${OK:=Y}
+    read -p "Generate key? [Y|n]: " OK; OK=${OK:=Y}
     if [ ${OK/y/Y} != 'Y' ] ; then
 	failure "aborting."
     fi
 
-    if gpg --list-key ="$USERID" > /dev/null 2>&1 ; then
-	failure "key for '$USERID' already exists"
-    fi
-
     # add commit command
     keyParameters="${keyParameters}"$(cat <<EOF
 
@@ -106,14 +109,33 @@ EOF
 EOF
 )
 
-    log -n "generating server key... "
+    log "generating server key... "
     echo "$keyParameters" | gpg --batch --gen-key
-    loge "done."
-    fingerprint_server_key
+
+    # output the server fingerprint
+    fingerprint_server_key "=${userID}"
+
+    # find the key fingerprint of the server primary key
+    keyID=$(gpg --list-key --with-colons --with-fingerprint "=${userID}" | \
+	grep '^fpr:' | head -1 | cut -d: -f10)
+
+    # write the key to the file
+    # NOTE: assumes that the primary key is the proper key to use
+    (umask 077 && gpgsecret2ssh "$keyID" > "${MS_HOME}/ssh_host_rsa_key")
+    log "Private SSH host key output to file: ${MS_HOME}/ssh_host_rsa_key"
 }
 
+# gpg output key fingerprint
 fingerprint_server_key() {
-    gpg --fingerprint --list-secret-keys =ssh://$(hostname --fqdn)
+    local ID
+
+    if [ -z "$1" ] ; then
+	ID="$1"
+    else
+	ID="=ssh://$(hostname --fqdn)"
+    fi
+
+    gpg --fingerprint --list-secret-keys "$ID"
 }
 
 ########################################################################
@@ -149,7 +171,7 @@ mkdir -p -m 0700 "$GNUPGHOME"
 mkdir -p "${CACHE}/authorized_keys"
 
 case $COMMAND in
-    'update-users'|'update-user'|'s')
+    'update-users'|'update-user'|'u')
 	if [ "$1" ] ; then
 	    # get users from command line
 	    unames="$@"
@@ -174,6 +196,9 @@ case $COMMAND in
 
 	    # skip user if authorized_user_ids file does not exist
 	    if [ ! -f "$authorizedUserIDs" ] ; then
+		#FIXME: what about a user with no authorized_user_ids
+		# file, but with an authorized_keys file when
+		# USER_CONTROLLED_AUTHORIZED_KEYS is set?
 		continue
 	    fi
 
@@ -185,6 +210,10 @@ case $COMMAND in
 	    # skip if the user's authorized_user_ids file is empty
 	    if [ ! -s "$authorizedUserIDs" ] ; then
 		log "authorized_user_ids file '$authorizedUserIDs' is empty."
+		#FIXME: what about a user with an empty
+		# authorized_user_ids file, but with an
+		# authorized_keys file when
+		# USER_CONTROLLED_AUTHORIZED_KEYS is set?
 		continue
 	    fi
 
@@ -202,6 +231,13 @@ case $COMMAND in
 		fi
 	    fi
 
+            # openssh appears to check the contents of the
+            # authorized_keys file as the user in question, so the file
+            # must be readable by that user at least.
+            # FIXME: is there a better way to do this?
+            chgrp $(getent passwd "$uname" | cut -f4 -d:) "$AUTHORIZED_KEYS"
+            chmod g+r "$AUTHORIZED_KEYS"
+
 	    # move the temp authorized_keys file into place
 	    mv -f "$AUTHORIZED_KEYS" "${CACHE}/authorized_keys/${uname}"
 
@@ -214,22 +250,15 @@ case $COMMAND in
 	;;
 
     'show-fingerprint'|'f')
-	fingerprint_server_key
+	fingerprint_server_key "$@"
 	;;
 
     'publish-key'|'p')
 	publish_server_key
 	;;
 
-    '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
+    'trust-key'|'trust-key'|'t')
+	trust_key "$@"
 	;;
 
     'help'|'h'|'?')