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

FIX: Add Retry-Header to rate limited responses (#11736)

Browse Source 
It returned a 429 error code with a 'Retry-After' header if a
RateLimiter::LimitExceeded was raised and unhandled, but the header was
missing if the request was limited in the 'RequestTracker' middleware.
This commit is contained in:
Dan Ungureanu
2021-01-19 11:35:46 +02:00
committed by GitHub
parent 0034cbda8a
commit 1f2f84a6df
3 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,10 +237,11 @@ describe Middleware::RequestTracker do
global_setting :max_reqs_per_ip_mode, 'warn+block'
status, _ = middleware.call(env)
status, _ = middleware.call(env)
status, headers = middleware.call(env)
expect(Rails.logger.warnings).to eq(1)
expect(status).to eq(429)
expect(headers["Retry-After"]).to eq(10)
end
it "does warn if rate limiter is enabled" do
@ -267,13 +268,15 @@ describe Middleware::RequestTracker do
expect(status).to eq(200)
status, _ = middleware.call(env1)
expect(status).to eq(200)
status, _ = middleware.call(env1)
status, headers = middleware.call(env1)
expect(status).to eq(429)
expect(headers["Retry-After"]).to eq(10)
env2 = env("REMOTE_ADDR" => "1.1.1.1")
status, _ = middleware.call(env2)
status, headers = middleware.call(env2)
expect(status).to eq(429)
expect(headers["Retry-After"]).to eq(10)
end
it "does block if rate limiter is enabled" do
@ -286,8 +289,9 @@ describe Middleware::RequestTracker do
status, _ = middleware.call(env1)
expect(status).to eq(200)
status, _ = middleware.call(env1)
status, headers = middleware.call(env1)
expect(status).to eq(429)
expect(headers["Retry-After"]).to eq(10)
status, _ = middleware.call(env2)
expect(status).to eq(200)