diff options
| author | tusooa <tusooa@kazv.moe> | 2023-03-12 16:06:00 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2023-03-12 16:06:00 +0000 |
| commit | 9145fd04f23460465731011ee745588f4e93b2f0 (patch) | |
| tree | ee7ea119674126e203cd52ce899537fd1f28aa46 /lib | |
| parent | f5c6e44731b7f2a06f0ee0e9dec3a020be9bb48e (diff) | |
| parent | d18441e9c41724de0ba9f08db90985cfdf83fd1a (diff) | |
| download | pleroma-9145fd04f23460465731011ee745588f4e93b2f0.tar.gz pleroma-9145fd04f23460465731011ee745588f4e93b2f0.zip | |
Merge branch 'remove-crypt' into 'develop'
Remove crypt(3) support
Closes #3030 and #3062
See merge request pleroma/pleroma!3847
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/plugs/authentication_plug.ex | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/pleroma/web/plugs/authentication_plug.ex b/lib/pleroma/web/plugs/authentication_plug.ex index a7fd697b5..f912a1542 100644 --- a/lib/pleroma/web/plugs/authentication_plug.ex +++ b/lib/pleroma/web/plugs/authentication_plug.ex @@ -38,10 +38,6 @@ defmodule Pleroma.Web.Plugs.AuthenticationPlug do def call(conn, _), do: conn - def checkpw(password, "$6" <> _ = password_hash) do - :crypt.crypt(password, password_hash) == password_hash - end - def checkpw(password, "$2" <> _ = password_hash) do # Handle bcrypt passwords for Mastodon migration Bcrypt.verify_pass(password, password_hash) @@ -60,10 +56,6 @@ defmodule Pleroma.Web.Plugs.AuthenticationPlug do do_update_password(user, password) end - def maybe_update_password(%User{password_hash: "$6" <> _} = user, password) do - do_update_password(user, password) - end - def maybe_update_password(user, _), do: {:ok, user} defp do_update_password(user, password) do |