summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-10-23 00:48:49 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-10-23 00:48:49 +0000
commit8613db0e3b2d998e0e0a336562e872e4b38f2a26 (patch)
treea7c37b4f2cef59bdb32bbe5b4f3e6d8560060a27
parentaaf3fc1575badd13ccbce267895492fa0b708bbb (diff)
downloadpleroma-8613db0e3b2d998e0e0a336562e872e4b38f2a26.tar.gz
pleroma-8613db0e3b2d998e0e0a336562e872e4b38f2a26.zip
html: ensure comments are correctly scrubbed
-rw-r--r--lib/pleroma/html.ex6
1 files 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