3 files changed, 92 insertions, 24 deletions
diff --git a/test/auth/password_test.exs b/test/auth/password_test.exs
index 1516bdf..5e1b1d8 100644
--- a/test/auth/password_test.exs
+++ b/test/auth/password_test.exs
@@ -14,13 +14,13 @@ defmodule Chessh.Auth.PasswordAuthenticatorTest do
 
   test "Password can authenticate a hashed password" do
     assert Chessh.Auth.PasswordAuthenticator.authenticate(
-             String.to_charlist(@valid_user.username),
-             String.to_charlist(@valid_user.password)
+             @valid_user.username,
+             @valid_user.password
            )
 
     refute Chessh.Auth.PasswordAuthenticator.authenticate(
-             String.to_charlist(@valid_user.username),
-             String.to_charlist("a_bad_password")
+             @valid_user.username,
+             "a_bad_password"
            )
   end
 end
diff --git a/test/ssh/ssh_auth_test-emacs-elixir-format.exs b/test/ssh/ssh_auth_test-emacs-elixir-format.exs
new file mode 100644
index 0000000..cb07259
--- /dev/null
+++ b/test/ssh/ssh_auth_test-emacs-elixir-format.exs
@@ -0,0 +1,81 @@
+defmodule Chessh.SSH.AuthTest do
+  use ExUnit.Case
+  alias Chessh.{Player, Repo, Key}
+
+  @localhost '127.0.0.1'
+  @key_name "The Gamer Machine"
+  @valid_user %{username: "logan", password: "password"}
+  @client_test_keys_dir Path.join(Application.compile_env!(:chessh, :key_dir), "client_keys")
+  @client_pub_key 'id_ed25519.pub'
+
+  setup_all do
+    case Ecto.Adapters.SQL.Sandbox.checkout(Repo) do
+      :ok -> nil
+      {:already, :owner} -> nil
+    end
+
+    Ecto.Adapters.SQL.Sandbox.mode(Repo, {:shared, self()})
+
+    {:ok, player} = Repo.insert(Player.registration_changeset(%Player{}, @valid_user))
+
+    {:ok, key_text} = File.read(Path.join(@client_test_keys_dir, @client_pub_key))
+
+    {:ok, _key} =
+      Repo.insert(
+        Key.changeset(%Key{}, %{key: key_text, name: @key_name})
+        |> Ecto.Changeset.put_assoc(:player, player)
+      )
+
+    :ok
+  end
+
+  test "Password attempts are rate limited" do
+    assert :disconnect ==
+             Enum.reduce(
+               1..Application.fetch_env!(:chessh, RateLimits, :jail_threshold),
+               fn _, _ ->
+                 Chessh.SSH.Daemon.pwd_authenticate(
+                        @valid_user.username,
+                        'wrong_password',
+                        @localhost
+                      ) do
+               end
+             )
+  end
+
+  test "INTEGRATION - Can ssh into daemon with password or public key" do
+    {:ok, sup} = Task.Supervisor.start_link()
+    test_pid = self()
+
+    Task.Supervisor.start_child(sup, fn ->
+      {:ok, _pid} =
+        :ssh.connect(@localhost, Application.fetch_env!(:chessh, :port),
+          user: String.to_charlist(@valid_user.username),
+          password: String.to_charlist(@valid_user.password),
+          auth_methods: 'password',
+          silently_accept_hosts: true
+        )
+
+      send(test_pid, :connected_via_password)
+    end)
+
+    Task.Supervisor.start_child(sup, fn ->
+      {:ok, _pid} =
+        :ssh.connect(@localhost, Application.fetch_env!(:chessh, :port),
+          user: String.to_charlist(@valid_user.username),
+          auth_methods: 'publickey',
+          silently_accept_hosts: true,
+          user_dir: String.to_charlist(@client_test_keys_dir)
+        )
+
+      send(test_pid, :connected_via_public_key)
+    end)
+
+    assert_receive(:connected_via_password, 500)
+    assert_receive(:connected_via_public_key, 500)
+  end
+
+  test "INTEGRATION - User cannot have more than specified concurrent sessions" do
+    :ok
+  end
+end
diff --git a/test/ssh/ssh_auth_test.exs b/test/ssh/ssh_auth_test.exs
index c3ced20..cb07259 100644
--- a/test/ssh/ssh_auth_test.exs
+++ b/test/ssh/ssh_auth_test.exs
@@ -29,26 +29,21 @@ defmodule Chessh.SSH.AuthTest do
     :ok
   end
 
-  test "Fails to authenticate after configured max password attempt" do
+  test "Password attempts are rate limited" do
     assert :disconnect ==
              Enum.reduce(
-               1..Application.fetch_env!(:chessh, :max_password_attempts),
-               %{attempts: 0},
-               fn acc, _ ->
-                 case Chessh.SSH.Daemon.pwd_authenticate(
+               1..Application.fetch_env!(:chessh, RateLimits, :jail_threshold),
+               fn _, _ ->
+                 Chessh.SSH.Daemon.pwd_authenticate(
                         @valid_user.username,
                         'wrong_password',
-                        @localhost,
-                        acc
+                        @localhost
                       ) do
-                   {false, state} -> state
-                   x -> x
-                 end
                end
              )
   end
 
-  test "INTEGRATION TEST - Can ssh into daemon with password or public key" do
+  test "INTEGRATION - Can ssh into daemon with password or public key" do
     {:ok, sup} = Task.Supervisor.start_link()
     test_pid = self()
 
@@ -80,15 +75,7 @@ defmodule Chessh.SSH.AuthTest do
     assert_receive(:connected_via_public_key, 500)
   end
 
-  test "Hosts are rate limited via password attempts" do
-    :ok
-  end
-
-  test "Hosts are also rate limited with public keys" do
-    :ok
-  end
-
-  test "User cannot have more than one current session" do
+  test "INTEGRATION - User cannot have more than specified concurrent sessions" do
     :ok
   end
 end