Skip to content
Snippets Groups Projects
Unverified Commit d93ec0a0 authored by Andrew Morgan's avatar Andrew Morgan Committed by GitHub
Browse files

Partially revert #11602 to prevent webclient overriding client resource (#11764)

parent 4ec0a309
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
changelog.d/11764.bugfix 0 → 100644
+ 1
− 0
View file @ d93ec0a0
Fixes a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the 'webclient' resource enabled.
\ No newline at end of file
synapse/app/homeserver.py
+ 7
− 2
View file @ d93ec0a0
...@@ -27,7 +27,6 @@ import synapse ...@@ -27,7 +27,6 @@ import synapse
import synapse.config.logger import synapse.config.logger
from synapse import events from synapse import events
from synapse.api.urls import ( from synapse.api.urls import (
CLIENT_API_PREFIX,
FEDERATION_PREFIX, FEDERATION_PREFIX,
LEGACY_MEDIA_PREFIX, LEGACY_MEDIA_PREFIX,
MEDIA_R0_PREFIX, MEDIA_R0_PREFIX,
...@@ -193,7 +192,13 @@ class SynapseHomeServer(HomeServer): ...@@ -193,7 +192,13 @@ class SynapseHomeServer(HomeServer):
resources.update( resources.update(
{ {
CLIENT_API_PREFIX: client_resource, "/_matrix/client/api/v1": client_resource,
"/_matrix/client/r0": client_resource,
"/_matrix/client/v1": client_resource,
"/_matrix/client/v3": client_resource,
"/_matrix/client/unstable": client_resource,
"/_matrix/client/v2_alpha": client_resource,
"/_matrix/client/versions": client_resource,
"/.well-known": well_known_resource(self), "/.well-known": well_known_resource(self),
"/_synapse/admin": AdminRestResource(self), "/_synapse/admin": AdminRestResource(self),
**build_synapse_client_resource_tree(self), **build_synapse_client_resource_tree(self),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment