fixing find_host_userid -- did this ever work?

[monkeysphere.git] / src / monkeysphere-host

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index a67715f3ae30fd60f92d9263c591ecc8082159ce..2bef23c51ee78f4fae544caeb1eaacdf6cb6c7ce 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -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
@@ -41,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
 ########################################################################
@@ -54,14 +52,15 @@ usage: $PGRM <subcommand> [options] [args]
 Monkeysphere host admin tool.
 
 subcommands:
- import-key (i) [NAME[:PORT]]        import existing ssh key to gpg
+ import-key (i) FILE NAME[:PORT]     import existing ssh key to gpg
  show-key (s)                        output all host key information
- set-expire (e) EXPIRE               set host key expiration
+ publish-key (p)                     publish host key to keyserver
+ 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
+ add-revoker (r+) KEYID|FILE         add a revoker to the host key
+ revoke-key                          generate and/or publish revocation
+                                     certificate for host key
 
  version (v)                         show version number
  help (h,?)                          this help
@@ -104,7 +103,7 @@ update_gpg_pub_file() {
 load_fingerprint() {
     if [ -f "$HOST_KEY_FILE" ] ; then
        HOST_FINGERPRINT=$( \
-           (FUBAR=$(mktemp -d) && export GNUPGHOME="$FUBAR" \
+           (FUBAR=$(msmktempdir) && export GNUPGHOME="$FUBAR" \
            && gpg --quiet --import \
            && gpg --quiet --list-keys --with-colons --with-fingerprint \
            && rm -rf "$FUBAR") <"$HOST_KEY_FILE" \
@@ -142,13 +141,13 @@ find_host_userid() {
     local tmpuidMatch
     local line
 
-    # match to only ultimately trusted user IDs
-    tmpuidMatch="u:$(echo $userID | gpg_escape)"
+    # match to only "unknown" user IDs (host has no need for ultimate trust)
+    tmpuidMatch="-:$(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: | \
+    line=$(gpg_host_list | egrep '^uid:' | cut -f2,10 -d: | \
        grep -n -x -F "$tmpuidMatch" 2>/dev/null)
 
     if [ "$line" ] ; then
@@ -162,6 +161,8 @@ find_host_userid() {
 # show info about the host key
 show_key() {
     local GNUPGHOME
+    local TMPSSH
+    local revokers
 
     # tmp gpghome dir
     export GNUPGHOME=$(msmktempdir)
@@ -174,7 +175,7 @@ show_key() {
 
     # create the ssh key
     TMPSSH="$GNUPGHOME"/ssh_host_key_rsa_pub
-    openpgp2ssh <"$HOST_KEY_FILE" 2>/dev/null >"$TMPSSH"
+    gpg --export | openpgp2ssh 2>/dev/null >"$TMPSSH"
 
     # get the gpg fingerprint
     HOST_FINGERPRINT=$(gpg --quiet --list-keys --with-colons --with-fingerprint \
@@ -188,6 +189,17 @@ show_key() {
        | grep -v "^${GNUPGHOME}/pubring.gpg$" \
        | egrep -v '^-+$'
 
+    # list revokers, if there are any
+    revokers=$(gpg --list-keys --with-colons --fixed-list-mode \
+       | 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
+
     # list the pgp fingerprint
     echo "OpenPGP fingerprint: $HOST_FINGERPRINT"
 
@@ -214,10 +226,12 @@ 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
 GNUPGHOME_HOST=${MONKEYSPHERE_GNUPGHOME_HOST:="${MHDATADIR}"}
+LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX:='ms: '}
 
 # export variables needed in su invocation
 export DATE
@@ -225,10 +239,12 @@ export LOG_LEVEL
 export KEYSERVER
 export CHECK_KEYSERVER
 export MONKEYSPHERE_USER
+export MONKEYSPHERE_GROUP
 export PROMPT
 export GNUPGHOME_HOST
 export GNUPGHOME
 export HOST_FINGERPRINT
+export LOG_PREFIX
 
 # get subcommand
 COMMAND="$1"
@@ -236,6 +252,12 @@ COMMAND="$1"
 shift
 
 case $COMMAND in
+    'import-key'|'i')
+       check_host_key
+       source "${MHSHAREDIR}/import_key"
+       import_key "$@"
+       ;;
+
     'show-key'|'show'|'s')
        check_host_no_key
        show_key
@@ -262,14 +284,14 @@ case $COMMAND in
        revoke_hostname "$@"
        ;;
 
-    'add-revoker'|'o')
+    'add-revoker'|'r+')
        check_host_no_key
        load_fingerprint
        source "${MHSHAREDIR}/add_revoker"
        add_revoker "$@"
        ;;
 
-    'revoke-key'|'r')
+    'revoke-key')
        check_host_no_key
        load_fingerprint
        source "${MHSHAREDIR}/revoke_key"
@@ -283,13 +305,8 @@ case $COMMAND in
        publish_key
        ;;
 
-    'import-key'|'i')
-       check_host_key
-       source "${MHSHAREDIR}/import_key"
-       import_key "$@"
-       ;;
-
     'diagnostics'|'d')
+       check_host_no_key
        load_fingerprint
        source "${MHSHAREDIR}/diagnostics"
        diagnostics
@@ -301,7 +318,7 @@ case $COMMAND in
        ;;
 
     'version'|'v')
-       echo "$VERSION"
+       version
        ;;
 
     '--help'|'help'|'-h'|'h'|'?')
@@ -313,5 +330,3 @@ case $COMMAND in
 Type '$PGRM help' for usage."
         ;;
 esac
-
-exit "$RETURN"