mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-14 16:03:51 +01:00
Make federation use resource_for_federation as well.
This commit is contained in:
parent
9f863d3466
commit
29aa13f0d4
4 changed files with 5 additions and 49 deletions
|
@ -27,6 +27,7 @@ from twisted.web.server import Site
|
||||||
from synapse.http.server import TwistedHttpServer, JsonResource
|
from synapse.http.server import TwistedHttpServer, JsonResource
|
||||||
from synapse.http.client import TwistedHttpClient
|
from synapse.http.client import TwistedHttpClient
|
||||||
from synapse.rest.base import CLIENT_PREFIX
|
from synapse.rest.base import CLIENT_PREFIX
|
||||||
|
from synapse.federation.transport import PREFIX
|
||||||
|
|
||||||
from daemonize import Daemonize
|
from daemonize import Daemonize
|
||||||
|
|
||||||
|
@ -94,7 +95,8 @@ class SynapseHomeServer(HomeServer):
|
||||||
"""
|
"""
|
||||||
desired_tree = ( # list of tuples containing (path_str, Resource)
|
desired_tree = ( # list of tuples containing (path_str, Resource)
|
||||||
("/matrix/client", self.get_resource_for_web_client()),
|
("/matrix/client", self.get_resource_for_web_client()),
|
||||||
(CLIENT_PREFIX, self.get_resource_for_client())
|
(CLIENT_PREFIX, self.get_resource_for_client()),
|
||||||
|
(PREFIX, self.get_resource_for_federation())
|
||||||
)
|
)
|
||||||
|
|
||||||
self.root_resource = Resource()
|
self.root_resource = Resource()
|
||||||
|
|
|
@ -23,7 +23,7 @@ from .transport import TransportLayer
|
||||||
def initialize_http_replication(homeserver):
|
def initialize_http_replication(homeserver):
|
||||||
transport = TransportLayer(
|
transport = TransportLayer(
|
||||||
homeserver.hostname,
|
homeserver.hostname,
|
||||||
server=homeserver.get_http_server(),
|
server=homeserver.get_resource_for_federation(),
|
||||||
client=homeserver.get_http_client()
|
client=homeserver.get_http_client()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -15,8 +15,7 @@
|
||||||
|
|
||||||
|
|
||||||
from . import (
|
from . import (
|
||||||
room, events, register, login, profile, public, presence, im, directory,
|
room, events, register, login, profile, public, presence, im, directory
|
||||||
webclient
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright 2014 matrix.org
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
from synapse.rest.base import RestServlet
|
|
||||||
|
|
||||||
import logging
|
|
||||||
import re
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class WebClientRestServlet(RestServlet):
|
|
||||||
# No PATTERN; we have custom dispatch rules here
|
|
||||||
|
|
||||||
def register(self, http_server):
|
|
||||||
http_server.register_path("GET",
|
|
||||||
re.compile("^/$"),
|
|
||||||
self.on_GET_redirect)
|
|
||||||
http_server.register_path("GET",
|
|
||||||
re.compile("^/matrix/client$"),
|
|
||||||
self.on_GET)
|
|
||||||
|
|
||||||
def on_GET(self, request):
|
|
||||||
return (200, "not implemented")
|
|
||||||
|
|
||||||
def on_GET_redirect(self, request):
|
|
||||||
request.setHeader("Location", request.uri + "matrix/client")
|
|
||||||
return (302, None)
|
|
||||||
|
|
||||||
|
|
||||||
def register_servlets(hs, http_server):
|
|
||||||
logger.info("Registering web client.")
|
|
||||||
WebClientRestServlet(hs).register(http_server)
|
|
Loading…
Reference in a new issue