projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue/2036-part-2' into 'develop'
[akkoma]
/
lib
/
pleroma
/
object
/
containment.ex
diff --git
a/lib/pleroma/object/containment.ex
b/lib/pleroma/object/containment.ex
index 1beb9c83df370a44b0d8f3cf6c70bfdedca3d5dd..bc88e8a0ca777865dd25ecd162e6966eacf38871 100644
(file)
--- a/
lib/pleroma/object/containment.ex
+++ b/
lib/pleroma/object/containment.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Object.Containment do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Object.Containment do
@@
-32,25
+32,30
@@
defmodule Pleroma.Object.Containment do
get_actor(%{"actor" => actor})
end
get_actor(%{"actor" => actor})
end
+ def get_object(%{"object" => id}) when is_binary(id) do
+ id
+ end
+
+ def get_object(%{"object" => %{"id" => id}}) when is_binary(id) do
+ id
+ end
+
+ def get_object(_) do
+ nil
+ end
+
# TODO: We explicitly allow 'tag' URIs through, due to references to legacy OStatus
# objects being present in the test suite environment. Once these objects are
# removed, please also remove this.
if Mix.env() == :test do
# TODO: We explicitly allow 'tag' URIs through, due to references to legacy OStatus
# objects being present in the test suite environment. Once these objects are
# removed, please also remove this.
if Mix.env() == :test do
- defp compare_uris(_, %URI{scheme: "tag" <> _}), do: :ok
- end
-
- defp compare_uris(%URI{} = id_uri, %URI{} = other_uri) do
- if id_uri.host == other_uri.host do
- :ok
- else
- :error
- end
+ defp compare_uris(_, %URI{scheme: "tag"}), do: :ok
end
end
- defp compare_uris(_, _), do: :error
+ defp compare_uris(%URI{host: host} = _id_uri, %URI{host: host} = _other_uri), do: :ok
+ defp compare_uris(_id_uri, _other_uri), do: :error
@doc """
@doc """
- Checks that an imported AP object's actor matches the
domain
it came from.
+ Checks that an imported AP object's actor matches the
host
it came from.
"""
def contain_origin(_id, %{"actor" => nil}), do: :error
"""
def contain_origin(_id, %{"actor" => nil}), do: :error
@@
-64,15
+69,17
@@
defmodule Pleroma.Object.Containment do
def contain_origin(id, %{"attributedTo" => actor} = params),
do: contain_origin(id, Map.put(params, "actor", actor))
def contain_origin(id, %{"attributedTo" => actor} = params),
do: contain_origin(id, Map.put(params, "actor", actor))
- def contain_origin
_from_id(_id, %{"id" => nil}
), do: :error
+ def contain_origin
(_id, _data
), do: :error
- def contain_origin_from_id(id, %{"id" => other_id} = _params) do
+ def contain_origin_from_id(id, %{"id" => other_id} = _params)
when is_binary(other_id)
do
id_uri = URI.parse(id)
other_uri = URI.parse(other_id)
compare_uris(id_uri, other_uri)
end
id_uri = URI.parse(id)
other_uri = URI.parse(other_id)
compare_uris(id_uri, other_uri)
end
+ def contain_origin_from_id(_id, _data), do: :error
+
def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}),
do: contain_origin(id, object)
def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}),
do: contain_origin(id, object)