diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-16 16:19:19 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-16 16:19:19 +0300 |
| commit | 9bca70b10a4c1a7664616b90c50c10c2a8a1003e (patch) | |
| tree | d228fe80c6ed7869e4b24fd758b03d2ab489d7d6 /lib/pleroma/plugs/authentication_plug.ex | |
| parent | b052a9d4d0323eb64c0a741a499906659a674244 (diff) | |
| parent | d3b922276138cf7aaa896d52a8e35113a40e22dc (diff) | |
| download | pleroma-9bca70b10a4c1a7664616b90c50c10c2a8a1003e.tar.gz | |
Merge develop
Diffstat (limited to 'lib/pleroma/plugs/authentication_plug.ex')
| -rw-r--r-- | lib/pleroma/plugs/authentication_plug.ex | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/pleroma/plugs/authentication_plug.ex b/lib/pleroma/plugs/authentication_plug.ex index da4ed4226..eec514892 100644 --- a/lib/pleroma/plugs/authentication_plug.ex +++ b/lib/pleroma/plugs/authentication_plug.ex @@ -6,11 +6,26 @@ defmodule Pleroma.Plugs.AuthenticationPlug do alias Comeonin.Pbkdf2 import Plug.Conn alias Pleroma.User + require Logger def init(options) do options end + def checkpw(password, password_hash) do + cond do + String.starts_with?(password_hash, "$pbkdf2") -> + Pbkdf2.checkpw(password, password_hash) + + String.starts_with?(password_hash, "$6") -> + :crypt.crypt(password, password_hash) == password_hash + + true -> + Logger.error("Password hash not recognized") + false + end + end + def call(%{assigns: %{user: %User{}}} = conn, _), do: conn def call( |