More work on priviledge separation for host/authentication keyring.

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index 1368a802dc6a4562f94cf986d71973a7067e6be3..ab42665f2d25c66af8ffa9a27bb7da6a2b6067ec 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -13,7 +13,7 @@ PGRM=$(basename $0)
 
 SHAREDIR=${SHAREDIR:-"/usr/share/monkeysphere"}
 export SHAREDIR
-. "${SHAREDIR}/common"
+. "${SHAREDIR}/common" || exit 1
 
 GLOBAL_CONFIG=${GLOBAL_CONFIG:-"${ETC}/monkeysphere.conf"}
 [ -r "$GLOBAL_CONFIG" ] && . "$GLOBAL_CONFIG"
@@ -26,7 +26,6 @@ GREP_OPTIONS=
 
 # default return code
 ERR=0
-export ERR
 
 ########################################################################
 # FUNCTIONS
@@ -129,15 +128,17 @@ MS_CONF=${MS_CONF:-"${MS_HOME}/monkeysphere.conf"}
 [ -e "$MS_CONF" ] && . "$MS_CONF"
 
 # set empty config variable with defaults
-AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"${MS_HOME}/authorized_user_ids"}
 GNUPGHOME=${GNUPGHOME:-"${HOME}/.gnupg"}
 KEYSERVER=${KEYSERVER:-"subkeys.pgp.net"}
 CHECK_KEYSERVER=${CHECK_KEYSERVER:="true"}
-REQUIRED_HOST_KEY_CAPABILITY=${REQUIRED_HOST_KEY_CAPABILITY:-"a"}
-REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
 KNOWN_HOSTS=${KNOWN_HOSTS:-"${HOME}/.ssh/known_hosts"}
-AUTHORIZED_KEYS=${AUTHORIZED_KEYS:-"${HOME}/.ssh/authorized_keys"}
 HASH_KNOWN_HOSTS=${HASH_KNOWN_HOSTS:-"true"}
+AUTHORIZED_KEYS=${AUTHORIZED_KEYS:-"${HOME}/.ssh/authorized_keys"}
+
+# other variables
+AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"${MS_HOME}/authorized_user_ids"}
+REQUIRED_HOST_KEY_CAPABILITY=${REQUIRED_HOST_KEY_CAPABILITY:-"a"}
+REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
 
 export GNUPGHOME
 
@@ -147,7 +148,6 @@ mkdir -p -m 0700 "$GNUPGHOME"
 # make sure the user monkeysphere home directory exists
 mkdir -p -m 0700 "$MS_HOME"
 touch "$AUTHORIZED_USER_IDS"
-touch "$AUTHORIZED_KEYS"
 
 case $COMMAND in
     'update-known_hosts'|'update-known-hosts'|'k')
@@ -160,7 +160,8 @@ case $COMMAND in
         # if hosts are specified on the command line, process just
         # those hosts
        if [ "$1" ] ; then
-           update_known_hosts "$@" || ERR=1
+           update_known_hosts "$@"
+           ERR="$?"
 
         # otherwise, if no hosts are specified, process every host
         # in the user's known_hosts file
@@ -168,11 +169,10 @@ case $COMMAND in
            if [ ! -s "$KNOWN_HOSTS" ] ; then
                failure "known_hosts file '$KNOWN_HOSTS' is empty."
            fi
-           log "processing known_hosts file..."
-           process_known_hosts || ERR=1
-       fi
 
-       log "known_hosts file updated."
+           process_known_hosts
+           ERR="$?"
+       fi
        ;;
 
     'update-authorized_keys'|'update-authorized-keys'|'a')
@@ -184,9 +184,8 @@ case $COMMAND in
        fi
 
        # process authorized_user_ids file
-       log "processing authorized_user_ids file..."
-       process_authorized_user_ids "$AUTHORIZED_USER_IDS" || ERR=1
-       log "authorized_keys file updated."
+       process_authorized_user_ids "$AUTHORIZED_USER_IDS"
+       ERR="$?"
        ;;
 
     'gen-subkey'|'g')