aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-11-17 18:17:17 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-11-17 18:17:17 +0000
commit603fccf175bd6f0d80cc52d0766b0208d2309790 (patch)
tree66e7f4831bf2aa8a65729b1269c5ee9893650ac3 /lib
parent9c8adfb6efb0adf0638f91533ff1bc9f9df36668 (diff)
downloadpleroma-603fccf175bd6f0d80cc52d0766b0208d2309790.tar.gz
activitypub: fetch_object_from_id(): prefer `actor` over `attributedTo` to avoid spoofing
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex2
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),