Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
pleroma
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
403
Issues
403
List
Boards
Labels
Service Desk
Milestones
Merge Requests
59
Merge Requests
59
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Pleroma
pleroma
Commits
e99fdfc3
Commit
e99fdfc3
authored
Oct 18, 2019
by
kaniini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
object: containment: only allow OStatus references in test suite environment
parent
a8eb1f09
Pipeline
#18811
failed with stages
in 7 minutes and 6 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
12 deletions
+19
-12
lib/pleroma/object/containment.ex
lib/pleroma/object/containment.ex
+19
-12
No files found.
lib/pleroma/object/containment.ex
View file @
e99fdfc3
...
...
@@ -32,6 +32,23 @@ def get_actor(%{"actor" => nil, "attributedTo" => actor}) when not is_nil(actor)
get_actor
(%{
"actor"
=>
actor
})
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
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
end
defp
compare_uris
(
_
,
_
),
do
:
:error
@doc
"""
Checks that an imported AP object's actor matches the domain it came from.
"""
...
...
@@ -41,11 +58,7 @@ def contain_origin(id, %{"actor" => _actor} = params) do
id_uri
=
URI
.
parse
(
id
)
actor_uri
=
URI
.
parse
(
get_actor
(
params
))
if
id_uri
.
host
==
actor_uri
.
host
||
id_uri
.
scheme
==
"tag"
do
:ok
else
:error
end
compare_uris
(
actor_uri
,
id_uri
)
end
def
contain_origin
(
id
,
%{
"attributedTo"
=>
actor
}
=
params
),
...
...
@@ -57,13 +70,7 @@ def contain_origin_from_id(id, %{"id" => other_id} = _params) do
id_uri
=
URI
.
parse
(
id
)
other_uri
=
URI
.
parse
(
other_id
)
# We explicitly allow 'tag' URIs through, due to legacy OStatus objects
# being present in the ActivityPub network.
if
id_uri
.
host
==
other_uri
.
host
||
other_uri
.
scheme
==
"tag"
do
:ok
else
:error
end
compare_uris
(
id_uri
,
other_uri
)
end
def
contain_child
(%{
"object"
=>
%{
"id"
=>
id
,
"attributedTo"
=>
_
}
=
object
}),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment