CreateChatMessageValidator: Validate object existence
This commit is contained in:
parent
6aa116eca7
commit
abd0928229
2 changed files with 29 additions and 1 deletions
|
@ -5,10 +5,10 @@
|
||||||
# NOTES
|
# NOTES
|
||||||
# - Can probably be a generic create validator
|
# - Can probably be a generic create validator
|
||||||
# - doesn't embed, will only get the object id
|
# - doesn't embed, will only get the object id
|
||||||
# - object has to be validated first, maybe with some meta info from the surrounding create
|
|
||||||
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateChatMessageValidator do
|
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateChatMessageValidator do
|
||||||
use Ecto.Schema
|
use Ecto.Schema
|
||||||
|
|
||||||
|
alias Pleroma.Object
|
||||||
alias Pleroma.Web.ActivityPub.ObjectValidators.Types
|
alias Pleroma.Web.ActivityPub.ObjectValidators.Types
|
||||||
|
|
||||||
import Ecto.Changeset
|
import Ecto.Changeset
|
||||||
|
@ -43,6 +43,18 @@ def validate_data(cng, meta \\ []) do
|
||||||
|> validate_required([:id, :actor, :to, :type, :object])
|
|> validate_required([:id, :actor, :to, :type, :object])
|
||||||
|> validate_inclusion(:type, ["Create"])
|
|> validate_inclusion(:type, ["Create"])
|
||||||
|> validate_recipients_match(meta)
|
|> validate_recipients_match(meta)
|
||||||
|
|> validate_object_nonexistence()
|
||||||
|
end
|
||||||
|
|
||||||
|
def validate_object_nonexistence(cng) do
|
||||||
|
cng
|
||||||
|
|> validate_change(:object, fn :object, object_id ->
|
||||||
|
if Object.get_cached_by_ap_id(object_id) do
|
||||||
|
[{:object, "The object to create already exists"}]
|
||||||
|
else
|
||||||
|
[]
|
||||||
|
end
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate_recipients_match(cng, meta) do
|
def validate_recipients_match(cng, meta) do
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
defmodule Pleroma.Web.ActivityPub.ObjectValidatorTest do
|
defmodule Pleroma.Web.ActivityPub.ObjectValidatorTest do
|
||||||
use Pleroma.DataCase
|
use Pleroma.DataCase
|
||||||
|
|
||||||
|
alias Pleroma.Object
|
||||||
alias Pleroma.Web.ActivityPub.Builder
|
alias Pleroma.Web.ActivityPub.Builder
|
||||||
alias Pleroma.Web.ActivityPub.ObjectValidator
|
alias Pleroma.Web.ActivityPub.ObjectValidator
|
||||||
alias Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator
|
alias Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator
|
||||||
|
@ -9,6 +10,21 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidatorTest do
|
||||||
|
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
describe "chat message create activities" do
|
||||||
|
test "it is invalid if the object already exists" do
|
||||||
|
user = insert(:user)
|
||||||
|
recipient = insert(:user)
|
||||||
|
{:ok, activity} = CommonAPI.post_chat_message(user, recipient, "hey")
|
||||||
|
object = Object.normalize(activity, false)
|
||||||
|
|
||||||
|
{:ok, create_data, _} = Builder.create(user, object.data["id"], [recipient.ap_id])
|
||||||
|
|
||||||
|
{:error, cng} = ObjectValidator.validate(create_data, [])
|
||||||
|
|
||||||
|
assert {:object, {"The object to create already exists", []}} in cng.errors
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe "chat messages" do
|
describe "chat messages" do
|
||||||
setup do
|
setup do
|
||||||
clear_config([:instance, :remote_limit])
|
clear_config([:instance, :remote_limit])
|
||||||
|
|
Loading…
Reference in a new issue