diff options
| author | tusooa <tusooa@kazv.moe> | 2023-03-12 16:06:00 +0000 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2023-03-30 12:47:36 +0200 |
| commit | 40f14fd31cb1a92b7f1b2a533a725c709fefbb3b (patch) | |
| tree | 7f40c7e783ae6cd295adadb39212728a7461e085 /lib | |
| parent | 937df7e46536fee9703285e8a136bba67f1f907b (diff) | |
| download | pleroma-40f14fd31cb1a92b7f1b2a533a725c709fefbb3b.tar.gz pleroma-40f14fd31cb1a92b7f1b2a533a725c709fefbb3b.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 |