|
|
|
@ -28,13 +28,18 @@ defmodule Pleroma.HTML do
|
|
|
|
|
def filter_tags(html), do: filter_tags(html, nil)
|
|
|
|
|
def strip_tags(html), do: Scrubber.scrub(html, Scrubber.StripTags)
|
|
|
|
|
|
|
|
|
|
def get_cached_scrubbed_html_for_object(content, scrubbers, object) do
|
|
|
|
|
key = "#{generate_scrubber_signature(scrubbers)}|#{object.id}"
|
|
|
|
|
def get_cached_scrubbed_html_for_object(content, scrubbers, object, module) do
|
|
|
|
|
key = "#{module}#{generate_scrubber_signature(scrubbers)}|#{object.id}"
|
|
|
|
|
Cachex.fetch!(:scrubber_cache, key, fn _key -> ensure_scrubbed_html(content, scrubbers) end)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def get_cached_stripped_html_for_object(content, object) do
|
|
|
|
|
get_cached_scrubbed_html_for_object(content, HtmlSanitizeEx.Scrubber.StripTags, object)
|
|
|
|
|
def get_cached_stripped_html_for_object(content, object, module) do
|
|
|
|
|
get_cached_scrubbed_html_for_object(
|
|
|
|
|
content,
|
|
|
|
|
HtmlSanitizeEx.Scrubber.StripTags,
|
|
|
|
|
object,
|
|
|
|
|
module
|
|
|
|
|
)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def ensure_scrubbed_html(
|
|
|
|
@ -50,15 +55,7 @@ defmodule Pleroma.HTML do
|
|
|
|
|
|
|
|
|
|
defp generate_scrubber_signature(scrubbers) do
|
|
|
|
|
Enum.reduce(scrubbers, "", fn scrubber, signature ->
|
|
|
|
|
# If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber.StripTags) it is assumed it is always 0)
|
|
|
|
|
version =
|
|
|
|
|
if Kernel.function_exported?(scrubber, :version, 0) do
|
|
|
|
|
scrubber.version
|
|
|
|
|
else
|
|
|
|
|
0
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
"#{signature}#{to_string(scrubber)}#{version}"
|
|
|
|
|
"#{signature}#{to_string(scrubber)}"
|
|
|
|
|
end)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
@ -76,10 +73,6 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do
|
|
|
|
|
require HtmlSanitizeEx.Scrubber.Meta
|
|
|
|
|
alias HtmlSanitizeEx.Scrubber.Meta
|
|
|
|
|
|
|
|
|
|
def version do
|
|
|
|
|
0
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
Meta.remove_cdata_sections_before_scrub()
|
|
|
|
|
Meta.strip_comments()
|
|
|
|
|
|
|
|
|
@ -118,10 +111,6 @@ defmodule Pleroma.HTML.Scrubber.Default do
|
|
|
|
|
require HtmlSanitizeEx.Scrubber.Meta
|
|
|
|
|
alias HtmlSanitizeEx.Scrubber.Meta
|
|
|
|
|
|
|
|
|
|
def version do
|
|
|
|
|
0
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
@markup Application.get_env(:pleroma, :markup)
|
|
|
|
|
@uri_schemes Application.get_env(:pleroma, :uri_schemes, [])
|
|
|
|
|
@valid_schemes Keyword.get(@uri_schemes, :valid_schemes, [])
|
|
|
|
@ -199,10 +188,6 @@ defmodule Pleroma.HTML.Transform.MediaProxy do
|
|
|
|
|
|
|
|
|
|
alias Pleroma.Web.MediaProxy
|
|
|
|
|
|
|
|
|
|
def version do
|
|
|
|
|
0
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def before_scrub(html), do: html
|
|
|
|
|
|
|
|
|
|
def scrub_attribute("img", {"src", "http" <> target}) do
|
|
|
|
|