pleroma

commit: 0524e66a05170519d22a9bfc096440664ed1cfee
parent ce1c0f75cdde09243ed0f6983d3dff3458386f24
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Wed, 17 May 2023 19:04:51 +0000

Merge branch 'accept-tags-2.5' into 'develop'

TagValidator: Drop unrecognized Tag types

Closes #2952

See merge request pleroma/pleroma!3823
Diffstat:
M
lib/pleroma/web/activity_pub/object_validators/tag_validator.ex
6
++++++
A
test/fixtures/fep-e232.json
31
+++++++++++++++++++++++++++++++
M
test/pleroma/web/activity_pub/transmogrifier_test.exs
14
++++++++++++++

3 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/object_validators/tag_validator.ex b/lib/pleroma/web/activity_pub/object_validators/tag_validator.ex
@@ -68,6 +68,12 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.TagValidator do
     |> validate_required([:type, :name, :icon])
   end
 
+  def changeset(struct, %{"type" => _} = data) do
+    struct
+    |> cast(data, [])
+    |> Map.put(:action, :ignore)
+  end
+
   def icon_changeset(struct, data) do
     struct
     |> cast(data, [:type, :url])
diff --git a/test/fixtures/fep-e232.json b/test/fixtures/fep-e232.json
@@ -0,0 +1,31 @@
+{
+  "@context": "https://www.w3.org/ns/activitystreams",
+  "type": "Create",
+  "actor": "https://example.org/users/alice",
+  "object": {
+    "id": "https://example.org/objects/10",
+    "type": "Note",
+    "attributedTo": "https://example.org/users/alice",
+    "content": "<p>test <a href=\"https://example.org/objects/9\">https://example.org/objects/9</a></p>",
+    "published": "2022-10-01T21:30:05.211215Z",
+    "tag": [
+      {
+        "name": "@bob@example.net",
+        "type": "Mention",
+        "href": "https://example.net/users/bob"
+      },
+      {
+        "name": "https://example.org/objects/9",
+        "type": "Link",
+        "href": "https://example.org/objects/9",
+        "mediaType": "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""
+      }
+    ],
+    "to": [
+      "https://www.w3.org/ns/activitystreams#Public"
+    ],
+    "cc": [
+      "https://example.org/users/alice/followers"
+    ]
+  }
+}
diff --git a/test/pleroma/web/activity_pub/transmogrifier_test.exs b/test/pleroma/web/activity_pub/transmogrifier_test.exs
@@ -123,6 +123,20 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
 
       assert activity.data["context"] == object.data["context"]
     end
+
+    test "it drops link tags" do
+      insert(:user, ap_id: "https://example.org/users/alice")
+
+      message = File.read!("test/fixtures/fep-e232.json") |> Jason.decode!()
+
+      assert {:ok, activity} = Transmogrifier.handle_incoming(message)
+
+      object = Object.normalize(activity)
+      assert length(object.data["tag"]) == 1
+
+      tag = object.data["tag"] |> List.first()
+      assert tag["type"] == "Mention"
+    end
   end
 
   describe "prepare outgoing" do