A platform for community discussion. Free, open, simple.
FIX: Sanitize namespaced SVG `<use>` references (#42124)
Alan Guo Xiang Tan4b0fd4116c01
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rbindex d0c32430612..5f2f78a450b 100644--- a/lib/upload_creator.rb+++ b/lib/upload_creator.rb@@ -529,10 +529,11 @@ class UploadCreatordoc.css("use").each do |use_el|- if use_el.attr("href")- use_el.remove_attribute("href") unless use_el.attr("href").starts_with?("#")+ use_el.attribute_nodes.each do |attribute|+ next if attribute.name != "href" && attribute.name != "xlink:href"++ attribute.remove unless attribute.value.starts_with?("#")end- use_el.remove_attribute("xlink:href")endFile.write(@file.path, doc.to_s)diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rbindex bba15ed6dca..a34fe07eeef 100644--- a/spec/lib/upload_creator_spec.rb+++ b/spec/lib/upload_creator_spec.rb@@ -7,6 +7,38 @@ RSpec.describe UploadCreator dofab!(:admin)describe "#create_for" do+ describe "when the image is an SVG" do+ it "removes external use references while preserving local fragments" do+ xlink_namespace = "http://www.w3.org/1999/xlink"+ svg = <<~XML+ <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="#{xlink_namespace}" width="10" height="10">+ <defs><path id="mark" d="M0 0h10v10H0z" /></defs>+ <use id="local-href" href="#mark" />+ <use id="external-href" href="https://example.com/evil.svg#mark" />+ <use id="data-href" href="data:image/svg+xml,evil" />+ <use id="local-xlink-href" xlink:href="#mark" />+ <use id="external-xlink-href" xlink:href="https://example.com/evil.svg#mark" />+ </svg>+ XML++ upload =+ UploadCreator.new(file_from_contents(svg, "image.svg"), "image.svg").create_for(user.id)++ document = Nokogiri.XML(File.read(Discourse.store.path_for(upload)))++ expect(upload).to be_persisted+ expect(document.at_css("#local-href")["href"]).to eq("#mark")+ expect(document.at_css("#external-href")["href"]).to eq(nil)+ expect(document.at_css("#data-href")["href"]).to eq(nil)+ expect(+ document.at_css("#local-xlink-href").attribute_with_ns("href", xlink_namespace)&.value,+ ).to eq("#mark")+ expect(+ document.at_css("#external-xlink-href").attribute_with_ns("href", xlink_namespace)&.value,+ ).to eq(nil)+ end+ end+describe "when upload is not an image" dobefore { SiteSetting.authorized_extensions = "txt|long-FileExtension" }