diff options
| author | Erik Johnston <erikj@jki.re> | 2018-04-06 12:11:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 12:11:16 +0100 |
| commit | 35ff941172bafe42f3ac5410d17931de78f27051 (patch) | |
| tree | 027d8c5199c03cefba9a7f1b8c1283dff1cc07da /synapse/federation | |
| parent | more verbosity in synctl (diff) | |
| parent | use PUT instead of POST for federating groups/m.join_policy (diff) | |
| download | synapse-35ff941172bafe42f3ac5410d17931de78f27051.tar.xz | |
Merge pull request #3070 from krombel/group_join_put_instead_post
use PUT instead of POST for federating groups/m.join_policy
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/transport/client.py | 2 | ||||
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 1fe162d55b..3beab47832 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -864,7 +864,7 @@ class TransportLayerClient(object): """ path = PREFIX + "/groups/%s/settings/m.join_policy" % (group_id,) - return self.client.post_json( + return self.client.put_json( destination=destination, path=path, args={"requester_user_id": requester_user_id}, diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 3658ca75f3..b98e30459c 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -1131,7 +1131,7 @@ class FederationGroupsSettingJoinPolicyServlet(BaseFederationServlet): PATH = "/groups/(?P<group_id>[^/]*)/settings/m.join_policy$" @defer.inlineCallbacks - def on_POST(self, origin, content, query, group_id): + def on_PUT(self, origin, content, query, group_id): requester_user_id = parse_string_from_args(query, "requester_user_id") if get_domain_from_id(requester_user_id) != origin: raise SynapseError(403, "requester_user_id doesn't match origin") |