projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e56779d
)
ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults
author
Haelwenn (lanodan) Monnier
<contact@hacktivis.me>
Thu, 10 Sep 2020 09:08:05 +0000
(11:08 +0200)
committer
Haelwenn (lanodan) Monnier
<contact@hacktivis.me>
Mon, 5 Apr 2021 17:19:11 +0000
(19:19 +0200)
lib/pleroma/ecto_type/activity_pub/object_validators/recipients.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/event_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
patch
|
blob
|
history
test/pleroma/ecto_type/activity_pub/object_validators/recipients_test.exs
patch
|
blob
|
history
test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
patch
|
blob
|
history
test/pleroma/web/activity_pub/transmogrifier/event_handling_test.exs
patch
|
blob
|
history
diff --git
a/lib/pleroma/ecto_type/activity_pub/object_validators/recipients.ex
b/lib/pleroma/ecto_type/activity_pub/object_validators/recipients.ex
index af4b0e52779524291822a94ec552d97e020e0a88..b76547e7580d5e7116d8d305e192d9ccd7193b9c 100644
(file)
--- a/
lib/pleroma/ecto_type/activity_pub/object_validators/recipients.ex
+++ b/
lib/pleroma/ecto_type/activity_pub/object_validators/recipients.ex
@@
-15,19
+15,23
@@
defmodule Pleroma.EctoType.ActivityPub.ObjectValidators.Recipients do
def cast(data) when is_list(data) do
data
def cast(data) when is_list(data) do
data
- |> Enum.reduce_while({:ok, []}, fn element, {:ok, list} ->
- case ObjectID.cast(element) do
- {:ok, id} ->
- {:cont, {:ok, [id | list]}}
-
- _ ->
- {:halt, :error}
- end
+ |> Enum.reduce_while({:ok, []}, fn
+ nil, {:ok, list} ->
+ {:cont, {:ok, list}}
+
+ element, {:ok, list} ->
+ case ObjectID.cast(element) do
+ {:ok, id} ->
+ {:cont, {:ok, [id | list]}}
+
+ _ ->
+ {:halt, {:error, element}}
+ end
end)
end
end)
end
- def cast(
_
) do
- :error
+ def cast(
data
) do
+ {:error, data}
end
def dump(data) do
end
def dump(data) do
diff --git
a/lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
index 39ef6dc293cc484bf0df9fbf306e155724c55a6e..d2026b5ea7619343024926cf0eeae9f557bff2b1 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/article_note_validator.ex
@@
-79,9
+79,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNoteValidator do
defp fix(data) do
data
defp fix(data) do
data
- |> CommonFixes.fix_defaults()
- |> CommonFixes.fix_attribution()
|> CommonFixes.fix_actor()
|> CommonFixes.fix_actor()
+ |> CommonFixes.fix_object_defaults()
|> fix_url()
|> Transmogrifier.fix_emoji()
end
|> fix_url()
|> Transmogrifier.fix_emoji()
end
diff --git
a/lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
index 8a5a605266d700d6ceb365db51fb0ed0664691af..8ee432947b7b9a80419bdc51e3d36916c7ff5698 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
@@
-120,9
+120,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AudioVideoValidator do
defp fix(data) do
data
defp fix(data) do
data
- |> CommonFixes.fix_defaults()
- |> CommonFixes.fix_attribution()
|> CommonFixes.fix_actor()
|> CommonFixes.fix_actor()
+ |> CommonFixes.fix_object_defaults()
|> Transmogrifier.fix_emoji()
|> fix_url()
|> fix_content()
|> Transmogrifier.fix_emoji()
|> fix_url()
|> fix_content()
diff --git
a/lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
b/lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
index 5f2c633bc21627f6bc5c475c3a0155bb0b772e37..950eb14945628256f171fa338078e9325c215d5f 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
@@
-3,26
+3,44
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CommonFixes do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CommonFixes do
+ alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object.Containment
alias Pleroma.Object.Containment
+ alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.ActivityPub.Utils
- # based on Pleroma.Web.ActivityPub.Utils.lazy_put_objects_defaults
- def fix_defaults(data) do
+ def fix_object_defaults(data) do
%{data: %{"id" => context}, id: context_id} =
Utils.create_context(data["context"] || data["conversation"])
%{data: %{"id" => context}, id: context_id} =
Utils.create_context(data["context"] || data["conversation"])
+ %User{follower_address: follower_collection} = User.get_cached_by_ap_id(data["attributedTo"])
+ {:ok, to} = ObjectValidators.Recipients.cast(data["to"] || [])
+ {:ok, cc} = ObjectValidators.Recipients.cast(data["cc"] || [])
+
data
|> Map.put("context", context)
|> Map.put("context_id", context_id)
data
|> Map.put("context", context)
|> Map.put("context_id", context_id)
+ |> Map.put("to", to)
+ |> Map.put("cc", cc)
+ |> Transmogrifier.fix_explicit_addressing(follower_collection)
+ |> Transmogrifier.fix_implicit_addressing(follower_collection)
end
end
- def fix_attribution(data) do
+ def fix_activity_defaults(data, meta) do
+ object = meta[:object_data] || %{}
+
data
data
- |> Map.put_new("actor", data["attributedTo"])
+ |> Map.put_new("to", object["to"] || [])
+ |> Map.put_new("cc", object["cc"] || [])
+ |> Map.put_new("bto", object["bto"] || [])
+ |> Map.put_new("bcc", object["bcc"] || [])
end
def fix_actor(data) do
end
def fix_actor(data) do
- actor = Containment.get_actor(data)
+ actor =
+ data
+ |> Map.put_new("actor", data["attributedTo"])
+ |> Containment.get_actor()
data
|> Map.put("actor", actor)
data
|> Map.put("actor", actor)
diff --git
a/lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
index e06e442f41a0bf49fc330ea57eccc06984f75b18..99e8dc6c7ac1884eb7cc1f1c314f9785c02891a9 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
@@
-62,21
+62,11
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
end
end
end
end
- defp fix_addressing(data, meta) do
- if object = meta[:object_data] do
- data
- |> Map.put_new("to", object["to"] || [])
- |> Map.put_new("cc", object["cc"] || [])
- else
- data
- end
- end
-
defp fix(data, meta) do
data
|> fix_context(meta)
defp fix(data, meta) do
data
|> fix_context(meta)
- |> fix_addressing(meta)
|> CommonFixes.fix_actor()
|> CommonFixes.fix_actor()
+ |> CommonFixes.fix_activity_defaults(meta)
end
defp validate_data(cng, meta) do
end
defp validate_data(cng, meta) do
diff --git
a/lib/pleroma/web/activity_pub/object_validators/event_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/event_validator.ex
index d42458ef5c063551be246376a177155a5ad10c4d..fee2e997afd967cc9bd63858c7503f65ee659f3d 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/event_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/event_validator.ex
@@
-72,8
+72,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.EventValidator do
defp fix(data) do
data
defp fix(data) do
data
- |> CommonFixes.fix_
defaults
()
- |> CommonFixes.fix_
attribution
()
+ |> CommonFixes.fix_
actor
()
+ |> CommonFixes.fix_
object_defaults
()
|> Transmogrifier.fix_emoji()
end
|> Transmogrifier.fix_emoji()
end
diff --git
a/lib/pleroma/web/activity_pub/object_validators/question_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/question_validator.ex
index 7012e2e1d922624b01f941527a6b51a9a56cf69c..083d08ec4e3ce93da3aecac14d3e42271b21fda4 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
@@
-83,8
+83,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionValidator do
defp fix(data) do
data
defp fix(data) do
data
- |> CommonFixes.fix_
defaults
()
- |> CommonFixes.fix_
attribution
()
+ |> CommonFixes.fix_
actor
()
+ |> CommonFixes.fix_
object_defaults
()
|> Transmogrifier.fix_emoji()
|> fix_closed()
end
|> Transmogrifier.fix_emoji()
|> fix_closed()
end
diff --git
a/test/pleroma/ecto_type/activity_pub/object_validators/recipients_test.exs
b/test/pleroma/ecto_type/activity_pub/object_validators/recipients_test.exs
index d3a2fd13f9f81843522ff52d17377325033bd133..ce8bef39f8c38c785125d51f6b3609cb1722f604 100644
(file)
--- a/
test/pleroma/ecto_type/activity_pub/object_validators/recipients_test.exs
+++ b/
test/pleroma/ecto_type/activity_pub/object_validators/recipients_test.exs
@@
-9,7
+9,7
@@
defmodule Pleroma.EctoType.ActivityPub.ObjectValidators.RecipientsTest do
test "it asserts that all elements of the list are object ids" do
list = ["https://lain.com/users/lain", "invalid"]
test "it asserts that all elements of the list are object ids" do
list = ["https://lain.com/users/lain", "invalid"]
- assert
:error
== Recipients.cast(list)
+ assert
{:error, "invalid"}
== Recipients.cast(list)
end
test "it works with a list" do
end
test "it works with a list" do
diff --git
a/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
b/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
index e733f167d0ec486fd46732d0da2e0ed198a50b49..032ad24b529253d527c7de661173a2b1929843e2 100644
(file)
--- a/
test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
+++ b/
test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
@@
-24,6
+24,8
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AudioHandlingTest do
"actor" => "http://mastodon.example.org/users/admin",
"object" => %{
"type" => "Audio",
"actor" => "http://mastodon.example.org/users/admin",
"object" => %{
"type" => "Audio",
+ "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+ "cc" => [],
"id" => "http://mastodon.example.org/users/admin/listens/1234",
"attributedTo" => "http://mastodon.example.org/users/admin",
"title" => "lain radio episode 1",
"id" => "http://mastodon.example.org/users/admin/listens/1234",
"attributedTo" => "http://mastodon.example.org/users/admin",
"title" => "lain radio episode 1",
@@
-61,7
+63,9
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.AudioHandlingTest do
assert object.data["to"] == ["https://www.w3.org/ns/activitystreams#Public"]
assert object.data["to"] == ["https://www.w3.org/ns/activitystreams#Public"]
- assert object.data["cc"] == []
+ assert object.data["cc"] == [
+ "https://channels.tests.funkwhale.audio/federation/actors/compositions/followers"
+ ]
assert object.data["url"] == "https://channels.tests.funkwhale.audio/library/tracks/74"
assert object.data["url"] == "https://channels.tests.funkwhale.audio/library/tracks/74"
diff --git
a/test/pleroma/web/activity_pub/transmogrifier/event_handling_test.exs
b/test/pleroma/web/activity_pub/transmogrifier/event_handling_test.exs
index c4879fda1b09665678bc537d364c47f9cc87d08e..14f5f704ad274235c2827b62bf1a2d9df8aa6abd 100644
(file)
--- a/
test/pleroma/web/activity_pub/transmogrifier/event_handling_test.exs
+++ b/
test/pleroma/web/activity_pub/transmogrifier/event_handling_test.exs
@@
-31,7
+31,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.EventHandlingTest do
)
assert object.data["to"] == ["https://www.w3.org/ns/activitystreams#Public"]
)
assert object.data["to"] == ["https://www.w3.org/ns/activitystreams#Public"]
- assert object.data["cc"] == []
+ assert object.data["cc"] == [
"https://mobilizon.org/@tcit/followers"
]
assert object.data["url"] ==
"https://mobilizon.org/events/252d5816-00a3-4a89-a66f-15bf65c33e39"
assert object.data["url"] ==
"https://mobilizon.org/events/252d5816-00a3-4a89-a66f-15bf65c33e39"