diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-08 14:37:15 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-08 14:37:15 +0000 |
commit | dc63aaf84f07a6f8042f43617d8ec356fed85cec (patch) | |
tree | 5d12a05bce5dc1a23736fd37e7ca8c64580acd34 /lib/pleroma/web/activity_pub/object_validators/delete_validator.ex | |
parent | b221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (diff) | |
parent | 0910777d41f8b4b3096c35c5fc97fc357e5d8c8c (diff) |
Merge branch 'release/2.4.0' into 'stable'v2.4.0
Release/2.4.0
See merge request pleroma/pleroma!3493
Diffstat (limited to 'lib/pleroma/web/activity_pub/object_validators/delete_validator.ex')
-rw-r--r-- | lib/pleroma/web/activity_pub/object_validators/delete_validator.ex | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/object_validators/delete_validator.ex b/lib/pleroma/web/activity_pub/object_validators/delete_validator.ex index fc1a79a72..05f93da82 100644 --- a/lib/pleroma/web/activity_pub/object_validators/delete_validator.ex +++ b/lib/pleroma/web/activity_pub/object_validators/delete_validator.ex @@ -7,6 +7,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.DeleteValidator do alias Pleroma.Activity alias Pleroma.EctoType.ActivityPub.ObjectValidators + alias Pleroma.User import Ecto.Changeset import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations @@ -53,11 +54,11 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.DeleteValidator do Tombstone Video } - def validate_data(cng) do + defp validate_data(cng) do cng |> validate_required([:id, :type, :actor, :to, :cc, :object]) |> validate_inclusion(:type, ["Delete"]) - |> validate_actor_presence() + |> validate_delete_actor(:actor) |> validate_modification_rights() |> validate_object_or_user_presence(allowed_types: @deletable_types) |> add_deleted_activity_id() @@ -72,4 +73,13 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.DeleteValidator do |> cast_data |> validate_data end + + defp validate_delete_actor(cng, field_name) do + validate_change(cng, field_name, fn field_name, actor -> + case User.get_cached_by_ap_id(actor) do + %User{} -> [] + _ -> [{field_name, "can't find user"}] + end + end) + end end |