hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'

Browse source 
rate limiter: disable based on if remote ip was found, not on if the plug was enabled

Closes #1620

See merge request pleroma/pleroma!2296
This commit is contained in:
Haelwenn 2020-03-15 14:22:10 +00:00
commit 67a27825b1
5 changed files with 55 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/web/mastodon_api/controllers/account_controller_test.exs
View file

@ -756,10 +756,6 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
end
describe "create account by app / rate limit" do
clear_config([Pleroma.Plugs.RemoteIp, :enabled]) do
Pleroma.Config.put([Pleroma.Plugs.RemoteIp, :enabled], true)
end
clear_config([:rate_limit, :app_account_creation]) do
Pleroma.Config.put([:rate_limit, :app_account_creation], {10_000, 2})
end