Merge remote-tracking branch 'upstream/develop' into spc2

changelog.d/missing-mrfs.add

@@ -0,0 +1 @@
+Startup detection for configured MRF modules that are missing or incorrectly defined

changelog.d/strip-object-actor.fix

@@ -1 +0,0 @@
-Strip actor property from objects before federating

lib/pleroma/application_requirements.ex

@@ -28,6 +28,7 @@ def verify! do
     |> check_welcome_message_config!()
     |> check_rum!()
     |> check_repo_pool_size!()
+    |> check_mrfs()
     |> handle_result()
   end
 
@@ -234,4 +235,25 @@ defp check_filter(filter, command_required) do
       true
     end
   end
+
+  defp check_mrfs(:ok) do
+    mrfs = Config.get!([:mrf, :policies])
+
+    missing_mrfs =
+      Enum.reduce(mrfs, [], fn x, acc ->
+        if Code.ensure_compiled(x) do
+          acc
+        else
+          acc ++ [x]
+        end
+      end)
+
+    if Enum.empty?(missing_mrfs) do
+      :ok
+    else
+      {:error, "The following MRF modules are configured but missing: #{inspect(missing_mrfs)}"}
+    end
+  end
+
+  defp check_mrfs(result), do: result
 end

lib/pleroma/constants.ex

@@ -9,7 +9,6 @@ defmodule Pleroma.Constants do
 
   const(object_internal_fields,
     do: [
-      "actor",
       "reactions",
       "reaction_count",
       "likes",

test/fixtures/create-chat-message.json

@@ -1,10 +1,10 @@
 {
-  "actor": "http://mastodon.example.org/users/admin",
+  "actor": "http://2hu.gensokyo/users/raymoo",
-  "id": "http://mastodon.example.org/objects/1",
+  "id": "http://2hu.gensokyo/objects/1",
   "object": {
-    "attributedTo": "http://mastodon.example.org/users/admin",
+    "attributedTo": "http://2hu.gensokyo/users/raymoo",
     "content": "You expected a cute girl? Too bad. <script>alert('XSS')</script>",
-    "id": "http://mastodon.example.org/objects/2",
+    "id": "http://2hu.gensokyo/objects/2",
     "published": "2020-02-12T14:08:20Z",
     "to": [
       "http://2hu.gensokyo/users/marisa"

test/pleroma/user/backup_test.exs

@@ -221,6 +221,7 @@ test "it creates a zip archive with user data" do
              "orderedItems" => [
                %{
                  "object" => %{
+                   "actor" => "http://cofe.io/users/cofe",
                    "content" => "status1",
                    "type" => "Note"
                  },
@@ -228,6 +229,7 @@ test "it creates a zip archive with user data" do
                },
                %{
                  "object" => %{
+                   "actor" => "http://cofe.io/users/cofe",
                    "content" => "status2"
                  }
                },

test/pleroma/web/activity_pub/transmogrifier/chat_message_test.exs

@@ -116,6 +116,8 @@ test "it fetches the actor if they aren't in our system" do
       data =
         File.read!("test/fixtures/create-chat-message.json")
         |> Jason.decode!()
+        |> Map.put("actor", "http://mastodon.example.org/users/admin")
+        |> put_in(["object", "actor"], "http://mastodon.example.org/users/admin")
 
       _recipient = insert(:user, ap_id: List.first(data["to"]), local: true)
 

test/pleroma/web/activity_pub/transmogrifier_test.exs

@@ -169,7 +169,7 @@ test "it inlines private announced objects" do
       {:ok, modified} = Transmogrifier.prepare_outgoing(announce_activity.data)
 
       assert modified["object"]["content"] == "hey"
-      assert activity.actor == modified["object"]["attributedTo"]
+      assert modified["object"]["actor"] == modified["object"]["attributedTo"]
     end
 
     test "it turns mentions into tags" do
@@ -220,7 +220,7 @@ test "it sets the 'attributedTo' property to the actor of the object if it doesn
       {:ok, activity} = CommonAPI.post(user, %{status: "hey"})
       {:ok, modified} = Transmogrifier.prepare_outgoing(activity.data)
 
-      assert activity.actor == modified["object"]["attributedTo"]
+      assert modified["object"]["actor"] == modified["object"]["attributedTo"]
     end
 
     test "it strips internal hashtag data" do
@@ -266,7 +266,6 @@ test "it strips internal fields" do
       assert is_nil(modified["object"]["announcements"])
       assert is_nil(modified["object"]["announcement_count"])
       assert is_nil(modified["object"]["generator"])
-      assert is_nil(modified["object"]["actor"])
     end
 
     test "it strips internal fields of article" do