X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fauthentication_plug.ex;h=86a514541025083c33adec55dda58bb48d0c29f6;hb=bf9d3d4abaecc4e842c38866f039ebd8f5f96948;hp=90bd07b911bcca4dcb36872120b500fafcc0f562;hpb=142e8f8f3eea4915ea7d52123384c3d43454c098;p=akkoma

diff --git a/lib/pleroma/plugs/authentication_plug.ex b/lib/pleroma/plugs/authentication_plug.ex
index 90bd07b91..86a514541 100644
--- a/lib/pleroma/plugs/authentication_plug.ex
+++ b/lib/pleroma/plugs/authentication_plug.ex
@@ -1,28 +1,40 @@
 defmodule Pleroma.Plugs.AuthenticationPlug do
+  alias Comeonin.Pbkdf2
   import Plug.Conn
+  alias Pleroma.User
 
   def init(options) do
     options
   end
 
+  def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
+
   def call(conn, opts) do
     with {:ok, username, password} <- decode_header(conn),
          {:ok, user} <- opts[:fetcher].(username),
-         {:ok, verified_user} <- verify(user, password)
-    do
-      conn |> assign(:user, verified_user)
+         false <- !!user.info["deactivated"],
+         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
 
-  defp verify(nil, _password) do
-    Comeonin.Pbkdf2.dummy_checkpw
+  # 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
 
-  defp verify(user, password) do
-    if Comeonin.Pbkdf2.checkpw(password, user.password_hash) do
+  defp verify(user, password, _user_id) do
+    if Pbkdf2.checkpw(password, user.password_hash) do
       {:ok, user}
     else
       :error
@@ -32,9 +44,8 @@ defmodule Pleroma.Plugs.AuthenticationPlug do
   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 }
+         [username, password] <- String.split(userinfo, ":", parts: 2) do
+      {:ok, username, password}
     end
   end
 
@@ -45,7 +56,7 @@ defmodule Pleroma.Plugs.AuthenticationPlug do
   defp halt_or_continue(conn, _) do
     conn
     |> put_resp_content_type("application/json")
-    |> send_resp(403, Poison.encode!(%{error: "Invalid credentials."}))
+    |> send_resp(403, Jason.encode!(%{error: "Invalid credentials."}))
     |> halt
   end
 end