No OneTemporary
Actions

Authored By

Unknown

Size

48 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex b/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
	index 15d8514be..2d03df68a 100644
	--- a/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
	+++ b/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
	@@ -1,45 +1,42 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
	alias Pleroma.Object

	@moduledoc "Ensure a re: is prepended on replies to a post with a Subject"
	@behaviour Pleroma.Web.ActivityPub.MRF

	@reply_prefix Regex.compile!("^re:[[:space:]]*", [:caseless])
	+
	def filter_by_summary(
	- %{"summary" => parent_summary} = _parent,
	+ %{data: %{"summary" => parent_summary}} = _in_reply_to,
	%{"summary" => child_summary} = child
	)
	when not is_nil(child_summary) and byte_size(child_summary) > 0 and
	not is_nil(parent_summary) and byte_size(parent_summary) > 0 do
	if (child_summary == parent_summary and not Regex.match?(@reply_prefix, child_summary)) or
	(Regex.match?(@reply_prefix, parent_summary) &&
	Regex.replace(@reply_prefix, parent_summary, "") == child_summary) do
	Map.put(child, "summary", "re: " <> child_summary)
	else
	child
	end
	end

	- def filter_by_summary(_parent, child), do: child
	-
	- def filter(%{"type" => activity_type} = object) when activity_type == "Create" do
	- child = object["object"]
	- in_reply_to = Object.normalize(child["inReplyTo"])
	+ def filter_by_summary(_in_reply_to, child), do: child

	+ def filter(%{"type" => "Create", "object" => child_object} = object) do
	child =
	- if(in_reply_to,
	- do: filter_by_summary(in_reply_to.data, child),
	- else: child
	- )
	+ child_object["inReplyTo"]
	+ \|> Object.normalize(child_object["inReplyTo"])
	+ \|> filter_by_summary(child_object)

	object = Map.put(object, "object", child)

	{:ok, object}
	end

	def filter(object), do: {:ok, object}
	end
	diff --git a/lib/pleroma/web/activity_pub/mrf/no_placeholder_text_policy.ex b/lib/pleroma/web/activity_pub/mrf/no_placeholder_text_policy.ex
	index f30fee0d5..86a48bda5 100644
	--- a/lib/pleroma/web/activity_pub/mrf/no_placeholder_text_policy.ex
	+++ b/lib/pleroma/web/activity_pub/mrf/no_placeholder_text_policy.ex
	@@ -1,30 +1,22 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicy do
	@moduledoc "Ensure no content placeholder is present (such as the dot from mastodon)"
	@behaviour Pleroma.Web.ActivityPub.MRF

	@impl true
	def filter(
	%{
	"type" => "Create",
	- "object" => %{"content" => content, "attachment" => _attachment} = child_object
	+ "object" => %{"content" => content, "attachment" => _} = _child_object
	} = object
	)
	when content in [".", "<p>.</p>"] do
	- child_object =
	- child_object
	- \|> Map.put("content", "")
	-
	- object =
	- object
	- \|> Map.put("object", child_object)
	-
	- {:ok, object}
	+ {:ok, put_in(object, ["object", "content"], "")}
	end

	@impl true
	def filter(object), do: {:ok, object}
	end
	diff --git a/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex b/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex
	index 9c87c6963..c269d0f89 100644
	--- a/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex
	+++ b/lib/pleroma/web/activity_pub/mrf/normalize_markup.ex
	@@ -1,28 +1,24 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.MRF.NormalizeMarkup do
	@moduledoc "Scrub configured hypertext markup"
	alias Pleroma.HTML

	@behaviour Pleroma.Web.ActivityPub.MRF

	- def filter(%{"type" => activity_type} = object) when activity_type == "Create" do
	+ def filter(%{"type" => "Create", "object" => child_object} = object) do
	scrub_policy = Pleroma.Config.get([:mrf_normalize_markup, :scrub_policy])

	- child = object["object"]
	-
	content =
	- child["content"]
	+ child_object["content"]
	\|> HTML.filter_tags(scrub_policy)

	- child = Map.put(child, "content", content)
	-
	- object = Map.put(object, "object", child)
	+ object = put_in(object, ["object", "content"], content)

	{:ok, object}
	end

	def filter(object), do: {:ok, object}
	end
	diff --git a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
	index ea3df1b4d..da13fd7c7 100644
	--- a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
	+++ b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
	@@ -1,51 +1,47 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
	- alias Pleroma.User
	@moduledoc "Rejects non-public (followers-only, direct) activities"
	+
	+ alias Pleroma.Config
	+ alias Pleroma.User
	+
	@behaviour Pleroma.Web.ActivityPub.MRF

	+ @public "https://www.w3.org/ns/activitystreams#Public"
	+
	@impl true
	def filter(%{"type" => "Create"} = object) do
	user = User.get_cached_by_ap_id(object["actor"])
	- public = "https://www.w3.org/ns/activitystreams#Public"

	# Determine visibility
	visibility =
	cond do
	- public in object["to"] -> "public"
	- public in object["cc"] -> "unlisted"
	+ @public in object["to"] -> "public"
	+ @public in object["cc"] -> "unlisted"
	user.follower_address in object["to"] -> "followers"
	true -> "direct"
	end

	- policy = Pleroma.Config.get(:mrf_rejectnonpublic)
	+ policy = Config.get(:mrf_rejectnonpublic)
	+
	+ cond do
	+ visibility in ["public", "unlisted"] ->
	+ {:ok, object}

	- case visibility do
	- "public" ->
	+ visibility == "followers" and Keyword.get(policy, :allow_followersonly) ->
	{:ok, object}

	- "unlisted" ->
	+ visibility == "direct" and Keyword.get(policy, :allow_direct) ->
	{:ok, object}

	- "followers" ->
	- with true <- Keyword.get(policy, :allow_followersonly) do
	- {:ok, object}
	- else
	- _e -> {:reject, nil}
	- end
	-
	- "direct" ->
	- with true <- Keyword.get(policy, :allow_direct) do
	- {:ok, object}
	- else
	- _e -> {:reject, nil}
	- end
	+ true ->
	+ {:reject, nil}
	end
	end

	@impl true
	def filter(object), do: {:ok, object}
	end
	diff --git a/lib/pleroma/web/activity_pub/mrf/tag_policy.ex b/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
	index 6683b8d8e..b42c4ed76 100644
	--- a/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
	+++ b/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
	@@ -1,152 +1,167 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
	alias Pleroma.User
	@behaviour Pleroma.Web.ActivityPub.MRF
	@moduledoc """
	Apply policies based on user tags

	This policy applies policies on a user activities depending on their tags
	on your instance.

	- `mrf_tag:media-force-nsfw`: Mark as sensitive on presence of attachments
	- `mrf_tag:media-strip`: Remove attachments
	- `mrf_tag:force-unlisted`: Mark as unlisted (removes from the federated timeline)
	- `mrf_tag:sandbox`: Remove from public (local and federated) timelines
	- `mrf_tag:disable-remote-subscription`: Reject non-local follow requests
	- `mrf_tag:disable-any-subscription`: Reject any follow requests
	"""

	+ @public "https://www.w3.org/ns/activitystreams#Public"
	+
	defp get_tags(%User{tags: tags}) when is_list(tags), do: tags
	defp get_tags(_), do: []

	defp process_tag(
	"mrf_tag:media-force-nsfw",
	- %{"type" => "Create", "object" => %{"attachment" => child_attachment} = object} = message
	+ %{
	+ "type" => "Create",
	+ "object" => %{"attachment" => child_attachment} = object
	+ } = message
	)
	when length(child_attachment) > 0 do
	tags = (object["tag"] \|\| []) ++ ["nsfw"]

	object =
	object
	\|> Map.put("tag", tags)
	\|> Map.put("sensitive", true)

	message = Map.put(message, "object", object)

	{:ok, message}
	end

	defp process_tag(
	"mrf_tag:media-strip",
	- %{"type" => "Create", "object" => %{"attachment" => child_attachment} = object} = message
	+ %{
	+ "type" => "Create",
	+ "object" => %{"attachment" => child_attachment} = object
	+ } = message
	)
	when length(child_attachment) > 0 do
	object = Map.delete(object, "attachment")
	message = Map.put(message, "object", object)

	{:ok, message}
	end

	defp process_tag(
	"mrf_tag:force-unlisted",
	- %{"type" => "Create", "to" => to, "cc" => cc, "actor" => actor} = message
	+ %{
	+ "type" => "Create",
	+ "to" => to,
	+ "cc" => cc,
	+ "actor" => actor,
	+ "object" => object
	+ } = message
	) do
	user = User.get_cached_by_ap_id(actor)

	- if Enum.member?(to, "https://www.w3.org/ns/activitystreams#Public") do
	- to =
	- List.delete(to, "https://www.w3.org/ns/activitystreams#Public") ++ [user.follower_address]
	-
	- cc =
	- List.delete(cc, user.follower_address) ++ ["https://www.w3.org/ns/activitystreams#Public"]
	+ if Enum.member?(to, @public) do
	+ to = List.delete(to, @public) ++ [user.follower_address]
	+ cc = List.delete(cc, user.follower_address) ++ [@public]

	object =
	- message["object"]
	+ object
	\|> Map.put("to", to)
	\|> Map.put("cc", cc)

	message =
	message
	\|> Map.put("to", to)
	\|> Map.put("cc", cc)
	\|> Map.put("object", object)

	{:ok, message}
	else
	{:ok, message}
	end
	end

	defp process_tag(
	"mrf_tag:sandbox",
	- %{"type" => "Create", "to" => to, "cc" => cc, "actor" => actor} = message
	+ %{
	+ "type" => "Create",
	+ "to" => to,
	+ "cc" => cc,
	+ "actor" => actor,
	+ "object" => object
	+ } = message
	) do
	user = User.get_cached_by_ap_id(actor)

	- if Enum.member?(to, "https://www.w3.org/ns/activitystreams#Public") or
	- Enum.member?(cc, "https://www.w3.org/ns/activitystreams#Public") do
	- to =
	- List.delete(to, "https://www.w3.org/ns/activitystreams#Public") ++ [user.follower_address]
	-
	- cc = List.delete(cc, "https://www.w3.org/ns/activitystreams#Public")
	+ if Enum.member?(to, @public) or Enum.member?(cc, @public) do
	+ to = List.delete(to, @public) ++ [user.follower_address]
	+ cc = List.delete(cc, @public)

	object =
	- message["object"]
	+ object
	\|> Map.put("to", to)
	\|> Map.put("cc", cc)

	message =
	message
	\|> Map.put("to", to)
	\|> Map.put("cc", cc)
	\|> Map.put("object", object)

	{:ok, message}
	else
	{:ok, message}
	end
	end

	defp process_tag(
	"mrf_tag:disable-remote-subscription",
	%{"type" => "Follow", "actor" => actor} = message
	) do
	user = User.get_cached_by_ap_id(actor)

	if user.local == true do
	{:ok, message}
	else
	{:reject, nil}
	end
	end

	- defp process_tag("mrf_tag:disable-any-subscription", %{"type" => "Follow"}), do: {:reject, nil}
	+ defp process_tag("mrf_tag:disable-any-subscription", %{"type" => "Follow"}),
	+ do: {:reject, nil}

	defp process_tag(_, message), do: {:ok, message}

	def filter_message(actor, message) do
	User.get_cached_by_ap_id(actor)
	\|> get_tags()
	\|> Enum.reduce({:ok, message}, fn
	tag, {:ok, message} ->
	process_tag(tag, message)

	_, error ->
	error
	end)
	end

	@impl true
	def filter(%{"object" => target_actor, "type" => "Follow"} = message),
	do: filter_message(target_actor, message)

	@impl true
	def filter(%{"actor" => actor, "type" => "Create"} = message),
	do: filter_message(actor, message)

	@impl true
	def filter(message), do: {:ok, message}
	end
	diff --git a/lib/pleroma/web/activity_pub/mrf/user_allowlist.ex b/lib/pleroma/web/activity_pub/mrf/user_allowlist_policy.ex
	similarity index 86%
	rename from lib/pleroma/web/activity_pub/mrf/user_allowlist.ex
	rename to lib/pleroma/web/activity_pub/mrf/user_allowlist_policy.ex
	index 47663414a..e35d2c422 100644
	--- a/lib/pleroma/web/activity_pub/mrf/user_allowlist.ex
	+++ b/lib/pleroma/web/activity_pub/mrf/user_allowlist_policy.ex
	@@ -1,30 +1,35 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.MRF.UserAllowListPolicy do
	alias Pleroma.Config

	@moduledoc "Accept-list of users from specified instances"
	@behaviour Pleroma.Web.ActivityPub.MRF

	defp filter_by_list(object, []), do: {:ok, object}

	defp filter_by_list(%{"actor" => actor} = object, allow_list) do
	if actor in allow_list do
	{:ok, object}
	else
	{:reject, nil}
	end
	end

	@impl true
	def filter(%{"actor" => actor} = object) do
	actor_info = URI.parse(actor)
	- allow_list = Config.get([:mrf_user_allowlist, String.to_atom(actor_info.host)], [])
	+
	+ allow_list =
	+ Config.get(
	+ [:mrf_user_allowlist, String.to_atom(actor_info.host)],
	+ []
	+ )

	filter_by_list(object, allow_list)
	end

	def filter(object), do: {:ok, object}
	end
	diff --git a/mix.lock b/mix.lock
	index e711be635..bd6ab9100 100644
	--- a/mix.lock
	+++ b/mix.lock
	@@ -1,91 +1,92 @@
	%{
	"accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm"},
	"auto_linker": {:git, "https://git.pleroma.social/pleroma/auto_linker.git", "95e8188490e97505c56636c1379ffdf036c1fdde", [ref: "95e8188490e97505c56636c1379ffdf036c1fdde"]},
	"base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], [], "hexpm"},
	"bbcode": {:hex, :bbcode, "0.1.1", "0023e2c7814119b2e620b7add67182e3f6019f92bfec9a22da7e99821aceba70", [:mix], [{:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
	"benchee": {:hex, :benchee, "1.0.1", "66b211f9bfd84bd97e6d1beaddf8fc2312aaabe192f776e8931cb0c16f53a521", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}], "hexpm"},
	"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
	"cachex": {:hex, :cachex, "3.0.2", "1351caa4e26e29f7d7ec1d29b53d6013f0447630bbf382b4fb5d5bad0209f203", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm"},
	"calendar": {:hex, :calendar, "0.17.4", "22c5e8d98a4db9494396e5727108dffb820ee0d18fed4b0aa8ab76e4f5bc32f1", [:mix], [{:tzdata, "~> 0.5.8 or ~> 0.1.201603", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
	"certifi": {:hex, :certifi, "2.5.1", "867ce347f7c7d78563450a18a6a28a8090331e77fa02380b4a21962a65d36ee5", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm"},
	"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm"},
	"comeonin": {:hex, :comeonin, "4.1.1", "c7304fc29b45b897b34142a91122bc72757bc0c295e9e824999d5179ffc08416", [:mix], [{:argon2_elixir, "~> 1.2", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:bcrypt_elixir, "~> 0.12.1 or ~> 1.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: true]}, {:pbkdf2_elixir, "~> 0.12", [hex: :pbkdf2_elixir, repo: "hexpm", optional: true]}], "hexpm"},
	"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
	"cors_plug": {:hex, :cors_plug, "1.5.2", "72df63c87e4f94112f458ce9d25800900cc88608c1078f0e4faddf20933eda6e", [:mix], [{:plug, "~> 1.3 or ~> 1.4 or ~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"cowboy": {:hex, :cowboy, "2.6.3", "99aa50e94e685557cad82e704457336a453d4abcb77839ad22dbe71f311fcc06", [:rebar3], [{:cowlib, "~> 2.7.3", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
	"cowlib": {:hex, :cowlib, "2.7.3", "a7ffcd0917e6d50b4d5fb28e9e2085a0ceb3c97dea310505f7460ff5ed764ce9", [:rebar3], [], "hexpm"},
	"credo": {:hex, :credo, "0.9.3", "76fa3e9e497ab282e0cf64b98a624aa11da702854c52c82db1bf24e54ab7c97a", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:poison, ">= 0.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
	"crypt": {:git, "https://github.com/msantos/crypt", "1f2b58927ab57e72910191a7ebaeff984382a1d3", [ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"]},
	"db_connection": {:hex, :db_connection, "2.0.6", "bde2f85d047969c5b5800cb8f4b3ed6316c8cb11487afedac4aa5f93fd39abfa", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"},
	"decimal": {:hex, :decimal, "1.7.0", "30d6b52c88541f9a66637359ddf85016df9eb266170d53105f02e4a67e00c5aa", [:mix], [], "hexpm"},
	"deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm"},
	"earmark": {:hex, :earmark, "1.3.2", "b840562ea3d67795ffbb5bd88940b1bed0ed9fa32834915125ea7d02e35888a5", [:mix], [], "hexpm"},
	"ecto": {:hex, :ecto, "3.1.4", "69d852da7a9f04ede725855a35ede48d158ca11a404fe94f8b2fb3b2162cd3c9", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
	"ecto_sql": {:hex, :ecto_sql, "3.1.3", "2c536139190492d9de33c5fefac7323c5eaaa82e1b9bf93482a14649042f7cd9", [:mix], [{:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.1.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.9.1", [hex: :mariaex, repo: "hexpm", optional: true]}, {:myxql, "~> 0.2.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
	"esshd": {:hex, :esshd, "0.1.0", "6f93a2062adb43637edad0ea7357db2702a4b80dd9683482fe00f5134e97f4c1", [:mix], [], "hexpm"},
	"eternal": {:hex, :eternal, "1.2.0", "e2a6b6ce3b8c248f7dc31451aefca57e3bdf0e48d73ae5043229380a67614c41", [:mix], [], "hexpm"},
	"ex2ms": {:hex, :ex2ms, "1.5.0", "19e27f9212be9a96093fed8cdfbef0a2b56c21237196d26760f11dfcfae58e97", [:mix], [], "hexpm"},
	"ex_aws": {:hex, :ex_aws, "2.1.0", "b92651527d6c09c479f9013caa9c7331f19cba38a650590d82ebf2c6c16a1d8a", [:mix], [{:configparser_ex, "~> 2.0", [hex: :configparser_ex, repo: "hexpm", optional: true]}, {:hackney, "1.6.3 or 1.6.5 or 1.7.1 or 1.8.6 or ~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jsx, "~> 2.8", [hex: :jsx, repo: "hexpm", optional: true]}, {:poison, ">= 1.2.0", [hex: :poison, repo: "hexpm", optional: true]}, {:sweet_xml, "~> 0.6", [hex: :sweet_xml, repo: "hexpm", optional: true]}, {:xml_builder, "~> 0.1.0", [hex: :xml_builder, repo: "hexpm", optional: true]}], "hexpm"},
	"ex_aws_s3": {:hex, :ex_aws_s3, "2.0.1", "9e09366e77f25d3d88c5393824e613344631be8db0d1839faca49686e99b6704", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm"},
	"ex_doc": {:hex, :ex_doc, "0.20.2", "1bd0dfb0304bade58beb77f20f21ee3558cc3c753743ae0ddbb0fd7ba2912331", [:mix], [{:earmark, "~> 1.3", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
	"ex_machina": {:hex, :ex_machina, "2.3.0", "92a5ad0a8b10ea6314b876a99c8c9e3f25f4dde71a2a835845b136b9adaf199a", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm"},
	"ex_rated": {:hex, :ex_rated, "1.3.3", "30ecbdabe91f7eaa9d37fa4e81c85ba420f371babeb9d1910adbcd79ec798d27", [:mix], [{:ex2ms, "~> 1.5", [hex: :ex2ms, repo: "hexpm", optional: false]}], "hexpm"},
	"ex_syslogger": {:git, "https://github.com/slashmili/ex_syslogger.git", "f3963399047af17e038897c69e20d552e6899e1d", [tag: "1.4.0"]},
	"excoveralls": {:hex, :excoveralls, "0.11.1", "dd677fbdd49114fdbdbf445540ec735808250d56b011077798316505064edb2c", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
	"floki": {:hex, :floki, "0.20.4", "be42ac911fece24b4c72f3b5846774b6e61b83fe685c2fc9d62093277fb3bc86", [:mix], [{:html_entities, "~> 0.4.0", [hex: :html_entities, repo: "hexpm", optional: false]}, {:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm"},
	"gen_smtp": {:hex, :gen_smtp, "0.13.0", "11f08504c4bdd831dc520b8f84a1dce5ce624474a797394e7aafd3c29f5dcd25", [:rebar3], [], "hexpm"},
	"gettext": {:hex, :gettext, "0.15.0", "40a2b8ce33a80ced7727e36768499fc9286881c43ebafccae6bab731e2b2b8ce", [:mix], [], "hexpm"},
	"hackney": {:hex, :hackney, "1.15.1", "9f8f471c844b8ce395f7b6d8398139e26ddca9ebc171a8b91342ee15a19963f4", [:rebar3], [{:certifi, "2.5.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.4", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
	"html_entities": {:hex, :html_entities, "0.4.0", "f2fee876858cf6aaa9db608820a3209e45a087c5177332799592142b50e89a6b", [:mix], [], "hexpm"},
	"html_sanitize_ex": {:hex, :html_sanitize_ex, "1.3.0", "f005ad692b717691203f940c686208aa3d8ffd9dd4bb3699240096a51fa9564e", [:mix], [{:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm"},
	"http_signatures": {:git, "https://git.pleroma.social/pleroma/http_signatures.git", "9789401987096ead65646b52b5a2ca6bf52fc531", [ref: "9789401987096ead65646b52b5a2ca6bf52fc531"]},
	"httpoison": {:hex, :httpoison, "1.2.0", "2702ed3da5fd7a8130fc34b11965c8cfa21ade2f232c00b42d96d4967c39a3a3", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
	"idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
	"jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
	"jose": {:hex, :jose, "1.8.4", "7946d1e5c03a76ac9ef42a6e6a20001d35987afd68c2107bcd8f01a84e75aa73", [:mix, :rebar3], [{:base64url, "~> 0.0.1", [hex: :base64url, repo: "hexpm", optional: false]}], "hexpm"},
	"makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
	"makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
	"meck": {:hex, :meck, "0.8.13", "ffedb39f99b0b99703b8601c6f17c7f76313ee12de6b646e671e3188401f7866", [:rebar3], [], "hexpm"},
	"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
	"mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm"},
	"mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm"},
	"mochiweb": {:hex, :mochiweb, "2.15.0", "e1daac474df07651e5d17cc1e642c4069c7850dc4508d3db7263a0651330aacc", [:rebar3], [], "hexpm"},
	"mock": {:hex, :mock, "0.3.3", "42a433794b1291a9cf1525c6d26b38e039e0d3a360732b5e467bfc77ef26c914", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"},
	"mogrify": {:hex, :mogrify, "0.6.1", "de1b527514f2d95a7bbe9642eb556061afb337e220cf97adbf3a4e6438ed70af", [:mix], [], "hexpm"},
	"mox": {:hex, :mox, "0.5.1", "f86bb36026aac1e6f924a4b6d024b05e9adbed5c63e8daa069bd66fb3292165b", [:mix], [], "hexpm"},
	"nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"},
	"parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"},
	"pbkdf2_elixir": {:hex, :pbkdf2_elixir, "0.12.3", "6706a148809a29c306062862c803406e88f048277f6e85b68faf73291e820b84", [:mix], [], "hexpm"},
	"phoenix": {:hex, :phoenix, "1.4.8", "c72dc3adeb49c70eb963a0ea24f7a064ec1588e651e84e1b7ad5ed8253c0b4a2", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
	"phoenix_ecto": {:hex, :phoenix_ecto, "4.0.0", "c43117a136e7399ea04ecaac73f8f23ee0ffe3e07acfcb8062fe5f4c9f0f6531", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"phoenix_html": {:hex, :phoenix_html, "2.13.1", "fa8f034b5328e2dfa0e4131b5569379003f34bc1fafdaa84985b0b9d2f12e68b", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm"},
	"pleroma_job_queue": {:hex, :pleroma_job_queue, "0.2.0", "879e660aa1cebe8dc6f0aaaa6aa48b4875e89cd961d4a585fd128e0773b31a18", [:mix], [], "hexpm"},
	"plug": {:hex, :plug, "1.8.2", "0bcce1daa420f189a6491f3940cc77ea7fb1919761175c9c3b59800d897440fc", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"},
	"plug_cowboy": {:hex, :plug_cowboy, "2.0.2", "6055f16868cc4882b24b6e1d63d2bada94fb4978413377a3b32ac16c18dffba2", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"},
	"plug_static_index_html": {:hex, :plug_static_index_html, "1.0.0", "840123d4d3975585133485ea86af73cb2600afd7f2a976f9f5fd8b3808e636a0", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
	"postgrex": {:hex, :postgrex, "0.14.3", "5754dee2fdf6e9e508cbf49ab138df964278700b764177e8f3871e658b345a1e", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
	"prometheus": {:hex, :prometheus, "4.2.2", "a830e77b79dc6d28183f4db050a7cac926a6c58f1872f9ef94a35cd989aceef8", [:mix, :rebar3], [], "hexpm"},
	"prometheus_ecto": {:hex, :prometheus_ecto, "1.4.1", "6c768ea9654de871e5b32fab2eac348467b3021604ebebbcbd8bcbe806a65ed5", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"},
	"prometheus_ex": {:hex, :prometheus_ex, "3.0.5", "fa58cfd983487fc5ead331e9a3e0aa622c67232b3ec71710ced122c4c453a02f", [:mix], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm"},
	"prometheus_phoenix": {:hex, :prometheus_phoenix, "1.2.1", "964a74dfbc055f781d3a75631e06ce3816a2913976d1df7830283aa3118a797a", [:mix], [{:phoenix, "~> 1.3", [hex: :phoenix, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.3 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"},
	"prometheus_plugs": {:hex, :prometheus_plugs, "1.1.5", "25933d48f8af3a5941dd7b621c889749894d8a1082a6ff7c67cc99dec26377c5", [:mix], [{:accept, "~> 0.1", [hex: :accept, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}, {:prometheus_process_collector, "~> 1.1", [hex: :prometheus_process_collector, repo: "hexpm", optional: true]}], "hexpm"},
	"quack": {:hex, :quack, "0.1.1", "cca7b4da1a233757fdb44b3334fce80c94785b3ad5a602053b7a002b5a8967bf", [:mix], [{:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: false]}, {:tesla, "~> 1.2.0", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm"},
	"ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm"},
	"recon": {:git, "https://github.com/ferd/recon.git", "75d70c7c08926d2f24f1ee6de14ee50fe8a52763", [tag: "2.4.0"]},
	"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.4", "f0eafff810d2041e93f915ef59899c923f4568f4585904d010387ed74988e77b", [:make, :mix, :rebar3], [], "hexpm"},
	+ "stream_data": {:hex, :stream_data, "0.4.3", "62aafd870caff0849a5057a7ec270fad0eb86889f4d433b937d996de99e3db25", [:mix], [], "hexpm"},
	"swoosh": {:hex, :swoosh, "0.20.0", "9a6c13822c9815993c03b6f8fccc370fcffb3c158d9754f67b1fdee6b3a5d928", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.12", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 1.1", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.4", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm"},
	"syslog": {:git, "https://github.com/Vagabond/erlang-syslog.git", "4a6c6f2c996483e86c1320e9553f91d337bcb6aa", [tag: "1.0.5"]},
	"telemetry": {:hex, :telemetry, "0.4.0", "8339bee3fa8b91cb84d14c2935f8ecf399ccd87301ad6da6b71c09553834b2ab", [:rebar3], [], "hexpm"},
	"tesla": {:hex, :tesla, "1.2.1", "864783cc27f71dd8c8969163704752476cec0f3a51eb3b06393b3971dc9733ff", [:mix], [{:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm"},
	"timex": {:hex, :timex, "3.5.0", "b0a23167da02d0fe4f1a4e104d1f929a00d348502b52432c05de875d0b9cffa5", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
	"trailing_format_plug": {:hex, :trailing_format_plug, "0.0.7", "64b877f912cf7273bed03379936df39894149e35137ac9509117e59866e10e45", [:mix], [{:plug, "> 0.12.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"tzdata": {:hex, :tzdata, "0.5.20", "304b9e98a02840fb32a43ec111ffbe517863c8566eb04a061f1c4dbb90b4d84c", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
	"ueberauth": {:hex, :ueberauth, "0.6.1", "9e90d3337dddf38b1ca2753aca9b1e53d8a52b890191cdc55240247c89230412", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
	"unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm"},
	"unsafe": {:hex, :unsafe, "1.0.0", "7c21742cd05380c7875546b023481d3a26f52df8e5dfedcb9f958f322baae305", [:mix], [], "hexpm"},
	"web_push_encryption": {:hex, :web_push_encryption, "0.2.1", "d42cecf73420d9dc0053ba3299cc8c8d6ff2be2487d67ca2a57265868e4d9a98", [:mix], [{:httpoison, "~> 1.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: false]}, {:poison, "~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
	"websocket_client": {:git, "https://github.com/jeremyong/websocket_client.git", "9a6f65d05ebf2725d62fb19262b21f1805a59fbf", []},
	}
	diff --git a/test/web/activity_pub/mrf/ensure_re_prepended_test.exs b/test/web/activity_pub/mrf/ensure_re_prepended_test.exs
	new file mode 100644
	index 000000000..dbc8b9e80
	--- /dev/null
	+++ b/test/web/activity_pub/mrf/ensure_re_prepended_test.exs
	@@ -0,0 +1,82 @@
	+# Pleroma: A lightweight social networking server
	+# Copyright © 2019 Pleroma Authors <https://pleroma.social/>
	+# SPDX-License-Identifier: AGPL-3.0-only
	+
	+defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrependedTest do
	+ use Pleroma.DataCase
	+
	+ alias Pleroma.Activity
	+ alias Pleroma.Object
	+ alias Pleroma.Web.ActivityPub.MRF.EnsureRePrepended
	+
	+ describe "rewrites summary" do
	+ test "it adds `re:` to summary object when child summary and parent summary equal" do
	+ message = %{
	+ "type" => "Create",
	+ "object" => %{
	+ "summary" => "object-summary",
	+ "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "object-summary"}}}
	+ }
	+ }
	+
	+ assert {:ok, res} = EnsureRePrepended.filter(message)
	+ assert res["object"]["summary"] == "re: object-summary"
	+ end
	+
	+ test "it adds `re:` to summary object when child summary containts re-subject of parent summary " do
	+ message = %{
	+ "type" => "Create",
	+ "object" => %{
	+ "summary" => "object-summary",
	+ "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "re: object-summary"}}}
	+ }
	+ }
	+
	+ assert {:ok, res} = EnsureRePrepended.filter(message)
	+ assert res["object"]["summary"] == "re: object-summary"
	+ end
	+ end
	+
	+ describe "skip filter" do
	+ test "it skip if type isn't 'Create'" do
	+ message = %{
	+ "type" => "Annotation",
	+ "object" => %{"summary" => "object-summary"}
	+ }
	+
	+ assert {:ok, res} = EnsureRePrepended.filter(message)
	+ assert res == message
	+ end
	+
	+ test "it skip if summary is empty" do
	+ message = %{
	+ "type" => "Create",
	+ "object" => %{
	+ "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "summary"}}}
	+ }
	+ }
	+
	+ assert {:ok, res} = EnsureRePrepended.filter(message)
	+ assert res == message
	+ end
	+
	+ test "it skip if inReplyTo is empty" do
	+ message = %{"type" => "Create", "object" => %{"summary" => "summary"}}
	+ assert {:ok, res} = EnsureRePrepended.filter(message)
	+ assert res == message
	+ end
	+
	+ test "it skip if parent and child summary isn't equal" do
	+ message = %{
	+ "type" => "Create",
	+ "object" => %{
	+ "summary" => "object-summary",
	+ "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "summary"}}}
	+ }
	+ }
	+
	+ assert {:ok, res} = EnsureRePrepended.filter(message)
	+ assert res == message
	+ end
	+ end
	+end
	diff --git a/test/web/activity_pub/mrf/no_placeholder_text_policy_test.exs b/test/web/activity_pub/mrf/no_placeholder_text_policy_test.exs
	new file mode 100644
	index 000000000..63ed71129
	--- /dev/null
	+++ b/test/web/activity_pub/mrf/no_placeholder_text_policy_test.exs
	@@ -0,0 +1,37 @@
	+# Pleroma: A lightweight social networking server
	+# Copyright © 2019 Pleroma Authors <https://pleroma.social/>
	+# SPDX-License-Identifier: AGPL-3.0-only
	+
	+defmodule Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicyTest do
	+ use Pleroma.DataCase
	+ alias Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicy
	+
	+ test "it clears content object" do
	+ message = %{
	+ "type" => "Create",
	+ "object" => %{"content" => ".", "attachment" => "image"}
	+ }
	+
	+ assert {:ok, res} = NoPlaceholderTextPolicy.filter(message)
	+ assert res["object"]["content"] == ""
	+
	+ message = put_in(message, ["object", "content"], "<p>.</p>")
	+ assert {:ok, res} = NoPlaceholderTextPolicy.filter(message)
	+ assert res["object"]["content"] == ""
	+ end
	+
	+ @messages [
	+ %{
	+ "type" => "Create",
	+ "object" => %{"content" => "test", "attachment" => "image"}
	+ },
	+ %{"type" => "Create", "object" => %{"content" => "."}},
	+ %{"type" => "Create", "object" => %{"content" => "<p>.</p>"}}
	+ ]
	+ test "it skips filter" do
	+ Enum.each(@messages, fn message ->
	+ assert {:ok, res} = NoPlaceholderTextPolicy.filter(message)
	+ assert res == message
	+ end)
	+ end
	+end
	diff --git a/test/web/activity_pub/mrf/normalize_markup_test.exs b/test/web/activity_pub/mrf/normalize_markup_test.exs
	new file mode 100644
	index 000000000..3916a1f35
	--- /dev/null
	+++ b/test/web/activity_pub/mrf/normalize_markup_test.exs
	@@ -0,0 +1,42 @@
	+# Pleroma: A lightweight social networking server
	+# Copyright © 2019 Pleroma Authors <https://pleroma.social/>
	+# SPDX-License-Identifier: AGPL-3.0-only
	+
	+defmodule Pleroma.Web.ActivityPub.MRF.NormalizeMarkupTest do
	+ use Pleroma.DataCase
	+ alias Pleroma.Web.ActivityPub.MRF.NormalizeMarkup
	+
	+ @html_sample """
	+ <b>this is in bold</b>
	+ <p>this is a paragraph</p>
	+ this is a linebreak<br />
	+ this is a link with allowed "rel" attribute: <a href="http://example.com/" rel="tag">example.com</a>
	+ this is a link with not allowed "rel" attribute: <a href="http://example.com/" rel="tag noallowed">example.com</a>
	+ this is an image: <img src="http://example.com/image.jpg"><br />
	+ <script>alert('hacked')</script>
	+ """
	+
	+ test "it filter html tags" do
	+ expected = """
	+ <b>this is in bold</b>
	+ <p>this is a paragraph</p>
	+ this is a linebreak<br />
	+ this is a link with allowed "rel" attribute: <a href="http://example.com/" rel="tag">example.com</a>
	+ this is a link with not allowed "rel" attribute: <a href="http://example.com/">example.com</a>
	+ this is an image: <img src="http://example.com/image.jpg" /><br />
	+ alert('hacked')
	+ """
	+
	+ message = %{"type" => "Create", "object" => %{"content" => @html_sample}}
	+
	+ assert {:ok, res} = NormalizeMarkup.filter(message)
	+ assert res["object"]["content"] == expected
	+ end
	+
	+ test "it skips filter if type isn't `Create`" do
	+ message = %{"type" => "Note", "object" => %{}}
	+
	+ assert {:ok, res} = NormalizeMarkup.filter(message)
	+ assert res == message
	+ end
	+end
	diff --git a/test/web/activity_pub/mrf/reject_non_public_test.exs b/test/web/activity_pub/mrf/reject_non_public_test.exs
	new file mode 100644
	index 000000000..fdf6b245e
	--- /dev/null
	+++ b/test/web/activity_pub/mrf/reject_non_public_test.exs
	@@ -0,0 +1,105 @@
	+# Pleroma: A lightweight social networking server
	+# Copyright © 2019 Pleroma Authors <https://pleroma.social/>
	+# SPDX-License-Identifier: AGPL-3.0-only
	+
	+defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublicTest do
	+ use Pleroma.DataCase
	+ import Pleroma.Factory
	+
	+ alias Pleroma.Web.ActivityPub.MRF.RejectNonPublic
	+
	+ setup do
	+ policy = Pleroma.Config.get([:mrf_rejectnonpublic])
	+ on_exit(fn -> Pleroma.Config.put([:mrf_rejectnonpublic], policy) end)
	+
	+ :ok
	+ end
	+
	+ describe "public message" do
	+ test "it's allowed when address is public" do
	+ actor = insert(:user, follower_address: "test-address")
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "to" => ["https://www.w3.org/ns/activitystreams#Public"],
	+ "cc" => ["https://www.w3.org/ns/activitystreams#Publid"],
	+ "type" => "Create"
	+ }
	+
	+ assert {:ok, message} = RejectNonPublic.filter(message)
	+ end
	+
	+ test "it's allowed when cc address contain public address" do
	+ actor = insert(:user, follower_address: "test-address")
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "to" => ["https://www.w3.org/ns/activitystreams#Public"],
	+ "cc" => ["https://www.w3.org/ns/activitystreams#Publid"],
	+ "type" => "Create"
	+ }
	+
	+ assert {:ok, message} = RejectNonPublic.filter(message)
	+ end
	+ end
	+
	+ describe "followers message" do
	+ test "it's allowed when addrer of message in the follower addresses of user and it enabled in config" do
	+ actor = insert(:user, follower_address: "test-address")
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "to" => ["test-address"],
	+ "cc" => ["https://www.w3.org/ns/activitystreams#Publid"],
	+ "type" => "Create"
	+ }
	+
	+ Pleroma.Config.put([:mrf_rejectnonpublic, :allow_followersonly], true)
	+ assert {:ok, message} = RejectNonPublic.filter(message)
	+ end
	+
	+ test "it's rejected when addrer of message in the follower addresses of user and it disabled in config" do
	+ actor = insert(:user, follower_address: "test-address")
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "to" => ["test-address"],
	+ "cc" => ["https://www.w3.org/ns/activitystreams#Publid"],
	+ "type" => "Create"
	+ }
	+
	+ Pleroma.Config.put([:mrf_rejectnonpublic, :allow_followersonly], false)
	+ assert {:reject, nil} = RejectNonPublic.filter(message)
	+ end
	+ end
	+
	+ describe "direct message" do
	+ test "it's allows when direct messages are allow" do
	+ actor = insert(:user)
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "to" => ["https://www.w3.org/ns/activitystreams#Publid"],
	+ "cc" => ["https://www.w3.org/ns/activitystreams#Publid"],
	+ "type" => "Create"
	+ }
	+
	+ Pleroma.Config.put([:mrf_rejectnonpublic, :allow_direct], true)
	+ assert {:ok, message} = RejectNonPublic.filter(message)
	+ end
	+
	+ test "it's reject when direct messages aren't allow" do
	+ actor = insert(:user)
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "to" => ["https://www.w3.org/ns/activitystreams#Publid~~~"],
	+ "cc" => ["https://www.w3.org/ns/activitystreams#Publid"],
	+ "type" => "Create"
	+ }
	+
	+ Pleroma.Config.put([:mrf_rejectnonpublic, :allow_direct], false)
	+ assert {:reject, nil} = RejectNonPublic.filter(message)
	+ end
	+ end
	+end
	diff --git a/test/web/activity_pub/mrf/tag_policy_test.exs b/test/web/activity_pub/mrf/tag_policy_test.exs
	new file mode 100644
	index 000000000..4aa35311e
	--- /dev/null
	+++ b/test/web/activity_pub/mrf/tag_policy_test.exs
	@@ -0,0 +1,123 @@
	+# Pleroma: A lightweight social networking server
	+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	+# SPDX-License-Identifier: AGPL-3.0-only
	+
	+defmodule Pleroma.Web.ActivityPub.MRF.TagPolicyTest do
	+ use Pleroma.DataCase
	+ import Pleroma.Factory
	+
	+ alias Pleroma.Web.ActivityPub.MRF.TagPolicy
	+ @public "https://www.w3.org/ns/activitystreams#Public"
	+
	+ describe "mrf_tag:disable-any-subscription" do
	+ test "rejects message" do
	+ actor = insert(:user, tags: ["mrf_tag:disable-any-subscription"])
	+ message = %{"object" => actor.ap_id, "type" => "Follow"}
	+ assert {:reject, nil} = TagPolicy.filter(message)
	+ end
	+ end
	+
	+ describe "mrf_tag:disable-remote-subscription" do
	+ test "rejects non-local follow requests" do
	+ actor = insert(:user, tags: ["mrf_tag:disable-remote-subscription"])
	+ follower = insert(:user, tags: ["mrf_tag:disable-remote-subscription"], local: false)
	+ message = %{"object" => actor.ap_id, "type" => "Follow", "actor" => follower.ap_id}
	+ assert {:reject, nil} = TagPolicy.filter(message)
	+ end
	+
	+ test "allows non-local follow requests" do
	+ actor = insert(:user, tags: ["mrf_tag:disable-remote-subscription"])
	+ follower = insert(:user, tags: ["mrf_tag:disable-remote-subscription"], local: true)
	+ message = %{"object" => actor.ap_id, "type" => "Follow", "actor" => follower.ap_id}
	+ assert {:ok, message} = TagPolicy.filter(message)
	+ end
	+ end
	+
	+ describe "mrf_tag:sandbox" do
	+ test "removes from public timelines" do
	+ actor = insert(:user, tags: ["mrf_tag:sandbox"])
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "type" => "Create",
	+ "object" => %{},
	+ "to" => [@public, "f"],
	+ "cc" => [@public, "d"]
	+ }
	+
	+ except_message = %{
	+ "actor" => actor.ap_id,
	+ "type" => "Create",
	+ "object" => %{"to" => ["f", actor.follower_address], "cc" => ["d"]},
	+ "to" => ["f", actor.follower_address],
	+ "cc" => ["d"]
	+ }
	+
	+ assert TagPolicy.filter(message) == {:ok, except_message}
	+ end
	+ end
	+
	+ describe "mrf_tag:force-unlisted" do
	+ test "removes from the federated timeline" do
	+ actor = insert(:user, tags: ["mrf_tag:force-unlisted"])
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "type" => "Create",
	+ "object" => %{},
	+ "to" => [@public, "f"],
	+ "cc" => [actor.follower_address, "d"]
	+ }
	+
	+ except_message = %{
	+ "actor" => actor.ap_id,
	+ "type" => "Create",
	+ "object" => %{"to" => ["f", actor.follower_address], "cc" => ["d", @public]},
	+ "to" => ["f", actor.follower_address],
	+ "cc" => ["d", @public]
	+ }
	+
	+ assert TagPolicy.filter(message) == {:ok, except_message}
	+ end
	+ end
	+
	+ describe "mrf_tag:media-strip" do
	+ test "removes attachments" do
	+ actor = insert(:user, tags: ["mrf_tag:media-strip"])
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "type" => "Create",
	+ "object" => %{"attachment" => ["file1"]}
	+ }
	+
	+ except_message = %{
	+ "actor" => actor.ap_id,
	+ "type" => "Create",
	+ "object" => %{}
	+ }
	+
	+ assert TagPolicy.filter(message) == {:ok, except_message}
	+ end
	+ end
	+
	+ describe "mrf_tag:media-force-nsfw" do
	+ test "Mark as sensitive on presence of attachments" do
	+ actor = insert(:user, tags: ["mrf_tag:media-force-nsfw"])
	+
	+ message = %{
	+ "actor" => actor.ap_id,
	+ "type" => "Create",
	+ "object" => %{"tag" => ["test"], "attachment" => ["file1"]}
	+ }
	+
	+ except_message = %{
	+ "actor" => actor.ap_id,
	+ "type" => "Create",
	+ "object" => %{"tag" => ["test", "nsfw"], "attachment" => ["file1"], "sensitive" => true}
	+ }
	+
	+ assert TagPolicy.filter(message) == {:ok, except_message}
	+ end
	+ end
	+end
	diff --git a/test/web/activity_pub/mrf/user_allowlist_policy_test.exs b/test/web/activity_pub/mrf/user_allowlist_policy_test.exs
	new file mode 100644
	index 000000000..6519e2398
	--- /dev/null
	+++ b/test/web/activity_pub/mrf/user_allowlist_policy_test.exs
	@@ -0,0 +1,36 @@
	+# Pleroma: A lightweight social networking server
	+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	+# SPDX-License-Identifier: AGPL-3.0-only
	+defmodule Pleroma.Web.ActivityPub.MRF.UserAllowListPolicyTest do
	+ use Pleroma.DataCase
	+ import Pleroma.Factory
	+
	+ alias Pleroma.Web.ActivityPub.MRF.UserAllowListPolicy
	+
	+ setup do
	+ policy = Pleroma.Config.get([:mrf_user_allowlist]) \|\| []
	+ on_exit(fn -> Pleroma.Config.put([:mrf_user_allowlist], policy) end)
	+
	+ :ok
	+ end
	+
	+ test "pass filter if allow list is empty" do
	+ actor = insert(:user)
	+ message = %{"actor" => actor.ap_id}
	+ assert UserAllowListPolicy.filter(message) == {:ok, message}
	+ end
	+
	+ test "pass filter if allow list isn't empty and user in allow list" do
	+ actor = insert(:user)
	+ Pleroma.Config.put([:mrf_user_allowlist, :localhost], [actor.ap_id, "test-ap-id"])
	+ message = %{"actor" => actor.ap_id}
	+ assert UserAllowListPolicy.filter(message) == {:ok, message}
	+ end
	+
	+ test "rejected if allow list isn't empty and user not in allow list" do
	+ actor = insert(:user)
	+ Pleroma.Config.put([:mrf_user_allowlist, :localhost], ["test-ap-id"])
	+ message = %{"actor" => actor.ap_id}
	+ assert UserAllowListPolicy.filter(message) == {:reject, nil}
	+ end
	+end

File Metadata

Mime Type: text/x-diff
Expires: Fri, Oct 30, 3:25 AM (1 d, 6 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1799328
Default Alt Text: (48 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions