diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-06-15 07:45:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 07:45:14 -0400 |
| commit | 9e5ab6dd581389271b817d256e2fca113614a080 (patch) | |
| tree | 4dff895ddffda0c5935a1a67ac812dc9cc2c21a7 /synapse/rest | |
| parent | Fix 'ip_range_whitelist' not working for federation servers (#10115) (diff) | |
| download | synapse-9e5ab6dd581389271b817d256e2fca113614a080.tar.xz | |
Remove the experimental flag for knocking and use stable prefixes / endpoints. (#10167)
* Room version 7 for knocking. * Stable prefixes and endpoints (both client and federation) for knocking. * Removes the experimental configuration flag.
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/__init__.py | 5 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/knock.py | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index 138411ad19..d29f2fea5e 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -121,10 +121,7 @@ class ClientRestResource(JsonResource): account_validity.register_servlets(hs, client_resource) relations.register_servlets(hs, client_resource) password_policy.register_servlets(hs, client_resource) - - # Register msc2403 (knocking) servlets if the feature is enabled - if hs.config.experimental.msc2403_enabled: - knock.register_servlets(hs, client_resource) + knock.register_servlets(hs, client_resource) # moving to /_synapse/admin admin.register_servlets_for_client_rest_resource(hs, client_resource) diff --git a/synapse/rest/client/v2_alpha/knock.py b/synapse/rest/client/v2_alpha/knock.py index f046bf9cb3..7d1bc40658 100644 --- a/synapse/rest/client/v2_alpha/knock.py +++ b/synapse/rest/client/v2_alpha/knock.py @@ -39,12 +39,10 @@ logger = logging.getLogger(__name__) class KnockRoomAliasServlet(RestServlet): """ - POST /xyz.amorgan.knock/{roomIdOrAlias} + POST /knock/{roomIdOrAlias} """ - PATTERNS = client_patterns( - "/xyz.amorgan.knock/(?P<room_identifier>[^/]*)", releases=() - ) + PATTERNS = client_patterns("/knock/(?P<room_identifier>[^/]*)") def __init__(self, hs: "HomeServer"): super().__init__() |