Skip to content

A platform for community discussion. Free, open, simple.

DEV: Log rate limited requests as 4xx

Régis Hanol935676f71e7b
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 004eb857e2a..cddaaa42dce 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -29,6 +29,8 @@ class Middleware::RequestTracker
STATIC_IP_SKIPPER =
ENV["DISCOURSE_MAX_REQS_PER_IP_EXCEPTIONS"]&.split&.map { |ip| IPAddr.new(ip) }
+ TOO_MANY_REQUESTS = 429
+
MAX_URL_LENGTH = 2000
MAX_SESSION_ID_LENGTH = 32
MAX_USER_AGENT_LENGTH = 1000
@@ -327,7 +329,8 @@ class Middleware::RequestTracker
headers["X-Discourse-Username"] = username
end
- return 429, headers, [message]
+ result = [TOO_MANY_REQUESTS, headers, [message]]
+ return result
end
if !cookie
@@ -341,7 +344,8 @@ class Middleware::RequestTracker
"Discourse-Rate-Limit-Error-Code" => error_code,
}
- return 429, headers, [message]
+ result = [TOO_MANY_REQUESTS, headers, [message]]
+ return result
end
end
diff --git a/spec/lib/middleware/request_tracker_spec.rb b/spec/lib/middleware/request_tracker_spec.rb
index 4386c4c2639..7cb052d3768 100644
--- a/spec/lib/middleware/request_tracker_spec.rb
+++ b/spec/lib/middleware/request_tracker_spec.rb
@@ -941,6 +941,42 @@ RSpec.describe Middleware::RequestTracker do
expect(status).to eq(429)
end
+ it "counts a blocked request as a 4xx" do
+ 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")
+ middleware.call(env1)
+
+ CachedCounting.flush
+ previous_4xx = ApplicationRequest.http_4xx.sum(:count)
+ previous_total = ApplicationRequest.http_total.sum(:count)
+
+ status, _ = middleware.call(env1)
+ expect(status).to eq(429)
+
+ CachedCounting.flush
+
+ expect(ApplicationRequest.http_4xx.sum(:count) - previous_4xx).to eq(1)
+ expect(ApplicationRequest.http_total.sum(:count) - previous_total).to eq(1)
+ end
+
+ it "counts a blocked crawler request as a 4xx" do
+ SiteSetting.slow_down_crawler_user_agents = "badcrawler"
+
+ middleware.call(env("HTTP_USER_AGENT" => "badcrawler"))
+
+ CachedCounting.flush
+ previous_4xx = ApplicationRequest.http_4xx.sum(:count)
+
+ status, _ = middleware.call(env("HTTP_USER_AGENT" => "badcrawler"))
+ expect(status).to eq(429)
+
+ CachedCounting.flush
+
+ expect(ApplicationRequest.http_4xx.sum(:count) - previous_4xx).to eq(1)
+ end
+
it "doesn't block if rate limiter is enabled but IP is on the static exception list" do
stub_const(
Middleware::RequestTracker,