diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-14 19:24:39 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-14 19:24:39 +0000 |
| commit | 509d8058d99d7455155b6e7fad83fed28f2ae02d (patch) | |
| tree | 443d91b209b67e793da420c6bcc913eff9201d59 /lib/pleroma/web | |
| parent | 93701c3399add8af2d4a5d43b6f171d84655a533 (diff) | |
| parent | 841314c2d504ad108f6a85713546b188096ad735 (diff) | |
| download | pleroma-509d8058d99d7455155b6e7fad83fed28f2ae02d.tar.gz | |
Merge branch 'security/ir-generic-containment' into 'develop'
security: IR-based generic object containment
See merge request pleroma/pleroma!1417
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index a3174a787..87963b691 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -8,6 +8,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do alias Pleroma.Conversation alias Pleroma.Notification alias Pleroma.Object + alias Pleroma.Object.Containment alias Pleroma.Object.Fetcher alias Pleroma.Pagination alias Pleroma.Repo @@ -126,6 +127,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do {:ok, map} <- MRF.filter(map), {recipients, _, _} = get_recipients(map), {:fake, false, map, recipients} <- {:fake, fake, map, recipients}, + :ok <- Containment.contain_child(map), {:ok, map, object} <- insert_full_object(map) do {:ok, activity} = Repo.insert(%Activity{ |