A platform for community discussion. Free, open, simple.
SECURITY: Fix wildcard iframe origin allowlist to stop at URL authority boundaries
Isaac Janzend5ae0940707f
diff --git a/frontend/discourse/tests/unit/lib/sanitizer-test.js b/frontend/discourse/tests/unit/lib/sanitizer-test.jsindex b872b823b8b..29b4b21e0c0 100644--- a/frontend/discourse/tests/unit/lib/sanitizer-test.js+++ b/frontend/discourse/tests/unit/lib/sanitizer-test.js@@ -282,6 +282,32 @@ module("Unit | Utility | sanitizer", function (hooks) {);});+ test("wildcard iframe origins stop at URL authority boundaries", function (assert) {+ const engine = build({+ siteSettings: { allowed_iframes: "https://*.example.com/" },+ });+ const iframe = (url) => `<iframe src="${url}"></iframe>`;++ assert.strictEqual(+ engine.sanitize(iframe("https://deep.embed.example.com/player")),+ iframe("https://deep.embed.example.com/player"),+ "allows legitimate deep subdomains"+ );++ [+ "https://attacker.example/@embed.example.com/player",+ "https://[email protected]/player",+ "https://attacker.example#@embed.example.com/player",+ "https://attacker.example\\@embed.example.com/player",+ ].forEach((url) => {+ assert.strictEqual(+ engine.sanitize(iframe(url)),+ "",+ `rejects an iframe whose authority ends at ${url.match(/[/?#\\]/)[0]}`+ );+ });+ });+test("autoplay videos must be muted", function (assert) {let engine = build({ siteSettings: {} });assert.true(diff --git a/frontend/pretty-text/addon/sanitizer.js b/frontend/pretty-text/addon/sanitizer.jsindex 364130b7ae9..d3fdb08e482 100644--- a/frontend/pretty-text/addon/sanitizer.js+++ b/frontend/pretty-text/addon/sanitizer.js@@ -146,7 +146,7 @@ export function sanitize(text, allowLister) {const regex = i// escape regex, keeping *.replace(/[.+?^${}()|[\]\\]/g, "\\$&")- .replace(/\*/g, "[^/]+");+ .replace(/\*/g, "[^/?#\\\\]+");const allowedIframe = new RegExp(`^${regex}.*$`, "i");return iframeUrls.every((iframeUrl) =>allowedIframe.test(iframeUrl)diff --git a/lib/onebox/engine.rb b/lib/onebox/engine.rbindex 733f10a3f54..cda5e27a079 100644--- a/lib/onebox/engine.rb+++ b/lib/onebox/engine.rb@@ -27,7 +27,7 @@ module Oneboxorigins.map do |origin|escaped_origin = Regexp.escape(origin)if origin.start_with?("*.", "https://*.", "http://*.")- escaped_origin = escaped_origin.sub("\\*", "[^/?#]*")+ escaped_origin = escaped_origin.sub("\\*") { "[^/?#\\\\]*" }endorigin_boundary =diff --git a/spec/lib/onebox/engine_spec.rb b/spec/lib/onebox/engine_spec.rbindex f9f4ecb6579..19196dec634 100644--- a/spec/lib/onebox/engine_spec.rb+++ b/spec/lib/onebox/engine_spec.rb@@ -85,6 +85,7 @@ RSpec.describe Onebox::Engine dohttps://attacker.example/path.example.com/playerhttps://attacker.example?.example.com/https://attacker.example#.example.com/+ https://attacker.example\\@embed.example.com/playerhttps://embed.example.com.attacker.example/player].each { |url| expect(url).not_to match(regex) }enddiff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rbindex b8ca87dd3b1..8056cb17f33 100644--- a/spec/requests/posts_controller_spec.rb+++ b/spec/requests/posts_controller_spec.rb@@ -2319,6 +2319,35 @@ RSpec.describe PostsController doexpect(cooked.at_css(".onebox-attack")).to be_nilend+ it "does not persist a backslash-bypassed wildcard iframe origin from oEmbed" do+ Jobs.run_immediately!+ url = "https://attacker.example.com/onebox"+ iframe_origin = "https://evil.example\\@sub.typeform.com/to/abc"++ stub_request(:head, url).to_return(status: 200)+ stub_request(:get, url).to_return(+ status: 200,+ body:+ '<html><head><link type="application/json+oembed" href="https://attacker.example.com/oembed"></head></html>',+ )+ stub_request(:get, "https://attacker.example.com/oembed").to_return(+ status: 200,+ body: {+ title: "Attacker onebox",+ type: "rich",+ html: "<iframe src=\"#{iframe_origin}\"></iframe>",+ }.to_json,+ )++ post "/posts.json", params: { raw: url, title: "Backslash iframe origin" }++ expect(response.status).to eq(200)+ expect(response.parsed_body["id"]).to be_present++ cooked = Nokogiri::HTML5.fragment(Post.find(response.parsed_body["id"]).cooked)+ expect(cooked.at_css("iframe")).to be_nil+ end+it "creates the topic and post with the right attributes" dopost "/posts.json",params: {