Merge commit 'dkg/master'

3 files changed, 24 insertions, 0 deletions

diff --git a/tests/home/testuser/.ssh/askpass b/tests/home/testuser/.ssh/askpass
new file mode 100755
index 0000000..5b7b059
--- /dev/null
+++ b/tests/home/testuser/.ssh/askpass
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# phony/automatic askpass, to provide the passphrase for the
+# testuser's GPG key.
+
+echo abc123
diff --git a/tests/home/testuser/.ssh/config b/tests/home/testuser/.ssh/config
new file mode 100644
index 0000000..1da2344
--- /dev/null
+++ b/tests/home/testuser/.ssh/config
@@ -0,0 +1,10 @@
+# ssh config file for testuser for monkeysphere test suite.
+Host *
+PasswordAuthentication no
+KbdInteractiveAuthentication no
+RSAAuthentication no
+GSSAPIAuthentication no
+StrictHostKeyChecking yes
+LogLevel DEBUG
+
+# UserKnownHostsFile and ProxyCommand will be filled in dynamically.
diff --git a/tests/home/testuser/.ssh/proxy-command b/tests/home/testuser/.ssh/proxy-command
new file mode 100755
index 0000000..21c66fa
--- /dev/null
+++ b/tests/home/testuser/.ssh/proxy-command
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# simple socket-based proxy-command wrapper for testing monkeysphere.
+
+# pass this thing the host, the port, and the socket.
+
+monkeysphere-ssh-proxycommand --no-connect "$1" "$2" && \
+exec socat STDIO UNIX:"$3"