A platform for community discussion. Free, open, simple.
FIX: Reject cross-origin requests to anon pageview beacon (#39883)
Alan Guo Xiang Tan6f655769a187
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rbindex 0f0a4d9dfd2..b955e174caa 100644--- a/lib/middleware/request_tracker.rb+++ b/lib/middleware/request_tracker.rb@@ -349,8 +349,17 @@ class Middleware::RequestTrackerenv["discourse.request_tracker"] = self- if self.class.is_beacon_tracking_request?(request) ||- self.class.is_pageview_tracking_request?(request)+ if self.class.is_beacon_tracking_request?(request)+ if self.class.same_origin_beacon_request?(request)+ result = [204, {}, []]+ else+ env["discourse.request_tracker.skip"] = true+ result = [403, {}, []]+ end+ return result+ end++ if self.class.is_pageview_tracking_request?(request)result = [204, {}, []]return resultend@@ -648,6 +657,19 @@ class Middleware::RequestTrackerrequest.path == Discourse.beacon_pv_tracking_pathend+ def self.same_origin_beacon_request?(request)+ origin = request.get_header("HTTP_ORIGIN").presence || request.referer.presence+ return false if origin.blank?++ canonical_uri = URI.parse(Discourse.base_url_no_prefix)+ origin_uri = URI.parse(origin)++ canonical_uri.scheme == origin_uri.scheme && canonical_uri.host == origin_uri.host &&+ canonical_uri.port == origin_uri.port+ rescue URI::Error+ false+ end+def self.is_pageview_tracking_request?(request)request.post? && request.path == "#{Discourse.base_path}/pageview"enddiff --git a/spec/lib/middleware/request_tracker_spec.rb b/spec/lib/middleware/request_tracker_spec.rbindex d4158bb3ec8..9d73c3138fb 100644--- a/spec/lib/middleware/request_tracker_spec.rb+++ b/spec/lib/middleware/request_tracker_spec.rb@@ -900,6 +900,7 @@ RSpec.describe Middleware::RequestTracker doenv({:path => "/srv/pv",+ "HTTP_HOST" => "test.localhost","REQUEST_METHOD" => "POST","CONTENT_TYPE" => "application/json","rack.input" => StringIO.new(json_body),@@ -907,6 +908,8 @@ RSpec.describe Middleware::RequestTracker do)end+ let(:same_origin) { { "HTTP_ORIGIN" => "http://test.localhost" } }+it "returns 204 and does not call the app" doapp_called = falsemiddleware =@@ -916,7 +919,7 @@ RSpec.describe Middleware::RequestTracker do[200, {}, ["OK"]]end,)- status, = middleware.call(beacon_env({}))+ status, = middleware.call(beacon_env({}, same_origin))expect(status).to eq(204)expect(app_called).to eq(false)@@ -925,7 +928,7 @@ RSpec.describe Middleware::RequestTracker doit "returns 204 for beacon requests in a subfolder setup" doset_subfolder "/forum"middleware = Middleware::RequestTracker.new(lambda { |env| [200, {}, ["OK"]] })- status, = middleware.call(beacon_env({}, { path: "/forum/srv/pv" }))+ status, = middleware.call(beacon_env({}, same_origin.merge(path: "/forum/srv/pv")))expect(status).to eq(204)end@@ -936,6 +939,8 @@ RSpec.describe Middleware::RequestTracker domiddleware.call(env(:path => "/srv/pv",+ "HTTP_HOST" => "test.localhost",+ "HTTP_ORIGIN" => "http://test.localhost","REQUEST_METHOD" => "POST","CONTENT_TYPE" => "application/json","rack.input" => StringIO.new("not json"),@@ -960,6 +965,7 @@ RSpec.describe Middleware::RequestTracker dosession_id: "abc123",topic_id: 123,},+ same_origin,),)end@@ -995,7 +1001,7 @@ RSpec.describe Middleware::RequestTracker doit "skips beacon page view when the remote IP resolves to a crawler ASN" doDiscourseIpInfo.stubs(:get).returns({ asn: SiteSetting.crawler_asns_map.first.to_i })middleware = Middleware::RequestTracker.new(lambda { |env| [200, {}, ["OK"]] })- middleware.call(beacon_env({}, { "action_dispatch.remote_ip" => "1.2.3.4" }))+ middleware.call(beacon_env({}, same_origin.merge("action_dispatch.remote_ip" => "1.2.3.4")))CachedCounting.flushexpect(ApplicationRequest.page_view_anon_browser_beacon.first).to be_nil@@ -1004,12 +1010,51 @@ RSpec.describe Middleware::RequestTracker doit "counts beacon page view when the remote IP is not a crawler ASN" doDiscourseIpInfo.stubs(:get).returns({ asn: 1 })middleware = Middleware::RequestTracker.new(lambda { |env| [200, {}, ["OK"]] })- middleware.call(beacon_env({}, { "action_dispatch.remote_ip" => "1.2.3.4" }))+ middleware.call(beacon_env({}, same_origin.merge("action_dispatch.remote_ip" => "1.2.3.4")))CachedCounting.flushexpect(ApplicationRequest.page_view_anon_browser_beacon.first.count).to eq(1)end+ it "returns 403 for cross-origin beacon requests" do+ middleware = Middleware::RequestTracker.new(lambda { |env| [200, {}, ["OK"]] })+ status, = middleware.call(beacon_env({}, { "HTTP_ORIGIN" => "https://evil.example" }))+ CachedCounting.flush++ expect(status).to eq(403)+ expect(ApplicationRequest.page_view_anon_browser_beacon.first).to be_nil+ end++ it "returns 403 when Origin and Referer are both absent" do+ middleware = Middleware::RequestTracker.new(lambda { |env| [200, {}, ["OK"]] })+ status, = middleware.call(beacon_env({}))+ CachedCounting.flush++ expect(status).to eq(403)+ expect(ApplicationRequest.page_view_anon_browser_beacon.first).to be_nil+ end++ it "returns 403 when Origin matches the request Host but differs from the canonical hostname" do+ SiteSetting.force_hostname = "canonical.example"+ middleware = Middleware::RequestTracker.new(lambda { |env| [200, {}, ["OK"]] })+ status, =+ middleware.call(+ beacon_env({}, { "HTTP_HOST" => "evil.example", "HTTP_ORIGIN" => "http://evil.example" }),+ )+ CachedCounting.flush++ expect(status).to eq(403)+ expect(ApplicationRequest.page_view_anon_browser_beacon.first).to be_nil+ end++ it "accepts beacon when Origin is absent but Referer is same-origin" do+ middleware = Middleware::RequestTracker.new(lambda { |env| [200, {}, ["OK"]] })+ status, =+ middleware.call(beacon_env({}, { "HTTP_REFERER" => "http://test.localhost/some/page" }))++ expect(status).to eq(204)+ end+context "when SiteSetting.use_beacon_for_browser_page_views is false" dobefore { SiteSetting.use_beacon_for_browser_page_views = false }