summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-12-29 11:46:06 +0000
committerkaniini <nenolod@gmail.com>2018-12-29 11:46:06 +0000
commit3dc5f04976293fbcedfc01281f89c4f54c995d59 (patch)
treea5f7fc71bdd0e9a77874d56b8034c7c181883d97 /test
parentdd8f2196f62ab4d4cdec67bdb2b434a317a3f396 (diff)
parent9c782e59ddac5fa01cd5b2517f282b283f01bc1d (diff)
downloadpleroma-3dc5f04976293fbcedfc01281f89c4f54c995d59.tar.gz
pleroma-3dc5f04976293fbcedfc01281f89c4f54c995d59.zip
Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities. See merge request pleroma/pleroma!595
Diffstat (limited to 'test')
-rw-r--r--test/web/activity_pub/activity_pub_test.exs18
1 files changed, 18 insertions, 0 deletions
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 7bccd7500..2453998ad 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -31,6 +31,24 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
end
describe "insertion" do
+ test "drops activities beyond a certain limit" do
+ limit = Pleroma.Config.get([:instance, :remote_limit])
+
+ random_text =
+ :crypto.strong_rand_bytes(limit + 1)
+ |> Base.encode64()
+ |> binary_part(0, limit + 1)
+
+ data = %{
+ "ok" => true,
+ "object" => %{
+ "content" => random_text
+ }
+ }
+
+ assert {:error, {:remote_limit_error, _}} = ActivityPub.insert(data)
+ end
+
test "returns the activity if one with the same id is already in" do
activity = insert(:note_activity)
{:ok, new_activity} = ActivityPub.insert(activity.data)