X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fmonkeysphere-host;h=64023e056c7ad6de9e6a1c5bf978d503010ecfbf;hb=0c874fdd6abfa4b74d7805f2d2d121f08211b4aa;hp=a6fa62fbd80dafcb4fb218b7b7d3e58b82a50cdb;hpb=be606510fb37cac8ca7eddadf719efb0598a2ed2;p=monkeysphere.git

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index a6fa62f..64023e0 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -14,6 +14,9 @@
 ########################################################################
 set -e
 
+# set the pipefail option so pipelines fail on first command failure
+set -o pipefail
+
 PGRM=$(basename $0)
 
 SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
@@ -29,6 +32,13 @@ MHSHAREDIR="${SYSSHAREDIR}/mh"
 # datadir for host functions
 MHDATADIR="${SYSDATADIR}/host"
 
+# temp directory for temp gnupghome directories for add_revoker
+MHTMPDIR="${MHDATADIR}/tmp"
+export MHTMPDIR
+
+# host pub key files
+HOST_KEY_FILE="${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
+
 # UTC date in ISO 8601 format if needed
 DATE=$(date -u '+%FT%T')
 
@@ -65,70 +75,110 @@ subcommands:
 EOF
 }
 
-# function to run command as monkeysphere user
-su_monkeysphere_user() {
-    # if the current user is the monkeysphere user, then just eval
-    # command
-    if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
-	eval "$@"
-
-    # otherwise su command as monkeysphere user
-    else
-	su "$MONKEYSPHERE_USER" -c "$@"
-    fi
-}
-
 # function to interact with the gpg keyring
 gpg_host() {
-    local returnCode
+    GNUPGHOME="$GNUPGHOME_HOST" gpg "$@"
+}
 
-    GNUPGHOME="$GNUPGHOME_HOST"
-    export GNUPGHOME
+# command to list the info about the host key, in colon format
+gpg_host_list() {
+    gpg_host --list-keys --with-colons --fixed-list-mode \
+	--with-fingerprint --with-fingerprint \
+	"0x${HOST_FINGERPRINT}!"
 
-    # NOTE: we supress this warning because we need the monkeysphere
-    # user to be able to read the host pubring.  we realize this might
-    # be problematic, but it's the simplest solution, without too much
-    # loss of security.
-    gpg "$@"
 }
 
-# output just key fingerprint
-fingerprint_host_key() {
-    # set the pipefail option so functions fails if can't read sec key
-    set -o pipefail
+# command for edit key scripts, takes scripts on stdin
+gpg_host_edit() {
+    gpg_host --quiet --command-fd 0 --edit-key \
+	"0x${HOST_FINGERPRINT}!" "$@"
+}
 
-    gpg_host --list-secret-keys --fingerprint \
-	--with-colons --fixed-list-mode 2> /dev/null | \
-	grep '^fpr:' | head -1 | cut -d: -f10 2>/dev/null
+# export the host public key to the monkeysphere gpg pub key file
+create_gpg_pub_file() {
+    log debug "creating openpgp public key file..."
+    gpg_host --export --armor --export-options export-minimal \
+	"0x${HOST_FINGERPRINT}!" > "$HOST_KEY_FILE"
+    log info "GPG host public key file: $HOST_KEY_FILE"
 }
 
-# function to check for host secret key
-check_host_keyring() {
-    fingerprint_host_key >/dev/null \
-	|| failure "You don't appear to have a Monkeysphere host key on this server.  Please run 'monkeysphere-host import-key' first."
+# load the host fingerprint into the fingerprint variable, using the
+# export gpg pub key file
+# FIXME: this seems much less than ideal, with all this temp keyring
+# stuff.  is there a way we can do this without having to create temp
+# files?
+load_fingerprint() {
+    if [ -f "$HOST_KEY_FILE" ] ; then
+	HOST_FINGERPRINT=$( \
+	    (FUBAR=$(mktemp -d) && export GNUPGHOME="$FUBAR" \
+	    && gpg --quiet --import \
+	    && gpg --quiet --list-keys --with-colons --with-fingerprint \
+	    && rm -rf "$FUBAR") <"$HOST_KEY_FILE" \
+	    | grep '^fpr:' | cut -d: -f10 )
+    else
+	HOST_FINGERPRINT=
+    fi
 }
 
-# show info about the host key
-show_key() {
-    local fingerprintPGP
-    local fingerprintSSH
+# load the host fingerprint into the fingerprint variable, using the
+# gpg host secret key
+load_fingerprint_secret() {
+    HOST_FINGERPRINT=$( \
+	gpg_host --quiet --list-secret-key \
+	--with-colons --with-fingerprint \
+	| grep '^fpr:' | cut -d: -f10 )
+}
 
-    # FIXME: you shouldn't have to be root to see the host key fingerprint
-    check_host_keyring
-    fingerprintPGP=$(fingerprint_host_key)
+# fail if host key present
+check_host_key() {
+    [ -z "$HOST_FINGERPRINT" ] \
+	|| failure "An OpenPGP host key already exists."
+}
 
-    gpg_host --fingerprint --list-key --list-options show-unusable-uids "0x${fingerprintPGP}!" 2>/dev/null
-    echo "OpenPGP fingerprint: $fingerprintPGP"
+# fail if host key not present
+check_host_no_key() {
+    [ "$HOST_FINGERPRINT" ] \
+	|| failure "You don't appear to have a Monkeysphere host key on this server.  Please run 'monkeysphere-host expert import-key' first."
+}
 
-    if [ -f "${MHDATADIR}/ssh_host_rsa_key.pub" ] ; then
-	fingerprintSSH=$(ssh-keygen -l -f "${MHDATADIR}/ssh_host_rsa_key.pub" | \
-	    awk '{ print $1, $2, $4 }')
-	echo "ssh fingerprint: $fingerprintSSH"
+# output the index of a user ID on the host key
+# return 1 if user ID not found
+find_host_userid() {
+    local userID="$1"
+    local tmpuidMatch
+    local line
+
+    # match to only ultimately trusted user IDs
+    tmpuidMatch="u:$(echo $userID | gpg_escape)"
+
+    # find the index of the requsted user ID
+    # NOTE: this is based on circumstantial evidence that the order of
+    # this output is the appropriate index
+    line=$(gpg_host_list | egrep '^(uid|uat):' | cut -f2,10 -d: | \
+	grep -n -x -F "$tmpuidMatch" 2>/dev/null)
+
+    if [ "$line" ] ; then
+	echo ${line%%:*}
+	return 0
     else
-	log info "SSH host key not found."
+	return 1
     fi
+}
+
+# show info about the host key
+show_key() {
+    gpg_host --fingerprint --list-key --list-options show-unusable-uids \
+	"0x${HOST_FINGERPRINT}!" 2>/dev/null || true
+    # FIXME: make sure expiration date is shown
+
+    echo "OpenPGP fingerprint: $HOST_FINGERPRINT"
+
+    echo -n "ssh fingerprint: "
+    ssh-keygen -l -f /dev/stdin \
+	<<<$( gpg_host --export FEE16FA3 2>/dev/null \
+	| openpgp2ssh 8445B5203A8443B4B04F637DD4DE66B2FEE16FA3 2>/dev/null) \
+	| awk '{ print $1, $2, $4 }'
 
-    # FIXME: show expiration date
     # FIXME: other relevant key parameters?
 }
 
@@ -163,6 +213,7 @@ export MONKEYSPHERE_USER
 export KEYSERVER
 export GNUPGHOME_HOST
 export GNUPGHOME
+export HOST_FINGERPRINT=
 
 # get subcommand
 COMMAND="$1"
@@ -171,48 +222,54 @@ shift
 
 case $COMMAND in
     'show-key'|'show'|'s')
-	check_host_keyring
+	load_fingerprint
+	check_host_no_key
 	show_key
 	;;
 
-    # FIXME: what should we call this command?
     'set-expire'|'extend-key'|'e')
-	check_host_keyring
-	source "${MHSHAREDIR}/extend_key"
-	extend_key "$@"
+	load_fingerprint
+	check_host_no_key
+	source "${MHSHAREDIR}/set_expire"
+	set_expire "$@"
 	;;
 
     'add-hostname'|'add-name'|'n+')
-	check_host_keyring
+	load_fingerprint
+	check_host_no_key
 	source "${MHSHAREDIR}/add_hostname"
 	add_hostname "$@"
 	;;
 
     'revoke-hostname'|'revoke-name'|'n-')
-	check_host_keyring
+	load_fingerprint
+	check_host_no_key
 	source "${MHSHAREDIR}/revoke_hostname"
 	revoke_hostname "$@"
 	;;
 
     'add-revoker'|'o')
-	check_host_keyring
+	load_fingerprint
+	check_host_no_key
 	source "${MHSHAREDIR}/add_revoker"
 	add_revoker "$@"
 	;;
 
     'revoke-key'|'r')
-	check_host_keyring
+	load_fingerprint
+	check_host_no_key
 	source "${MHSHAREDIR}/revoke_key"
 	revoke_key "$@"
 	;;
 
     'publish-key'|'publish'|'p')
-	check_host_keyring
+	load_fingerprint
+	check_host_no_key
 	source "${MHSHAREDIR}/publish_key"
 	publish_key
 	;;
 
-    'expert'|'e')
+    'expert')
 	SUBCOMMAND="$1"
 	shift
 	case "$SUBCOMMAND" in
@@ -230,11 +287,15 @@ EOF
 		;;
 
 	    'import-key'|'i')
+		load_fingerprint
+		check_host_key
 		source "${MHSHAREDIR}/import_key"
 		import_key "$@"
 		;;
 
 	    'gen-key'|'g')
+		load_fingerprint
+		check_host_key
 		source "${MHSHAREDIR}/gen_key"
 		gen_key "$@"
 		;;