diff options
author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-10-25 15:02:54 -0400 |
---|---|---|
committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-10-25 15:02:54 -0400 |
commit | 8473500c66d561b6b8a317d93199f5e653dd8980 (patch) | |
tree | 1dac8b29593be74e6074f4be6be54173f56bac09 /tests | |
parent | 2983d63efb6371cf7dc8815bfcdbefb42cadb1d3 (diff) | |
parent | bb75d35fb6705d8a75b88af30274703ca84d45f2 (diff) |
Merge commit 'dkg/master'
Conflicts:
tests/basic
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/basic | 5 | ||||
-rw-r--r-- | tests/etc/ssh/sshd_config | 21 |
2 files changed, 25 insertions, 1 deletions
diff --git a/tests/basic b/tests/basic index d73e162..3f94856 100755 --- a/tests/basic +++ b/tests/basic @@ -91,9 +91,12 @@ gpgadmin --sign-key "$HOSTKEYID" echo "### adding admin as certifier..." monkeysphere-server add-identity-certifier "$TESTDIR"/home/admin/.gnupg/pubkey.gpg +# initialize base sshd_config +cp etc/ssh/sshd_config "$TEMPDIR"/sshd_config # write the sshd_config -cat <<EOF > "$SSHD_CONFIG" +cat <<EOF >> "$SSHD_CONFIG" HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key +AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u EOF # launch test sshd with the new host key. diff --git a/tests/etc/ssh/sshd_config b/tests/etc/ssh/sshd_config new file mode 100644 index 0000000..75f0314 --- /dev/null +++ b/tests/etc/ssh/sshd_config @@ -0,0 +1,21 @@ +# Base sshd_config for monkeysphere test + +# HostKey and AuthorizedKeysFile lines will be added dynamically +# during test. + +# goal: minimal ssh configuration to do public key authentication. + +Protocol 2 +PubkeyAuthentication yes +HostbasedAuthentication no +PermitEmptyPasswords no +ChallengeResponseAuthentication no +PasswordAuthentication no +KerberosAuthentication no +GSSAPIAuthentication no +X11Forwarding no +PrintMotd no +PrintLastLog no +TCPKeepAlive no +AcceptEnv LANG LC_* +UsePAM no |