From a718b8d343f7b7de02be1a27a9f98a0ae52f0071 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 26 Oct 2008 00:58:33 -0400
Subject: [PATCH] testing: adding temporary monkeysphere config and ssh config.

---
 tests/basic                                         | 13 ++++++++++---
 tests/home/testuser/.monkeysphere/monkeysphere.conf |  3 +++
 tests/home/testuser/.ssh/config                     |  9 +++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 tests/home/testuser/.monkeysphere/monkeysphere.conf
 create mode 100644 tests/home/testuser/.ssh/config

diff --git a/tests/basic b/tests/basic
index b1f3493..2314684 100755
--- a/tests/basic
+++ b/tests/basic
@@ -67,6 +67,13 @@ echo "### copying admin and testuser homes..."
 cp -a "$TESTDIR"/home/admin "$TEMPDIR"/
 cp -a "$TESTDIR"/home/testuser "$TEMPDIR"/
 
+cat <<EOF > "$TEMPDIR"/testuser/.ssh/config
+UserKnownHosts $TEMPDIR/testuser/.ssh/known_hosts
+EOF
+
+cat <<EOF > "$TEMPDIR"/testuser/.monkeysphere/monkeysphere.conf
+KNOWN_HOSTS=$TEMPDIR/testuser/.ssh/known_hosts
+EOF
 
 
 ### SERVER TESTS
@@ -133,6 +140,6 @@ gpgadmin --armor --export "$HOSTKEYID" | \
 # the identity before connection.  This should work in both directions!
 echo "### testuser connecting to sshd socket..."
 PROXY_COMMAND="monkeysphere-ssh-proxycommand --no-connect %h && socat STDIO UNIX:${SOCKET}"
-GNUPGHOME="$TEMPDIR"/testuser/.gnupg ssh -v -v -v -oProxyCommand="$PROXY_COMMAND" testhost
-
-
+GNUPGHOME="$TEMPDIR"/testuser/.gnupg \
+MONKEYSPHERE_HOME="$TEMPDIR"/testuser/.monkeysphere \
+ ssh -F "$TEMPDIR"/testuser/.ssh/config -v -v -v -oProxyCommand="$PROXY_COMMAND" testhost
diff --git a/tests/home/testuser/.monkeysphere/monkeysphere.conf b/tests/home/testuser/.monkeysphere/monkeysphere.conf
new file mode 100644
index 0000000..59cc0cf
--- /dev/null
+++ b/tests/home/testuser/.monkeysphere/monkeysphere.conf
@@ -0,0 +1,3 @@
+# monkeysphere config for testuser in monkeysphere test suite
+
+# KNOWN_HOSTS will be dynamically defined after creation.
diff --git a/tests/home/testuser/.ssh/config b/tests/home/testuser/.ssh/config
new file mode 100644
index 0000000..566d1c0
--- /dev/null
+++ b/tests/home/testuser/.ssh/config
@@ -0,0 +1,9 @@
+# ssh config file for testuser for monkeysphere test suite.
+Host *
+PasswordAuthentication no
+KbdInteractiveAuthentication no
+RSAAuthentication no
+GSSAPIAuthentication no
+StrictHostKeyChecking yes
+
+# UserKnownHosts file will be filled in dynamically.
-- 
2.25.1