X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fauthentication_plug.ex;h=86a514541025083c33adec55dda58bb48d0c29f6;hb=ab4aa5720aeac8541fbf99e6c98e7260cb19d41e;hp=a3317f432d5de1041b67e76ba754bfa3dc4c9073;hpb=32aa83f3a2a6ab14e36a3452708ea3be94ad4c43;p=akkoma

diff --git a/lib/pleroma/plugs/authentication_plug.ex b/lib/pleroma/plugs/authentication_plug.ex
index a3317f432..86a514541 100644
--- a/lib/pleroma/plugs/authentication_plug.ex
+++ b/lib/pleroma/plugs/authentication_plug.ex
@@ -1,16 +1,20 @@
 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),
+         false <- !!user.info["deactivated"],
          saved_user_id <- get_session(conn, :user_id),
-         {:ok, verified_user} <- verify(user, password, saved_user_id)
-    do
+         {:ok, verified_user} <- verify(user, password, saved_user_id) do
       conn
       |> assign(:user, verified_user)
       |> put_session(:user_id, verified_user.id)
@@ -25,12 +29,12 @@ defmodule Pleroma.Plugs.AuthenticationPlug do
   end
 
   defp verify(nil, _password, _user_id) do
-    Comeonin.Pbkdf2.dummy_checkpw
+    Pbkdf2.dummy_checkpw()
     :error
   end
 
   defp verify(user, password, _user_id) do
-    if Comeonin.Pbkdf2.checkpw(password, user.password_hash) do
+    if Pbkdf2.checkpw(password, user.password_hash) do
       {:ok, user}
     else
       :error
@@ -40,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
 
@@ -53,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