From cd13fa17fd8d2c959b4a257a3bdcf52e7f61ddf2 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 16 Sep 2018 02:07:01 +0000 Subject: [PATCH] html: allow scrubbing policies to be stackable --- lib/pleroma/html.ex | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex index a0c43b82c..1eb0fdc00 100644 --- a/lib/pleroma/html.ex +++ b/lib/pleroma/html.ex @@ -3,13 +3,24 @@ defmodule Pleroma.HTML do @markup Application.get_env(:pleroma, :markup) + defp get_scrubbers(scrubber) when is_atom(scrubber), do: [scrubber] + defp get_scrubbers(scrubbers) when is_list(scrubbers), do: scrubbers + defp get_scrubbers(_), do: [Pleroma.HTML.Scrubber.Default] + + def get_scrubbers() do + Keyword.get(@markup, :scrub_policy) + |> get_scrubbers + end + def filter_tags(html, scrubber) do html |> Scrubber.scrub(scrubber) end def filter_tags(html) do - scrubber = Keyword.get(@markup, :scrub_policy) - filter_tags(html, scrubber) + get_scrubbers() + |> Enum.reduce(html, fn scrubber, html -> + filter_tags(html, scrubber) + end) end def strip_tags(html) do