X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-host;h=fab3ef70e96ad5d22a23e2abcd4d69dc709d82fa;hb=7dbd6806e538ff8732dd87fcf20bfd8271464552;hp=4aab995950e89ed1323275431594023810503da8;hpb=c4f049f6a8dfd1e0e301a6abffafb5c0012ccc0e;p=monkeysphere.git

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 4aab995..fab3ef7 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -8,7 +8,7 @@
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 # Micah Anderson <micah@riseup.net>
 #
-# They are Copyright 2008-2009, and are all released under the GPL,
+# They are Copyright 2008-2010, and are all released under the GPL,
 # version 3 or later.
 
 ########################################################################
@@ -21,7 +21,8 @@ PGRM=$(basename $0)
 
 SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
 export SYSSHAREDIR
-. "${SYSSHAREDIR}/common" || exit 1
+. "${SYSSHAREDIR}/defaultenv"
+. "${SYSSHAREDIR}/common"
 
 SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
 export SYSDATADIR
@@ -33,8 +34,7 @@ MHSHAREDIR="${SYSSHAREDIR}/mh"
 MHDATADIR="${SYSDATADIR}/host"
 
 # host pub key files
-HOST_KEY_PUB="${SYSDATADIR}/ssh_host_rsa_key.pub"
-HOST_KEY_PUB_GPG="${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
+HOST_KEY_FILE="${SYSDATADIR}/host_keys.pub.pgp"
 
 # UTC date in ISO 8601 format if needed
 DATE=$(date -u '+%FT%T')
@@ -42,9 +42,6 @@ DATE=$(date -u '+%FT%T')
 # unset some environment variables that could screw things up
 unset GREP_OPTIONS
 
-# default return code
-RETURN=0
-
 ########################################################################
 # FUNCTIONS
 ########################################################################
@@ -55,291 +52,307 @@ usage: $PGRM <subcommand> [options] [args]
 Monkeysphere host admin tool.
 
 subcommands:
- show-key (s)                        output all host key information
- set-expire (e) EXPIRE               set host key expiration
- add-hostname (n+) NAME[:PORT]       add hostname user ID to host key
- revoke-hostname (n-) NAME[:PORT]    revoke hostname user ID
- add-revoker (o) FINGERPRINT         add a revoker to the host key
- revoke-key (r)                      revoke host key
- publish-key (p)                     publish host key to keyserver
-
- expert <expert-subcommand>          run expert command
- expert help                         expert command help
-
- version (v)                         show version number
- help (h,?)                          this help
-
+ import-key (i) FILE SERVICENAME       import PEM-encoded key from file
+ show-keys (s) [KEYID ...]             output host key information
+ publish-keys (p) [KEYID ...]          publish key(s) to keyserver
+ set-expire (e) EXPIRE [KEYID]         set key expiration
+ add-servicename (n+) SERVICENAME [KEYID]
+                                       add a service name to key
+ revoke-servicename (n-) SERVICENAME [KEYID]
+                                       revoke a service name from key
+ add-revoker (r+) REVOKER_KEYID|FILE [KEYID]
+                                       add a revoker to key
+ revoke-key [KEYID]                    generate and/or publish revocation
+                                       certificate for key
+
+ version (v)                           show version number
+ help (h,?)                            this help
+
+See ${PGRM}(8) for more info.
 EOF
 }
 
 # function to interact with the gpg keyring
 gpg_host() {
-    GNUPGHOME="$GNUPGHOME_HOST" gpg "$@"
+    GNUPGHOME="$GNUPGHOME_HOST" gpg --no-greeting --quiet --no-tty "$@"
 }
 
-# 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}!"
-
+# list the info about the a key, in colon format, to stdout
+gpg_host_list_keys() {
+    if [ "$1" ] ; then
+	gpg_host --list-keys --with-colons --fixed-list-mode \
+	    --with-fingerprint --with-fingerprint \
+	    "$1"
+    else
+	gpg_host --list-keys --with-colons --fixed-list-mode \
+	    --with-fingerprint --with-fingerprint
+    fi
 }
 
-# command for edit key scripts, takes scripts on stdin
+# edit key scripts, takes scripts on stdin, and keyID as first input
 gpg_host_edit() {
-    gpg_host --quiet --command-fd 0 --edit-key \
-	"0x${HOST_FINGERPRINT}!" "$@"
+    gpg_host --command-fd 0 --edit-key "$@"
 }
 
-# export the host key to stdout
-gpg_host_export() {
+# export the monkeysphere OpenPGP pub key file
+update_pgp_pub_file() {
+    log debug "updating openpgp public key file '$HOST_KEY_FILE'..."
     gpg_host --export --armor --export-options export-minimal \
-	"0x${HOST_FINGERPRINT}!"
+        $(gpg_host --list-secret-keys --with-colons --fingerprint | grep ^fpr | cut -f10 -d:) \
+        > "$HOST_KEY_FILE"
 }
 
-# export the host secret key to the monkeysphere ssh sec key file
-# NOTE: assumes that the primary key is the proper key to use
-create_ssh_sec_file() {
-    log debug "creating ssh secret key file..."
-    (umask 077 && \
-	gpg_host --export-secret-key "$HOST_FINGERPRINT" | \
-	openpgp2ssh "$HOST_FINGERPRINT" > "${MHDATADIR}/ssh_host_rsa_key")
-    log info "SSH host secret key file: ${MHDATADIR}/ssh_host_rsa_key"
+# check that the service name is well formed
+check_service_name() {
+    local name="$1"
+    log error "FIX ME: check service name"
 }
 
-# export the host public key to the monkeysphere ssh pub key file
-create_ssh_pub_file() {
-    log debug "creating ssh public key file..."
-    ssh-keygen -y -f "${MHDATADIR}/ssh_host_rsa_key" > "$HOST_KEY_PUB"
-    log info "SSH host public key file: $HOST_KEY_PUB"
-}
-
-# 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 > "$HOST_KEY_PUB_GPG"
-    log info "GPG host public key file: $HOST_KEY_PUB_GPG"
-}
-
-# load the host fingerprint into the fingerprint variable, using the
-# export gpg pub key file
-load_fingerprint() {
-    if [ -f "$HOST_KEY_PUB_GPG" ] ; 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_PUB_GPG" \
-	    | grep '^fpr:' | cut -d: -f10 )
-    else
-	HOST_FINGERPRINT=
-    fi
+# fail if host key not present
+check_no_keys() {
+    [ -s "$HOST_KEY_FILE" ] \
+	|| failure "You don't appear to have a Monkeysphere host key on this server.
+Please run 'monkeysphere-host import-key' import a key."
 }
 
-# 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 )
+# key input to functions, outputs full fingerprint of specified key if
+# found
+check_key_input() {
+    local keyID="$1"
+    # array of fingerprints
+    local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
+
+    case ${#fprs[@]} in
+	0)
+	    failure "You don't appear to have any Monkeysphere host keys.
+Please run 'monkeysphere-host import-key' to import a key."
+	    ;;
+	1)
+	    :
+	    ;;
+	*)
+	    if [ -z "$keyID" ] ; then
+		failure "Your host keyring contains multiple keys.
+Please specify one to act on (see 'monkeysphere-host show-keys')."
+	    fi
+	    ;;
+    esac
+    printf '%s\n' "${fprs[@]}" | grep "${keyID}$" \
+	|| failure "Host key '$keyID' not found."
 }
 
-# output host key ssh fingerprint
-load_ssh_fingerprint() {
-    [ -f "$HOST_KEY_PUB" ] || return 0
-    HOST_FINGERPRINT_SSH=$(ssh-keygen -l -f "$HOST_KEY_PUB" \
-	| awk '{ print $1, $2, $4 }')
-}
+# return 0 if user ID was found.
+# return 1 if user ID not found.
+check_key_userid() {
+    local keyID="$1"
+    local userID="$2"
+    local tmpuidMatch
 
-# fail if host key present
-check_host_key() {
-    [ -z "$HOST_FINGERPRINT" ] \
-	|| failure "An OpenPGP host key already exists."
-}
+    # match to only "unknown" user IDs (host has no need for ultimate trust)
+    tmpuidMatch="uid:-:$(echo $userID | gpg_escape)"
 
-# 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."
+    # See whether the requsted user ID is present
+    gpg_host_list_keys "$keyID" | cut -f1,2,10 -d: | \
+	grep -q -x -F "$tmpuidMatch" 2>/dev/null
 }
 
-# output the index of a user ID on the host key
-# return 1 if user ID not found
-find_host_userid() {
+prompt_userid_exists() {
     local userID="$1"
-    local tmpuidMatch
-    local line
+    local gpgOut
+    local fingerprint
+
+    if gpgOut=$(gpg_host_list_keys "=${userID}" 2>/dev/null) ; then
+	fingerprint=$(echo "$gpgOut" | grep '^fpr:' | cut -d: -f10)
+	if [ "$PROMPT" != "false" ] ; then
+	    printf "Service name '%s' is already being used by key '%s'.\nAre you sure you want to use it again? (y/N) " "$fingerprint" "$userID" >&2
+	    read OK; OK=${OK:=N}
+	    if [ "${OK/y/Y}" != 'Y' ] ; then
+		failure "Service name not added."
+	    fi
+	else
+	    log info "Key '%s' is already using the service name '%s'." "$fingerprint" "$userID" >&2
+	fi
+    fi
+}
 
-    # match to only ultimately trusted user IDs
-    tmpuidMatch="u:$(echo $userID | gpg_escape)"
+# run command looped over keys
+multi_key() {
+    local cmd="$1"
+    shift
+    local keys=$@
+    local i=0
+    local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
+    local key
 
-    # 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)
+    check_no_keys
 
-    if [ "$line" ] ; then
-	echo ${line%%:*}
-	return 0
-    else
-	return 1
+    if [[ -z "$1" || "$1" == '--all' ]] ; then
+	keys="${fprs[@]}"
     fi
+
+    for key in $keys ; do
+	if (( i++ > 0 )) ; then
+	    echo "##############################"
+	fi
+	eval "$cmd" "$key"
+    done
 }
 
-# show info about the host key
+# show info about the a key
 show_key() {
-    gpg_host --fingerprint --list-key --list-options show-unusable-uids \
-	"0x${HOST_FINGERPRINT}!" 2>/dev/null
-    # FIXME: make sure expiration date is shown
+    local id="$1"
+    local GNUPGHOME
+    local fingerprint
+    local tmpssh
+    local revokers
+
+    # tmp gpghome dir
+    export GNUPGHOME=$(msmktempdir)
+
+    # trap to remove tmp dir if break
+    trap "rm -rf $GNUPGHOME" EXIT
+
+    # import the host key into the tmp dir
+    gpg --quiet --import <"$HOST_KEY_FILE"
+
+    # get the gpg fingerprint
+    if gpg --quiet --list-keys \
+	--with-colons --with-fingerprint "$id" \
+	| grep '^fpr:' | cut -d: -f10 > "$GNUPGHOME"/fingerprint ; then
+	fingerprint=$(cat "$GNUPGHOME"/fingerprint)
+    else
+	failure "ID '$id' not found."
+    fi
 
-    echo "OpenPGP fingerprint: $HOST_FINGERPRINT"
+    # create the ssh key
+    tmpssh="$GNUPGHOME"/ssh_host_key_rsa_pub
+    gpg --export "$fingerprint" 2>/dev/null \
+	| openpgp2ssh 2>/dev/null >"$tmpssh"
+
+    # list the host key info
+    # FIXME: make no-show-keyring work so we don't have to do the grep'ing
+    # FIXME: can we show uid validity somehow?
+    gpg --list-keys --list-options show-unusable-uids "$fingerprint" 2>/dev/null \
+	| grep -v "^${GNUPGHOME}/pubring.gpg$" \
+	| egrep -v '^-+$'
+
+    # list revokers, if there are any
+    revokers=$(gpg --list-keys --with-colons --fixed-list-mode "$fingerprint" \
+	| awk -F: '/^rvk:/{ print $10 }' )
+    if [ "$revokers" ] ; then
+	echo "The following keys are allowed to revoke this host key:"
+	for key in $revokers ; do
+	    echo "revoker: $key"
+	done
+	echo
+    fi
 
-    load_ssh_fingerprint
+    # list the pgp fingerprint
+    echo "OpenPGP fingerprint: $fingerprint"
 
-    if [ "$HOST_FINGERPRINT_SSH" ] ; then
-	echo "ssh fingerprint: $HOST_FINGERPRINT_SSH"
-    else
-	log error "SSH host key not found."
-    fi
+    # list the ssh fingerprint
+    echo -n "ssh fingerprint: "
+    ssh-keygen -l -f "$tmpssh" | awk '{ print $1, $2, $4 }'
 
-    # FIXME: other relevant key parameters?
+    # remove the tmp file
+    trap - EXIT
+    rm -rf "$GNUPGHOME"
 }
 
 ########################################################################
 # MAIN
 ########################################################################
 
-# unset variables that should be defined only in config file
-unset KEYSERVER
-unset MONKEYSPHERE_USER
-
 # load configuration file
-[ -e ${MONKEYSPHERE_HOST_CONFIG:="${SYSCONFIGDIR}/monkeysphere-host.conf"} ] && . "$MONKEYSPHERE_HOST_CONFIG"
+[ -e ${MONKEYSPHERE_HOST_CONFIG:="${SYSCONFIGDIR}/monkeysphere-host.conf"} ] \
+    && . "$MONKEYSPHERE_HOST_CONFIG"
 
 # set empty config variable with ones from the environment, or with
 # defaults
-LOG_LEVEL=${MONKEYSPHERE_LOG_LEVEL:=${LOG_LEVEL:="INFO"}}
-KEYSERVER=${MONKEYSPHERE_KEYSERVER:=${KEYSERVER:="pool.sks-keyservers.net"}}
-AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:=${AUTHORIZED_USER_IDS:="%h/.monkeysphere/authorized_user_ids"}}
-RAW_AUTHORIZED_KEYS=${MONKEYSPHERE_RAW_AUTHORIZED_KEYS:=${RAW_AUTHORIZED_KEYS:="%h/.ssh/authorized_keys"}}
-MONKEYSPHERE_USER=${MONKEYSPHERE_MONKEYSPHERE_USER:=${MONKEYSPHERE_USER:="monkeysphere"}}
+LOG_LEVEL=${MONKEYSPHERE_LOG_LEVEL:=$LOG_LEVEL}
+KEYSERVER=${MONKEYSPHERE_KEYSERVER:=$KEYSERVER}
+CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$CHECK_KEYSERVER}
+MONKEYSPHERE_USER=${MONKEYSPHERE_MONKEYSPHERE_USER:=$MONKEYSPHERE_USER}
+MONKEYSPHERE_GROUP=$(get_primary_group "$MONKEYSPHERE_USER")
+PROMPT=${MONKEYSPHERE_PROMPT:=$PROMPT}
 
 # other variables
-CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:="true"}
 GNUPGHOME_HOST=${MONKEYSPHERE_GNUPGHOME_HOST:="${MHDATADIR}"}
+LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX:='ms: '}
 
 # export variables needed in su invocation
 export DATE
-export MODE
 export LOG_LEVEL
-export MONKEYSPHERE_USER
 export KEYSERVER
+export CHECK_KEYSERVER
+export MONKEYSPHERE_USER
+export MONKEYSPHERE_GROUP
+export PROMPT
 export GNUPGHOME_HOST
 export GNUPGHOME
-export HOST_FINGERPRINT=
-export HOST_FINGERPRINT_SSH=
+export HOST_FINGERPRINT
+export LOG_PREFIX
+
+if [ "$#" -eq 0 ] ; then 
+    usage
+    failure "Please supply a subcommand."
+fi
 
 # get subcommand
 COMMAND="$1"
-[ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
 shift
 
 case $COMMAND in
-    'show-key'|'show'|'s')
-	load_fingerprint
-	check_host_no_key
-	show_key
+    'import-key'|'i')
+	source "${MHSHAREDIR}/import_key"
+	import_key "$@"
+	;;
+
+    'show-keys'|'show-key'|'show'|'s')
+	multi_key show_key "$@"
 	;;
 
     'set-expire'|'extend-key'|'e')
-	load_fingerprint
-	check_host_no_key
 	source "${MHSHAREDIR}/set_expire"
 	set_expire "$@"
 	;;
 
-    'add-hostname'|'add-name'|'n+')
-	load_fingerprint
-	check_host_no_key
-	source "${MHSHAREDIR}/add_hostname"
-	add_hostname "$@"
+    'add-servicename'|'add-hostname'|'add-name'|'n+')
+	source "${MHSHAREDIR}/add_name"
+	add_name "$@"
 	;;
 
-    'revoke-hostname'|'revoke-name'|'n-')
-	load_fingerprint
-	check_host_no_key
-	source "${MHSHAREDIR}/revoke_hostname"
-	revoke_hostname "$@"
+    'revoke-servicename'|'revoke-hostname'|'revoke-name'|'n-')
+	source "${MHSHAREDIR}/revoke_name"
+	revoke_name "$@"
 	;;
 
-    'add-revoker'|'o')
-	load_fingerprint
-	check_host_no_key
+    'add-revoker'|'r+')
 	source "${MHSHAREDIR}/add_revoker"
 	add_revoker "$@"
 	;;
 
-    'revoke-key'|'r')
-	load_fingerprint
-	check_host_no_key
+    'revoke-key')
 	source "${MHSHAREDIR}/revoke_key"
 	revoke_key "$@"
 	;;
 
-    'publish-key'|'publish'|'p')
-	load_fingerprint
-	check_host_no_key
+    'publish-keys'|'publish-key'|'publish'|'p')
 	source "${MHSHAREDIR}/publish_key"
-	publish_key
+	multi_key publish_key "$@"
 	;;
 
-    'expert')
-	SUBCOMMAND="$1"
-	shift
-	case "$SUBCOMMAND" in
-	    'help'|'h'|'?')
-		cat <<EOF
-usage: $PGRM expert <subcommand> [options] [args]
-
-expert subcommands:
- import-key (i) [NAME[:PORT]]        import existing ssh key to gpg
- gen-key (g) [NAME[:PORT]]           generate gpg key for the host
-   --length (-l) BITS                  key length in bits (2048)
- diagnostics (d)                     monkeysphere host status
+    'diagnostics'|'d')
+	source "${MHSHAREDIR}/diagnostics"
+	diagnostics
+	;;
 
-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 "$@"
-		;;
-
-	    'diagnostics'|'d')
-		source "${MHSHAREDIR}/diagnostics"
-		diagnostics
-		;;
-
-	    *)
-		failure "Unknown expert subcommand: '$COMMAND'
-Type '$PGRM help' for usage."
-		;;
-	esac
+    'update-pgp-pub-file')
+	update_pgp_pub_file
 	;;
 
     'version'|'v')
-	echo "$VERSION"
+	version
 	;;
 
     '--help'|'help'|'-h'|'h'|'?')
@@ -348,8 +361,6 @@ Type '$PGRM help' for usage."
 
     *)
         failure "Unknown command: '$COMMAND'
-Type '$PGRM help' for usage."
+Try '$PGRM help' for usage."
         ;;
 esac
-
-exit "$RETURN"