github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 12:02:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Shorten setting name to max_reqs

Browse Source 
So it is consistent with other settings
This commit is contained in:
Sam
2018-01-22 13:18:30 +11:00
parent 83a346cd68
commit f26ff290c3
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spec/components/middleware/request_tracker_spec.rb
View File

@ -105,7 +105,7 @@ describe Middleware::RequestTracker do
end
it "does nothing by default" do
global_setting :max_requests_per_ip_per_10_seconds, 1
global_setting :max_reqs_per_ip_per_10_seconds, 1
status, _ = middleware.call(env)
status, _ = middleware.call(env)
@ -114,9 +114,9 @@ describe Middleware::RequestTracker do
end
it "blocks private IPs if not skipped" do
global_setting :max_requests_per_ip_per_10_seconds, 1
global_setting :max_requests_per_ip_mode, 'warn+block'
global_setting :max_requests_rate_limit_on_private, true
global_setting :max_reqs_per_ip_per_10_seconds, 1
global_setting :max_reqs_per_ip_mode, 'warn+block'
global_setting :max_reqs_rate_limit_on_private, true
env1 = env("REMOTE_ADDR" => "127.0.0.2")
@ -128,9 +128,9 @@ describe Middleware::RequestTracker do
end
it "does nothing for private IPs if skipped" do
global_setting :max_requests_per_ip_per_10_seconds, 1
global_setting :max_requests_per_ip_mode, 'warn+block'
global_setting :max_requests_rate_limit_on_private, false
global_setting :max_reqs_per_ip_per_10_seconds, 1
global_setting :max_reqs_per_ip_mode, 'warn+block'
global_setting :max_reqs_rate_limit_on_private, false
env1 = env("REMOTE_ADDR" => "127.0.3.1")
@ -142,8 +142,8 @@ describe Middleware::RequestTracker do
end
it "does warn if rate limiter is enabled via warn+block" do
global_setting :max_requests_per_ip_per_10_seconds, 1
global_setting :max_requests_per_ip_mode, 'warn+block'
global_setting :max_reqs_per_ip_per_10_seconds, 1
global_setting :max_reqs_per_ip_mode, 'warn+block'
status, _ = middleware.call(env)
status, _ = middleware.call(env)
@ -153,8 +153,8 @@ describe Middleware::RequestTracker do
end
it "does warn if rate limiter is enabled" do
global_setting :max_requests_per_ip_per_10_seconds, 1
global_setting :max_requests_per_ip_mode, 'warn'
global_setting :max_reqs_per_ip_per_10_seconds, 1
global_setting :max_reqs_per_ip_mode, 'warn'
status, _ = middleware.call(env)
status, _ = middleware.call(env)
@ -164,8 +164,8 @@ describe Middleware::RequestTracker do
end
it "does block if rate limiter is enabled" do
global_setting :max_requests_per_ip_per_10_seconds, 1
global_setting :max_requests_per_ip_mode, 'block'
global_setting :max_reqs_per_ip_per_10_seconds, 1
global_setting :max_reqs_per_ip_mode, 'block'
env1 = env("REMOTE_ADDR" => "1.1.1.1")
env2 = env("REMOTE_ADDR" => "1.1.1.2")