diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-11-17 18:33:09 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-11-17 18:33:09 +0000 |
| commit | a960983815b8798632fc489b762f760738cf798b (patch) | |
| tree | 2f1bfbc9e90fce24707eda378c566c6554603e58 /lib | |
| parent | 05967472f296fc782c15f0d8ebbeaeadb03b0f8c (diff) | |
| parent | b483ae0a724a2b76e8c61f63a96d7867339dacb1 (diff) | |
| download | pleroma-a960983815b8798632fc489b762f760738cf798b.tar.gz | |
Merge branch 'security/actor-containment' into 'develop'
security hotfix: actor containment
See merge request pleroma/pleroma!460
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index c6733e487..51b787272 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -747,7 +747,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do "type" => "Create", "to" => data["to"], "cc" => data["cc"], - "actor" => data["attributedTo"], + "actor" => data["actor"] || data["attributedTo"], "object" => data }, :ok <- Transmogrifier.contain_origin(id, params), |