summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-17 15:19:40 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-17 15:19:40 -0500
commita2a3d02d1aaf2d3dae3afea90c85cd6ca9f7ce4d (patch)
tree231a99a741c2e54e71504b1cb4fd8efcba3b0a65 /src
parent5eab477a9755178abf56eeba5f658db882611eec (diff)
add some checks about setup to authentication
Diffstat (limited to 'src')
-rwxr-xr-xsrc/monkeysphere-authentication13
-rw-r--r--src/share/ma/setup4
2 files changed, 16 insertions, 1 deletions
diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index 465777d..60cb5f2 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -95,6 +95,14 @@ core_fingerprint() {
| grep ^fpr: | cut -d: -f10
}
+# fail if authentication has not been setup
+check_no_setup() {
+ # FIXME: what is the right test to do here?
+ [ -d "$MADATADIR" ] \
+ || failure "This host appears to have not yet been set up for Monkeysphere authentication.
+Please run 'monkeysphere-authentication setup' first."
+}
+
# export signatures from core to sphere
gpg_core_sphere_sig_transfer() {
log debug "exporting core local sigs to sphere..."
@@ -155,21 +163,25 @@ case $COMMAND in
;;
'update-users'|'update-user'|'u')
+ check_no_setup
source "${MASHAREDIR}/update_users"
update_users "$@"
;;
'add-identity-certifier'|'add-id-certifier'|'add-certifier'|'c+')
+ check_no_setup
source "${MASHAREDIR}/add_certifier"
add_certifier "$@"
;;
'remove-identity-certifier'|'remove-id-certifier'|'remove-certifier'|'c-')
+ check_no_setup
source "${MASHAREDIR}/remove_certifier"
remove_certifier "$@"
;;
'list-identity-certifiers'|'list-id-certifiers'|'list-certifiers'|'list-certifier'|'c')
+ check_no_setup
source "${MASHAREDIR}/list_certifiers"
list_certifiers "$@"
;;
@@ -180,6 +192,7 @@ case $COMMAND in
;;
'gpg-cmd')
+ check_no_setup
gpg_sphere "$@"
;;
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 02fc069..f59187b 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -70,7 +70,7 @@ EOF
fi
else
- log verbose "This system has already set up the Monkeysphere authentication trust core."
+ log verbose "Monkeysphere authentication trust core already exists."
fi
# export the core key to the sphere keyring
@@ -91,6 +91,7 @@ EOF
fi
else
failure "Could not get monkeysphere-authentication trust guidelines."
+ # FIXME: what does this mean? should we suggest how to fix?
fi
# ensure that we're using the extended trust model (1), and that
@@ -102,5 +103,6 @@ EOF
log debug "sphere trust model: $TRUST_MODEL"
if [ "$TRUST_MODEL" != '1:3:1' ] ; then
failure "monkeysphere-authentication does not have the expected trust model settings."
+ # FIXME: what does this mean? should we suggest how to fix?
fi
}