projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/user_update_and_set_cache' into 'develop'
[akkoma]
/
lib
/
pleroma
/
object
/
containment.ex
diff --git
a/lib/pleroma/object/containment.ex
b/lib/pleroma/object/containment.ex
index 010b768bd02cc0c3a69ac36bb9ab26d1e2dcdf67..f077a9f32436841f1ffb01975c970d3082fd80a7 100644
(file)
--- a/
lib/pleroma/object/containment.ex
+++ b/
lib/pleroma/object/containment.ex
@@
-1,7
+1,9
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Object.Containment do
@moduledoc """
defmodule Pleroma.Object.Containment do
@moduledoc """
- # Object Containment
-
This module contains some useful functions for containing objects to specific
origins and determining those origins. They previously lived in the
ActivityPub `Transmogrifier` module.
This module contains some useful functions for containing objects to specific
origins and determining those origins. They previously lived in the
ActivityPub `Transmogrifier` module.
@@
-9,9
+11,6
@@
defmodule Pleroma.Object.Containment do
Object containment is an important step in validating remote objects to prevent
spoofing, therefore removal of object containment functions is NOT recommended.
"""
Object containment is an important step in validating remote objects to prevent
spoofing, therefore removal of object containment functions is NOT recommended.
"""
-
- require Logger
-
def get_actor(%{"actor" => actor}) when is_binary(actor) do
actor
end
def get_actor(%{"actor" => actor}) when is_binary(actor) do
actor
end
@@
-36,9
+35,9
@@
defmodule Pleroma.Object.Containment do
@doc """
Checks that an imported AP object's actor matches the domain it came from.
"""
@doc """
Checks that an imported AP object's actor matches the domain it came from.
"""
- def contain_origin(id, %{"actor" => nil}), do: :error
+ def contain_origin(
_
id, %{"actor" => nil}), do: :error
- def contain_origin(id, %{"actor" => actor} = params) do
+ def contain_origin(id, %{"actor" =>
_
actor} = params) do
id_uri = URI.parse(id)
actor_uri = URI.parse(get_actor(params))
id_uri = URI.parse(id)
actor_uri = URI.parse(get_actor(params))
@@
-49,9
+48,12
@@
defmodule Pleroma.Object.Containment do
end
end
end
end
- def contain_origin_from_id(id, %{"id" => nil}), do: :error
+ def contain_origin(id, %{"attributedTo" => actor} = params),
+ do: contain_origin(id, Map.put(params, "actor", actor))
- def contain_origin_from_id(id, %{"id" => other_id} = params) do
+ def contain_origin_from_id(_id, %{"id" => nil}), do: :error
+
+ def contain_origin_from_id(id, %{"id" => other_id} = _params) do
id_uri = URI.parse(id)
other_uri = URI.parse(other_id)
id_uri = URI.parse(id)
other_uri = URI.parse(other_id)
@@
-61,4
+63,9
@@
defmodule Pleroma.Object.Containment do
:error
end
end
:error
end
end
+
+ def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}),
+ do: contain_origin(id, object)
+
+ def contain_child(_), do: :ok
end
end