diff options
| -rwxr-xr-x | src/monkeysphere-authentication | 2 | ||||
| -rw-r--r-- | src/share/ma/setup | 14 | ||||
| -rw-r--r-- | src/share/mh/set_expire | 3 | ||||
| -rwxr-xr-x | tests/basic | 1 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication index a33de1e..18057e5 100755 --- a/src/monkeysphere-authentication +++ b/src/monkeysphere-authentication @@ -101,7 +101,7 @@ core_fingerprint() { gpg_core_sphere_sig_transfer() { log debug "exporting core local sigs to sphere..." gpg_core --export-options export-local-sigs --export | \ - gpg_sphere --import-options import-local-sigs --import + gpg_sphere "--import-options import-local-sigs --import" } ######################################################################## diff --git a/src/share/ma/setup b/src/share/ma/setup index 8032023..f989db6 100644 --- a/src/share/ma/setup +++ b/src/share/ma/setup @@ -23,7 +23,7 @@ setup() { # deliberately replace the config files via truncation # FIXME: should we be dumping to tmp files and then moving atomically? - log debug "write core gpg.conf..." + log debug "writing core gpg.conf..." cat >"${GNUPGHOME_CORE}"/gpg.conf <<EOF # Monkeysphere trust core GnuPG configuration # This file is maintained by the Monkeysphere software. @@ -32,7 +32,7 @@ no-greeting list-options show-uid-validity EOF - log debug "write sphere gpg.conf..." + log debug "writing sphere gpg.conf..." cat >"${GNUPGHOME_SPHERE}"/gpg.conf <<EOF # Monkeysphere trust sphere GnuPG configuration # This file is maintained by the Monkeysphere software. @@ -43,7 +43,7 @@ EOF # make sure the monkeysphere user owns everything in the sphere # gnupghome - log debug "fix sphere gnupg home ownership..." + log debuf "fixing sphere gnupg home ownership..." chown -R "$MONKEYSPHERE_USER" "${GNUPGHOME_SPHERE}" chgrp -R "$MONKEYSPHERE_USER" "${GNUPGHOME_SPHERE}" @@ -74,16 +74,16 @@ EOF fi # export the core key to the sphere keyring - log debug "export core pub key to sphere keyring..." + log debug "exporting core pub key to sphere keyring..." gpg_core --export | gpg_sphere --import # ensure that the authentication sphere checker has absolute ownertrust on the expected key. - log debug "set ultimate owner trust on core key in gpg_sphere..." + log debug "setting ultimate owner trust on core key in gpg_sphere..." printf "%s:6:\n" "$CORE_FPR" | gpg_sphere --import-ownertrust gpg_sphere --export-ownertrust | log debug # check the owner trust - log debug "check gpg_sphere owner trust set properly..." + log debug "checking gpg_sphere owner trust set properly..." local ORIG_TRUST if ORIG_TRUST=$(gpg_sphere --export-ownertrust | grep '^[^#]') ; then if [ "${CORE_FPR}:6:" != "$ORIG_TRUST" ] ; then @@ -97,7 +97,7 @@ EOF # our preferences are reasonable (i.e. 3 marginal OR 1 fully # trusted certifications are sufficient to grant full validity. log debug "checking trust model for authentication ..." - local TRUST_MODEL=$(gpg_sphere --with-colons --fixed-list-mode --list-keys \ + local TRUST_LEVEL=$(gpg_sphere "--with-colons --fixed-list-mode --list-keys" \ | head -n1 | grep "^tru:" | cut -d: -f3,6,7) log debug "sphere trust model: $TRUST_MODEL" if [ "$TRUST_MODEL" != '1:3:1' ] ; then diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire index 653149f..b03e0d0 100644 --- a/src/share/mh/set_expire +++ b/src/share/mh/set_expire @@ -21,6 +21,9 @@ local extendTo # get the new expiration date extendTo=$(get_gpg_expiration "$1") +log info "setting host key expiration to ${extendTo}:" + +log debug "executing host expire script..." gpg_host_edit expire <<EOF $extendTo save diff --git a/tests/basic b/tests/basic index 6ee4eea..9844454 100755 --- a/tests/basic +++ b/tests/basic @@ -174,7 +174,6 @@ monkeysphere-host expert import-key testhost < "$TEMPDIR"/ssh_host_rsa_key echo "##################################################" echo "### setting host key expiration..." monkeysphere-host set-expire 1 -monkeysphere-host show-key # FIXME: how do we check that the expiration has really been set? echo "##################################################" |