luna/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/with-reject-nil-clause' into 'develop'

Browse source 
Handle MRF rejections of incoming AP activities

Closes #1095

See merge request pleroma/pleroma!1520
This commit is contained in:
kaniini 2019-08-03 18:12:39 +00:00
commit 7319b41e34
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -267,6 +267,9 @@ def create(%{to: to, actor: actor, context: context, object: object} = params, f
else
{:fake, true, activity} ->
{:ok, activity}
{:error, message} ->
{:error, message}
end
end

16
test/web/federator_test.exs
View file

@ -229,5 +229,21 @@ test "rejects incoming AP docs with incorrect origin" do
:error = Federator.incoming_ap_doc(params)
end
test "it does not crash if MRF rejects the post" do
policies = Pleroma.Config.get([:instance, :rewrite_policy])
mrf_keyword_policy = Pleroma.Config.get(:mrf_keyword)
Pleroma.Config.put([:mrf_keyword, :reject], ["lain"])
Pleroma.Config.put([:instance, :rewrite_policy], Pleroma.Web.ActivityPub.MRF.KeywordPolicy)
params =
File.read!("test/fixtures/mastodon-post-activity.json")
|> Poison.decode!()
assert Federator.incoming_ap_doc(params) == :error
Pleroma.Config.put([:instance, :rewrite_policy], policies)
Pleroma.Config.put(:mrf_keyword, mrf_keyword_policy)
end
end
end