Merge branch 'feature/mrf-scrub' into 'develop'

MRF: html scrubbing filter

See merge request pleroma/pleroma!345

2 files changed, 30 insertions, 1 deletions

diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex
index 107784e70..a0c43b82c 100644
--- a/lib/pleroma/html.ex
+++ b/lib/pleroma/html.ex
@@ -3,9 +3,13 @@ defmodule Pleroma.HTML do
 
   @markup Application.get_env(:pleroma, :markup)
 
+  def filter_tags(html, scrubber) do
+    html |> Scrubber.scrub(scrubber)
+  end
+
   def filter_tags(html) do
     scrubber = Keyword.get(@markup, :scrub_policy)
-    html |> Scrubber.scrub(scrubber)
+    filter_tags(html, scrubber)
   end
 
   def strip_tags(html) do
diff --git a/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex b/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex
new file mode 100644
index 000000000..b4f91f3cc
--- /dev/null
+++ b/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex
@@ -0,0 +1,25 @@
+defmodule Pleroma.Web.ActivityPub.MRF.NormalizeMarkup do
+  alias Pleroma.HTML
+
+  @behaviour Pleroma.Web.ActivityPub.MRF
+
+  @mrf_normalize_markup Application.get_env(:pleroma, :mrf_normalize_markup)
+
+  def filter(%{"type" => activity_type} = object) when activity_type == "Create" do
+    scrub_policy = Keyword.get(@mrf_normalize_markup, :scrub_policy)
+
+    child = object["object"]
+
+    content =
+      child["content"]
+      |> HTML.filter_tags(scrub_policy)
+
+    child = Map.put(child, "content", content)
+
+    object = Map.put(object, "object", child)
+
+    {:ok, object}
+  end
+
+  def filter(object), do: {:ok, object}
+end