X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fauthentication_plug.ex;h=6b8d51300c5d71b6a2bff9783a1d65e3532a8483;hb=2791ce9a1ff2365ac7256f5e1dc2324dee2f82c9;hp=d47c3fdae75e63deee1b7fda2e9693ac54e0f4d0;hpb=b403ea4d2b69cef4434ad68babdfb402d8227847;p=akkoma

diff --git a/lib/pleroma/plugs/authentication_plug.ex b/lib/pleroma/plugs/authentication_plug.ex
index d47c3fdae..6b8d51300 100644
--- a/lib/pleroma/plugs/authentication_plug.ex
+++ b/lib/pleroma/plugs/authentication_plug.ex
@@ -1,60 +1,39 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Plugs.AuthenticationPlug do
   alias Comeonin.Pbkdf2
   import Plug.Conn
+  alias Pleroma.User
 
   def init(options) do
     options
   end
 
-  def call(conn, opts) do
-    with {:ok, username, password} <- decode_header(conn),
-         {:ok, user} <- opts[:fetcher].(username),
-         saved_user_id <- get_session(conn, :user_id),
-         {:ok, verified_user} <- verify(user, password, saved_user_id)
-    do
-      conn
-      |> assign(:user, verified_user)
-      |> put_session(:user_id, verified_user.id)
-    else
-      _ -> conn |> halt_or_continue(opts)
-    end
-  end
-
-  # Short-circuit if we have a cookie with the id for the given user.
-  defp verify(%{id: id} = user, _password, id) do
-    {:ok, user}
-  end
-
-  defp verify(nil, _password, _user_id) do
-    Pbkdf2.dummy_checkpw
-    :error
-  end
+  def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
 
-  defp verify(user, password, _user_id) do
-    if Pbkdf2.checkpw(password, user.password_hash) do
-      {:ok, user}
+  def call(
+        %{
+          assigns: %{
+            auth_user: %{password_hash: password_hash} = auth_user,
+            auth_credentials: %{password: password}
+          }
+        } = conn,
+        _
+      ) do
+    if Pbkdf2.checkpw(password, password_hash) do
+      conn
+      |> assign(:user, auth_user)
     else
-      :error
-    end
-  end
-
-  defp decode_header(conn) do
-    with ["Basic " <> header] <- get_req_header(conn, "authorization"),
-         {:ok, userinfo} <- Base.decode64(header),
-         [username, password] <- String.split(userinfo, ":")
-    do
-      {:ok, username, password}
+      conn
     end
   end
 
-  defp halt_or_continue(conn, %{optional: true}) do
-    conn |> assign(:user, nil)
-  end
-
-  defp halt_or_continue(conn, _) do
+  def call(%{assigns: %{auth_credentials: %{password: _}}} = conn, _) do
+    Pbkdf2.dummy_checkpw()
     conn
-    |> put_resp_content_type("application/json")
-    |> send_resp(403, Poison.encode!(%{error: "Invalid credentials."}))
-    |> halt
   end
+
+  def call(conn, _), do: conn
 end