Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
ce6d4914
Commit
ce6d4914
authored
7 years ago
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Correctly wire in update group profile over federation
parent
1de55797
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
synapse/federation/transport/client.py
+20
-0
20 additions, 0 deletions
synapse/federation/transport/client.py
synapse/federation/transport/server.py
+11
-11
11 additions, 11 deletions
synapse/federation/transport/server.py
with
31 additions
and
11 deletions
synapse/federation/transport/client.py
+
20
−
0
View file @
ce6d4914
...
@@ -485,6 +485,26 @@ class TransportLayerClient(object):
...
@@ -485,6 +485,26 @@ class TransportLayerClient(object):
ignore_backoff
=
True
,
ignore_backoff
=
True
,
)
)
@log_function
def
update_group_profile
(
self
,
destination
,
group_id
,
requester_user_id
,
content
):
"""
Update a remote group profile
Args:
destination (str)
group_id (str)
requester_user_id (str)
content (dict): The new profile of the group
"""
path
=
PREFIX
+
"
/groups/%s/profile
"
%
(
group_id
,)
return
self
.
client
.
post_json
(
destination
=
destination
,
path
=
path
,
args
=
{
"
requester_user_id
"
:
requester_user_id
},
data
=
content
,
ignore_backoff
=
True
,
)
@log_function
@log_function
def
get_group_summary
(
self
,
destination
,
group_id
,
requester_user_id
):
def
get_group_summary
(
self
,
destination
,
group_id
,
requester_user_id
):
"""
Get a group summary
"""
Get a group summary
...
...
This diff is collapsed.
Click to expand it.
synapse/federation/transport/server.py
+
11
−
11
View file @
ce6d4914
...
@@ -610,7 +610,7 @@ class FederationVersionServlet(BaseFederationServlet):
...
@@ -610,7 +610,7 @@ class FederationVersionServlet(BaseFederationServlet):
class
FederationGroupsProfileServlet
(
BaseFederationServlet
):
class
FederationGroupsProfileServlet
(
BaseFederationServlet
):
"""
Get the basic profile of a group on behalf of a user
"""
Get
/set
the basic profile of a group on behalf of a user
"""
"""
PATH
=
"
/groups/(?P<group_id>[^/]*)/profile$
"
PATH
=
"
/groups/(?P<group_id>[^/]*)/profile$
"
...
@@ -626,30 +626,30 @@ class FederationGroupsProfileServlet(BaseFederationServlet):
...
@@ -626,30 +626,30 @@ class FederationGroupsProfileServlet(BaseFederationServlet):
defer
.
returnValue
((
200
,
new_content
))
defer
.
returnValue
((
200
,
new_content
))
class
FederationGroupsSummaryServlet
(
BaseFederationServlet
):
PATH
=
"
/groups/(?P<group_id>[^/]*)/summary$
"
@defer.inlineCallbacks
@defer.inlineCallbacks
def
on_
GE
T
(
self
,
origin
,
content
,
query
,
group_id
):
def
on_
POS
T
(
self
,
origin
,
content
,
query
,
group_id
):
requester_user_id
=
parse_string_from_args
(
query
,
"
requester_user_id
"
)
requester_user_id
=
parse_string_from_args
(
query
,
"
requester_user_id
"
)
if
get_domain_from_id
(
requester_user_id
)
!=
origin
:
if
get_domain_from_id
(
requester_user_id
)
!=
origin
:
raise
SynapseError
(
403
,
"
requester_user_id doesn
'
t match origin
"
)
raise
SynapseError
(
403
,
"
requester_user_id doesn
'
t match origin
"
)
new_content
=
yield
self
.
handler
.
get
_group_
summary
(
new_content
=
yield
self
.
handler
.
update
_group_
profile
(
group_id
,
requester_user_id
group_id
,
requester_user_id
,
content
)
)
defer
.
returnValue
((
200
,
new_content
))
defer
.
returnValue
((
200
,
new_content
))
class
FederationGroupsSummaryServlet
(
BaseFederationServlet
):
PATH
=
"
/groups/(?P<group_id>[^/]*)/summary$
"
@defer.inlineCallbacks
@defer.inlineCallbacks
def
on_
POS
T
(
self
,
origin
,
content
,
query
,
group_id
):
def
on_
GE
T
(
self
,
origin
,
content
,
query
,
group_id
):
requester_user_id
=
parse_string_from_args
(
query
,
"
requester_user_id
"
)
requester_user_id
=
parse_string_from_args
(
query
,
"
requester_user_id
"
)
if
get_domain_from_id
(
requester_user_id
)
!=
origin
:
if
get_domain_from_id
(
requester_user_id
)
!=
origin
:
raise
SynapseError
(
403
,
"
requester_user_id doesn
'
t match origin
"
)
raise
SynapseError
(
403
,
"
requester_user_id doesn
'
t match origin
"
)
new_content
=
yield
self
.
handler
.
update
_group_
profile
(
new_content
=
yield
self
.
handler
.
get
_group_
summary
(
group_id
,
requester_user_id
,
content
group_id
,
requester_user_id
)
)
defer
.
returnValue
((
200
,
new_content
))
defer
.
returnValue
((
200
,
new_content
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment