From 8613db0e3b2d998e0e0a336562e872e4b38f2a26 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 23 Oct 2018 00:48:49 +0000 Subject: [PATCH] html: ensure comments are correctly scrubbed --- lib/pleroma/html.ex | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex index fdc5e7dab..a7338eac3 100644 --- a/lib/pleroma/html.ex +++ b/lib/pleroma/html.ex @@ -43,8 +43,6 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do require HtmlSanitizeEx.Scrubber.Meta alias HtmlSanitizeEx.Scrubber.Meta - alias Pleroma.HTML - Meta.remove_cdata_sections_before_scrub() Meta.strip_comments() @@ -83,8 +81,6 @@ defmodule Pleroma.HTML.Scrubber.Default do require HtmlSanitizeEx.Scrubber.Meta alias HtmlSanitizeEx.Scrubber.Meta - alias Pleroma.HTML - @markup Application.get_env(:pleroma, :markup) @uri_schemes Application.get_env(:pleroma, :uri_schemes, []) @valid_schemes Keyword.get(@uri_schemes, :valid_schemes, []) @@ -181,6 +177,8 @@ defmodule Pleroma.HTML.Transform.MediaProxy do {"img", attributes, children} end + def scrub({:comment, children}), do: "" + def scrub({tag, attributes, children}), do: {tag, attributes, children} def scrub({tag, children}), do: children def scrub(text), do: text