mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-22 14:04:00 +01:00
e4f545c452
* Add master to the instance_map as part of Complement, have ReplicationEndpoint look at instance_map for master. * Fix typo in drive by. * Remove unnecessary worker_replication_* bits from unit tests and add master to instance_map(hopefully in the right place) * Several updates: 1. Switch from master to main for naming the main process in the instance_map. Add useful constants for easier adjustment of names in the future. 2. Add backwards compatibility for worker_replication_* to allow time to transition to new style. Make sure to prioritize declaring main directly on the instance_map. 3. Clean up old comments/commented out code. 4. Adjust unit tests to match with new code. 5. Adjust Complement setup infrastructure to only add main to the instance_map if workers are used and remove now unused options from the worker.yaml template. * Initial Docs upload * Changelog * Missed some commented out code that can go now * Remove TODO comment that no longer holds true. * Fix links in docs * More docs * Remove debug logging * Apply suggestions from code review Co-authored-by: reivilibre <olivier@librepush.net> * Apply suggestions from code review Co-authored-by: reivilibre <olivier@librepush.net> * Update version to latest, include completeish before/after examples in upgrade notes. * Fix up and docs too --------- Co-authored-by: reivilibre <olivier@librepush.net>
94 lines
3.2 KiB
Python
94 lines
3.2 KiB
Python
# Copyright 2020 The Matrix.org Foundation C.I.C.
|
|
#
|
|
# 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.
|
|
import logging
|
|
|
|
from synapse.rest.client import register
|
|
|
|
from tests.replication._base import BaseMultiWorkerStreamTestCase
|
|
from tests.server import make_request
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
|
|
"""Test using one or more generic workers for registration."""
|
|
|
|
servlets = [register.register_servlets]
|
|
|
|
def _get_worker_hs_config(self) -> dict:
|
|
config = self.default_config()
|
|
config["worker_app"] = "synapse.app.generic_worker"
|
|
return config
|
|
|
|
def test_register_single_worker(self) -> None:
|
|
"""Test that registration works when using a single generic worker."""
|
|
worker_hs = self.make_worker_hs("synapse.app.generic_worker")
|
|
site = self._hs_to_site[worker_hs]
|
|
|
|
channel_1 = make_request(
|
|
self.reactor,
|
|
site,
|
|
"POST",
|
|
"register",
|
|
{"username": "user", "type": "m.login.password", "password": "bar"},
|
|
)
|
|
self.assertEqual(channel_1.code, 401)
|
|
|
|
# Grab the session
|
|
session = channel_1.json_body["session"]
|
|
|
|
# also complete the dummy auth
|
|
channel_2 = make_request(
|
|
self.reactor,
|
|
site,
|
|
"POST",
|
|
"register",
|
|
{"auth": {"session": session, "type": "m.login.dummy"}},
|
|
)
|
|
self.assertEqual(channel_2.code, 200)
|
|
|
|
# We're given a registered user.
|
|
self.assertEqual(channel_2.json_body["user_id"], "@user:test")
|
|
|
|
def test_register_multi_worker(self) -> None:
|
|
"""Test that registration works when using multiple generic workers."""
|
|
worker_hs_1 = self.make_worker_hs("synapse.app.generic_worker")
|
|
worker_hs_2 = self.make_worker_hs("synapse.app.generic_worker")
|
|
|
|
site_1 = self._hs_to_site[worker_hs_1]
|
|
channel_1 = make_request(
|
|
self.reactor,
|
|
site_1,
|
|
"POST",
|
|
"register",
|
|
{"username": "user", "type": "m.login.password", "password": "bar"},
|
|
)
|
|
self.assertEqual(channel_1.code, 401)
|
|
|
|
# Grab the session
|
|
session = channel_1.json_body["session"]
|
|
|
|
# also complete the dummy auth
|
|
site_2 = self._hs_to_site[worker_hs_2]
|
|
channel_2 = make_request(
|
|
self.reactor,
|
|
site_2,
|
|
"POST",
|
|
"register",
|
|
{"auth": {"session": session, "type": "m.login.dummy"}},
|
|
)
|
|
self.assertEqual(channel_2.code, 200)
|
|
|
|
# We're given a registered user.
|
|
self.assertEqual(channel_2.json_body["user_id"], "@user:test")
|