A platform for community discussion. Free, open, simple.
SECURITY: Prevent provider-controlled video titles from creating HTML in emails
Mark VanLandinghame7de8285203a
diff --git a/plugins/discourse-lazy-videos/lib/discourse_lazy_videos/lazy_vimeo.rb b/plugins/discourse-lazy-videos/lib/discourse_lazy_videos/lazy_vimeo.rbindex 795dfb3e47a..1ce388b3e65 100644--- a/plugins/discourse-lazy-videos/lib/discourse_lazy_videos/lazy_vimeo.rb+++ b/plugins/discourse-lazy-videos/lib/discourse_lazy_videos/lazy_vimeo.rb@@ -19,15 +19,17 @@ class Onebox::Engine::VimeoOneboxiframe_id = iframe_src.sub("https://player.vimeo.com/video/", "")end+ escaped_title = ERB::Util.html_escape(og_data.title)+<<~HTML<div class="vimeo-onebox lazy-video-container"data-video-id="#{iframe_id}"- data-video-title="#{og_data.title}"+ data-video-title="#{escaped_title}"data-provider-name="vimeo"><a href="https://vimeo.com/#{full_video_id}" target="_blank"><img class="vimeo-thumbnail"src="#{og_data.image}"- title="#{og_data.title}">+ title="#{escaped_title}"></a></div>HTMLdiff --git a/plugins/discourse-lazy-videos/plugin.rb b/plugins/discourse-lazy-videos/plugin.rbindex 7a313d1e35b..d76f18595c6 100644--- a/plugins/discourse-lazy-videos/plugin.rb+++ b/plugins/discourse-lazy-videos/plugin.rb@@ -28,9 +28,13 @@ after_initialize dofragment.css(".lazy-video-container").each do |video|- title = video["data-video-title"]- href = video.at_css("a")["href"]- video.replace("<p><a href=\"#{href}\">#{title}</a></p>")+ link = fragment.document.create_element("a")+ link["href"] = video.at_css("a")["href"].to_s+ link.add_child(fragment.document.create_text_node(video["data-video-title"].to_s))++ paragraph = fragment.document.create_element("p")+ paragraph.add_child(link)+ video.replace(paragraph)endendenddiff --git a/plugins/discourse-lazy-videos/spec/components/pretty_text_spec.rb b/plugins/discourse-lazy-videos/spec/components/pretty_text_spec.rbindex 692f20a1240..afd8c7c5613 100644--- a/plugins/discourse-lazy-videos/spec/components/pretty_text_spec.rb+++ b/plugins/discourse-lazy-videos/spec/components/pretty_text_spec.rb@@ -28,4 +28,19 @@ RSpec.describe PrettyText doexpect(PrettyText.format_for_email(cooked_html, post)).to match_html(email_formatted)end++ it "preserves lazy video titles as link text in emails" do+ video_title = 'Video <img src=x onerror="alert(1)">'+ cooked_html = <<~HTML+ <div class="vimeo-onebox lazy-video-container"+ data-video-title="Video <img src=x onerror="alert(1)">">+ <a href="https://vimeo.com/123456789"></a>+ </div>+ HTML++ fragment = Nokogiri::HTML5.fragment(PrettyText.format_for_email(cooked_html, post))++ expect(fragment.css("img[onerror]")).to be_empty+ expect(fragment.at_css("a").text).to eq(video_title)+ endenddiff --git a/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rb b/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rbindex be5a1bac256..8c3436abd64 100644--- a/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rb+++ b/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rb@@ -78,6 +78,19 @@ RSpec.describe Onebox::Engine::VimeoOnebox doexpect(Onebox.preview("https://vimeo.com/786646692").to_s).to match(/lazy-video-container/)end+ it "escapes quotes and angle brackets in provider titles" do+ video_title = 'Video ">'+ Oneboxer.invalidate("https://vimeo.com/786646692")+ stub_request(:get, "https://vimeo.com/786646692").to_return(+ status: 200,+ body: %(<meta property="og:title" content="Video ">">),+ )++ fragment = Nokogiri::HTML5.fragment(Onebox.preview("https://vimeo.com/786646692").to_s)++ expect(fragment.at_css(".lazy-video-container")["data-video-title"]).to eq(video_title)+ end+it "uses the correct ids" doexpect(Onebox.preview("https://vimeo.com/786646692").to_s).to include('data-video-id="786646692"',diff --git a/plugins/discourse-lazy-videos/spec/requests/posts_controller_spec.rb b/plugins/discourse-lazy-videos/spec/requests/posts_controller_spec.rbnew file mode 100644index 00000000000..a43603df063--- /dev/null+++ b/plugins/discourse-lazy-videos/spec/requests/posts_controller_spec.rb@@ -0,0 +1,40 @@+# frozen_string_literal: true++RSpec.describe PostsController do+ fab!(:poster, :trust_level_1)+ fab!(:topic)++ it "does not include executable markup from a provider video title in email output" do+ video_url = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"+ video_title = 'Video "><img src=x onerror="alert(1)">'+ thumbnail_url = "https://img.youtube.com/vi/dQw4w9WgXcQ/maxresdefault.jpg"++ SiteSetting.lazy_videos_enabled = true+ SiteSetting.lazy_youtube_enabled = true+ Oneboxer.invalidate(video_url)+ stub_request(:get, video_url).to_return(status: 200, body: "<html></html>")+ stub_request(:head, video_url).to_return(status: 200)+ stub_request(:get, thumbnail_url).to_return(status: 200, body: "")+ stub_request(:head, thumbnail_url).to_return(status: 200)+ stub_request(:get, "https://www.youtube.com/oembed?url=#{video_url}").to_return(+ status: 200,+ body: JSON.dump(title: video_title, thumbnail_url: thumbnail_url),+ )++ sign_in(poster)+ get "/onebox.json", params: { url: video_url, refresh: "true" }++ expect(response).to have_http_status(:ok)++ post "/posts.json", params: { raw: video_url, topic_id: topic.id }++ expect(response).to have_http_status(:ok)+ expect(response.parsed_body).to include("id" => be_present)++ created_post = Post.find(response.parsed_body["id"])+ fragment =+ Nokogiri::HTML5.fragment(PrettyText.format_for_email(created_post.cooked, created_post))+ expect(fragment.css("img[onerror]")).to be_empty+ expect(fragment.at_css("a").text).to eq(video_title)+ end+end