fix some things bugs from the separation transition, and try to fix the test scripts

diff --git a/Makefile b/Makefile
index 0ec2030f9e1c5eca4c8aedcb2450da230eacd086..59b8887e1406a45ba59ef1e827c46913e36ce56e 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ tarball: clean
 
 debian-package: tarball
        tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
-       sed -i "s|__VERSION__|$(MONKEYSPHERE_VERSION)|g" monkeysphere-$(MONKEYSPHERE_VERSION)/src/common
+       sed -i "s|__VERSION__|$(MONKEYSPHERE_VERSION)|g" monkeysphere-$(MONKEYSPHERE_VERSION)/src/share/common
        cp -a packaging/debian monkeysphere-$(MONKEYSPHERE_VERSION)
        (cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us)
        rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 4c978c94809b3075056d5b9045b61b3b207a0629..0b37ba98e7ca3dcc6581bdf72e7a72ae87ed76fa 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -107,18 +107,12 @@ check_host_keyring() {
 show_key() {
     local fingerprintPGP
     local fingerprintSSH
-    local ret=0
 
     # FIXME: you shouldn't have to be root to see the host key fingerprint
-    if is_root ; then
-       check_host_keyring
-       fingerprintPGP=$(fingerprint_server_key)
-       gpg_authentication "--fingerprint --list-key --list-options show-unusable-uids $fingerprintPGP" 2>/dev/null
-       echo "OpenPGP fingerprint: $fingerprintPGP"
-    else
-       log info "You must be root to see host OpenPGP fingerprint."
-       ret='1'
-    fi
+    check_host_keyring
+    fingerprintPGP=$(fingerprint_server_key)
+    gpg_host "--fingerprint --list-key --list-options show-unusable-uids $fingerprintPGP" 2>/dev/null
+    echo "OpenPGP fingerprint: $fingerprintPGP"
 
     if [ -f "${SYSDATADIR}/ssh_host_rsa_key.pub" ] ; then
        fingerprintSSH=$(ssh-keygen -l -f "${SYSDATADIR}/ssh_host_rsa_key.pub" | \
@@ -126,10 +120,7 @@ show_key() {
        echo "ssh fingerprint: $fingerprintSSH"
     else
        log info "SSH host key not found."
-       ret='1'
     fi
-
-return $ret
 }
 
 ########################################################################

diff --git a/src/share/common b/src/share/common
index ef931ca4bc7a20282be621bfa533830c9cfef8bb..9adae05e894a5a8aedeca0d5bdd41f122b897a44 100644 (file)
--- a/src/share/common
+++ b/src/share/common
@@ -533,12 +533,6 @@ gpg_fetch_userid() {
        --search ="$userID" > /dev/null 2>&1
     returnCode="$?"
 
-    # if the user is the monkeysphere user, then update the
-    # monkeysphere user's trustdb
-    if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
-       gpg_authentication "--check-trustdb" > /dev/null 2>&1
-    fi
-
     return "$returnCode"
 }
 

diff --git a/src/share/mh/gen_key b/src/share/mh/gen_key
index aad213a3cbe272f2a9bc120d7451d99d607de3c3..162a64e17795ff4a4bfcf6a5c2ddba9cf667200b 100644 (file)
--- a/src/share/mh/gen_key
+++ b/src/share/mh/gen_key
@@ -85,10 +85,6 @@ echo "$keyParameters" | gpg_host --batch --gen-key
 # find the key fingerprint of the newly generated key
 fingerprint=$(fingerprint_server_key)
 
-# export host ownertrust to authentication keyring
-log verbose "setting ultimate owner trust for host key..."
-echo "${fingerprint}:6:" | gpg_authentication "--import-ownertrust"
-
 # translate the private key to ssh format, and export to a file
 # for sshs usage.
 # NOTE: assumes that the primary key is the proper key to use
@@ -98,7 +94,7 @@ echo "${fingerprint}:6:" | gpg_authentication "--import-ownertrust"
 log info "SSH host private key output to file: ${SYSDATADIR}/ssh_host_rsa_key"
 ssh-keygen -y -f "${SYSDATADIR}/ssh_host_rsa_key" > "${SYSDATADIR}/ssh_host_rsa_key.pub"
 log info "SSH host public key output to file: ${SYSDATADIR}/ssh_host_rsa_key.pub"
-gpg_authentication "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
+gpg_host "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
 log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
 
 # show info about new key

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 386e02d4556d2f89a2a63a1d4124cfa4aafd3603..c0d595620010e486587d68c377e290fbe828aaee 100644 (file)
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -77,10 +77,9 @@ fingerprint=$(fingerprint_server_key)
 # export host ownertrust to authentication keyring
 log verbose "setting ultimate owner trust for host key..."
 echo "${fingerprint}:6:" | gpg_host "--import-ownertrust"
-echo "${fingerprint}:6:" | gpg_authentication "--import-ownertrust"
 
 # export public key to file
-gpg_authentication "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
+gpg_host "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
 log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
 
 # show info about new key

diff --git a/tests/basic b/tests/basic
index b8ab4fcbc9463a9c9a952c29c56e50975332aee5..5006f8fa5cfb8c91de2b48f91ca6b1bdfcbb7a05 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -123,7 +123,7 @@ export PATH="$TESTDIR"/../src:"$TESTDIR"/../src/keytrans:"$PATH"
 
 export MONKEYSPHERE_SYSDATADIR="$TEMPDIR"
 export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR"
-export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src
+export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src/share
 export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami)
 export MONKEYSPHERE_CHECK_KEYSERVER=false
 export MONKEYSPHERE_LOG_LEVEL=DEBUG
@@ -168,15 +168,15 @@ HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
 AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authentication/authorized_keys/%u
 EOF
 
-# set up monkeysphere-server
-echo "### configuring monkeysphere..."
+# set up monkeysphere host
+echo "### configuring monkeysphere host..."
 mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/host
-mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authentication
-mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authentication/authorized_keys
-mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere
-mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/tmp
-cp etc/monkeysphere/monkeysphere-server.conf "$TEMPDIR"/monkeysphere-server.conf
-cat <<EOF >> "$TEMPDIR"/monkeysphere-server.conf
+
+# set up monkeysphere authentication
+echo "### configuring monkeysphere authentication..."
+mkdir -p -m 700 "$MONKEYSPHERE_SYSDATADIR"/authentication/{authorized_keys,core,sphere,tmp}
+cp etc/monkeysphere/monkeysphere-authentication.conf "$TEMPDIR"/
+cat <<EOF >> "$TEMPDIR"/monkeysphere-authentication.conf
 AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authentication/authorized_user_ids"
 EOF
 cat <<EOF > "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf

diff --git a/tests/etc/monkeysphere/monkeysphere-authentication.conf b/tests/etc/monkeysphere/monkeysphere-authentication.conf
new file mode 100644 (file)
index 0000000..9cc396f
--- /dev/null
+++ b/tests/etc/monkeysphere/monkeysphere-authentication.conf
@@ -0,0 +1,5 @@
+# Base monkeysphere-server.conf for monkeysphere tests
+
+# AUTHORIZED_USER_IDS variable will be added dynamically during test.
+
+RAW_AUTHORIZED_KEYS=none

diff --git a/tests/etc/monkeysphere/monkeysphere-server.conf b/tests/etc/monkeysphere/monkeysphere-server.conf
deleted file mode 100644 (file)
index 9cc396f..0000000
--- a/tests/etc/monkeysphere/monkeysphere-server.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Base monkeysphere-server.conf for monkeysphere tests
-
-# AUTHORIZED_USER_IDS variable will be added dynamically during test.
-
-RAW_AUTHORIZED_KEYS=none