Synapse 1.41.0 (2021-08-24)
===========================
This release adds support for Debian 12 (Bookworm), but **removes support for Ubuntu 20.10 (Groovy Gorilla)**, which reached End of Life last month.
Note that when using workers the `/_synapse/admin/v1/users/{userId}/media` must now be handled by media workers. See the [upgrade notes](https://matrix-org.github.io/synapse/latest/upgrade.html) for more information.
Features
--------
- Enable room capabilities ([MSC3244](https://github.com/matrix-org/matrix-doc/pull/3244)) by default and set room version 8 as the preferred room version when creating restricted rooms. ([\#10571](https://github.com/matrix-org/synapse/issues/10571))
Synapse 1.41.0rc1 (2021-08-18)
==============================
Features
--------
- Add `get_userinfo_by_id` method to ModuleApi. ([\#9581](https://github.com/matrix-org/synapse/issues/9581))
- Initial local support for [MSC3266](https://github.com/matrix-org/synapse/pull/10394), Room Summary over the unstable `/rooms/{roomIdOrAlias}/summary` API. ([\#10394](https://github.com/matrix-org/synapse/issues/10394))
- Experimental support for [MSC3288](https://github.com/matrix-org/matrix-doc/pull/3288), sending `room_type` to the identity server for 3pid invites over the `/store-invite` API. ([\#10435](https://github.com/matrix-org/synapse/issues/10435))
- Add support for sending federation requests through a proxy. Contributed by @Bubu and @dklimpel. See the [upgrade notes](https://matrix-org.github.io/synapse/latest/upgrade.html) for more information. ([\#10596](https://github.com/matrix-org/synapse/issues/10596)). ([\#10475](https://github.com/matrix-org/synapse/issues/10475))
- Add support for "marker" events which makes historical events discoverable for servers that already have all of the scrollback history (part of [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716)). ([\#10498](https://github.com/matrix-org/synapse/issues/10498))
- Add a configuration setting for the time a `/sync` response is cached for. ([\#10513](https://github.com/matrix-org/synapse/issues/10513))
- The default logging handler for new installations is now `PeriodicallyFlushingMemoryHandler`, a buffered logging handler which periodically flushes itself. ([\#10518](https://github.com/matrix-org/synapse/issues/10518))
- Add support for new redaction rules for historical events specified in [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716). ([\#10538](https://github.com/matrix-org/synapse/issues/10538))
- Add a setting to disable TLS when sending email. ([\#10546](https://github.com/matrix-org/synapse/issues/10546))
- Add pagination to the spaces summary based on updates to [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946). ([\#10549](https://github.com/matrix-org/synapse/issues/10549), [\#10560](https://github.com/matrix-org/synapse/issues/10560), [\#10569](https://github.com/matrix-org/synapse/issues/10569), [\#10574](https://github.com/matrix-org/synapse/issues/10574), [\#10575](https://github.com/matrix-org/synapse/issues/10575), [\#10579](https://github.com/matrix-org/synapse/issues/10579), [\#10583](https://github.com/matrix-org/synapse/issues/10583))
- Admin API to delete several media for a specific user. Contributed by @dklimpel. ([\#10558](https://github.com/matrix-org/synapse/issues/10558), [\#10628](https://github.com/matrix-org/synapse/issues/10628))
- Add support for routing `/createRoom` to workers. ([\#10564](https://github.com/matrix-org/synapse/issues/10564))
- Update the Synapse Grafana dashboard. ([\#10570](https://github.com/matrix-org/synapse/issues/10570))
- Add an admin API (`GET /_synapse/admin/username_available`) to check if a username is available (regardless of registration settings). ([\#10578](https://github.com/matrix-org/synapse/issues/10578))
- Allow editing a user's `external_ids` via the "Edit User" admin API. Contributed by @dklimpel. ([\#10598](https://github.com/matrix-org/synapse/issues/10598))
- The Synapse manhole no longer needs coroutines to be wrapped in `defer.ensureDeferred`. ([\#10602](https://github.com/matrix-org/synapse/issues/10602))
- Add option to allow modules to run periodic tasks on all instances, rather than just the one configured to run background tasks. ([\#10638](https://github.com/matrix-org/synapse/issues/10638))
Bugfixes
--------
- Add some clarification to the sample config file. Contributed by @Kentokamoto. ([\#10129](https://github.com/matrix-org/synapse/issues/10129))
- Fix a long-standing bug where protocols which are not implemented by any appservices were incorrectly returned via `GET /_matrix/client/r0/thirdparty/protocols`. ([\#10532](https://github.com/matrix-org/synapse/issues/10532))
- Fix exceptions in logs when failing to get remote room list. ([\#10541](https://github.com/matrix-org/synapse/issues/10541))
- Fix longstanding bug which caused the user's presence "status message" to be reset when the user went offline. Contributed by @dklimpel. ([\#10550](https://github.com/matrix-org/synapse/issues/10550))
- Allow public rooms to be previewed in the spaces summary APIs from [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946). ([\#10580](https://github.com/matrix-org/synapse/issues/10580))
- Fix a bug introduced in v1.37.1 where an error could occur in the asynchronous processing of PDUs when the queue was empty. ([\#10592](https://github.com/matrix-org/synapse/issues/10592))
- Fix errors on /sync when read receipt data is a string. Only affects homeservers with the experimental flag for [MSC2285](https://github.com/matrix-org/matrix-doc/pull/2285) enabled. Contributed by @SimonBrandner. ([\#10606](https://github.com/matrix-org/synapse/issues/10606))
- Additional validation for the spaces summary API to avoid errors like `ValueError: Stop argument for islice() must be None or an integer`. The missing validation has existed since v1.31.0. ([\#10611](https://github.com/matrix-org/synapse/issues/10611))
- Revert behaviour introduced in v1.38.0 that strips `org.matrix.msc2732.device_unused_fallback_key_types` from `/sync` when its value is empty. This field should instead always be present according to [MSC2732](https://github.com/matrix-org/matrix-doc/blob/master/proposals/2732-olm-fallback-keys.md). ([\#10623](https://github.com/matrix-org/synapse/issues/10623))
Improved Documentation
----------------------
- Add documentation for configuring a forward proxy. ([\#10443](https://github.com/matrix-org/synapse/issues/10443))
- Updated the reverse proxy documentation to highlight the homserver configuration that is needed to make Synapse aware that is is intentionally reverse proxied. ([\#10551](https://github.com/matrix-org/synapse/issues/10551))
- Update CONTRIBUTING.md to fix index links and the instructions for SyTest in docker. ([\#10599](https://github.com/matrix-org/synapse/issues/10599))
Deprecations and Removals
-------------------------
- No longer build `.deb` packages for Ubuntu 20.10 Groovy Gorilla, which has now EOLed. ([\#10588](https://github.com/matrix-org/synapse/issues/10588))
- The `template_dir` configuration settings in the `sso`, `account_validity` and `email` sections of the configuration file are now deprecated in favour of the global `templates.custom_template_directory` setting. See the [upgrade notes](https://matrix-org.github.io/synapse/latest/upgrade.html) for more information. ([\#10596](https://github.com/matrix-org/synapse/issues/10596))
Internal Changes
----------------
- Improve event caching mechanism to avoid having multiple copies of an event in memory at a time. ([\#10119](https://github.com/matrix-org/synapse/issues/10119))
- Reduce errors in PostgreSQL logs due to concurrent serialization errors. ([\#10504](https://github.com/matrix-org/synapse/issues/10504))
- Include room ID in ignored EDU log messages. Contributed by @ilmari. ([\#10507](https://github.com/matrix-org/synapse/issues/10507))
- Add pagination to the spaces summary based on updates to [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946). ([\#10527](https://github.com/matrix-org/synapse/issues/10527), [\#10530](https://github.com/matrix-org/synapse/issues/10530))
- Fix CI to not break when run against branches rather than pull requests. ([\#10529](https://github.com/matrix-org/synapse/issues/10529))
- Mark all events stemming from the [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) `/batch_send` endpoint as historical. ([\#10537](https://github.com/matrix-org/synapse/issues/10537))
- Clean up some of the federation event authentication code for clarity. ([\#10539](https://github.com/matrix-org/synapse/issues/10539), [\#10591](https://github.com/matrix-org/synapse/issues/10591))
- Convert `Transaction` and `Edu` objects to attrs. ([\#10542](https://github.com/matrix-org/synapse/issues/10542))
- Update `/batch_send` endpoint to only return `state_events` created by the `state_events_from_before` passed in. ([\#10552](https://github.com/matrix-org/synapse/issues/10552))
- Update contributing.md to warn against rebasing an open PR. ([\#10563](https://github.com/matrix-org/synapse/issues/10563))
- Remove the unused public rooms replication stream. ([\#10565](https://github.com/matrix-org/synapse/issues/10565))
- Clarify error message when failing to join a restricted room. ([\#10572](https://github.com/matrix-org/synapse/issues/10572))
- Remove references to BuildKite in favour of GitHub Actions. ([\#10573](https://github.com/matrix-org/synapse/issues/10573))
- Move `/batch_send` endpoint defined by [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) to the `/v2_alpha` directory. ([\#10576](https://github.com/matrix-org/synapse/issues/10576))
- Allow multiple custom directories in `read_templates`. ([\#10587](https://github.com/matrix-org/synapse/issues/10587))
- Re-organize the `synapse.federation.transport.server` module to create smaller files. ([\#10590](https://github.com/matrix-org/synapse/issues/10590))
- Flatten the `synapse.rest.client` package by moving the contents of `v1` and `v2_alpha` into the parent. ([\#10600](https://github.com/matrix-org/synapse/issues/10600))
- Build Debian packages for Debian 12 (Bookworm). ([\#10612](https://github.com/matrix-org/synapse/issues/10612))
- Fix up a couple of links to the database schema documentation. ([\#10620](https://github.com/matrix-org/synapse/issues/10620))
- Fix a broken link to the upgrade notes. ([\#10631](https://github.com/matrix-org/synapse/issues/10631))
476 lines
16 KiB
Python
476 lines
16 KiB
Python
# Copyright 2014-2016 OpenMarket Ltd
|
|
#
|
|
# 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 unittest.mock import Mock
|
|
|
|
import synapse
|
|
import synapse.api.errors
|
|
from synapse.api.constants import EventTypes
|
|
from synapse.config.room_directory import RoomDirectoryConfig
|
|
from synapse.rest.client import directory, login, room
|
|
from synapse.types import RoomAlias, create_requester
|
|
|
|
from tests import unittest
|
|
from tests.test_utils import make_awaitable
|
|
|
|
|
|
class DirectoryTestCase(unittest.HomeserverTestCase):
|
|
"""Tests the directory service."""
|
|
|
|
def make_homeserver(self, reactor, clock):
|
|
self.mock_federation = Mock()
|
|
self.mock_registry = Mock()
|
|
|
|
self.query_handlers = {}
|
|
|
|
def register_query_handler(query_type, handler):
|
|
self.query_handlers[query_type] = handler
|
|
|
|
self.mock_registry.register_query_handler = register_query_handler
|
|
|
|
hs = self.setup_test_homeserver(
|
|
federation_http_client=None,
|
|
resource_for_federation=Mock(),
|
|
federation_client=self.mock_federation,
|
|
federation_registry=self.mock_registry,
|
|
)
|
|
|
|
self.handler = hs.get_directory_handler()
|
|
|
|
self.store = hs.get_datastore()
|
|
|
|
self.my_room = RoomAlias.from_string("#my-room:test")
|
|
self.your_room = RoomAlias.from_string("#your-room:test")
|
|
self.remote_room = RoomAlias.from_string("#another:remote")
|
|
|
|
return hs
|
|
|
|
def test_get_local_association(self):
|
|
self.get_success(
|
|
self.store.create_room_alias_association(
|
|
self.my_room, "!8765qwer:test", ["test"]
|
|
)
|
|
)
|
|
|
|
result = self.get_success(self.handler.get_association(self.my_room))
|
|
|
|
self.assertEquals({"room_id": "!8765qwer:test", "servers": ["test"]}, result)
|
|
|
|
def test_get_remote_association(self):
|
|
self.mock_federation.make_query.return_value = make_awaitable(
|
|
{"room_id": "!8765qwer:test", "servers": ["test", "remote"]}
|
|
)
|
|
|
|
result = self.get_success(self.handler.get_association(self.remote_room))
|
|
|
|
self.assertEquals(
|
|
{"room_id": "!8765qwer:test", "servers": ["test", "remote"]}, result
|
|
)
|
|
self.mock_federation.make_query.assert_called_with(
|
|
destination="remote",
|
|
query_type="directory",
|
|
args={"room_alias": "#another:remote"},
|
|
retry_on_dns_fail=False,
|
|
ignore_backoff=True,
|
|
)
|
|
|
|
def test_incoming_fed_query(self):
|
|
self.get_success(
|
|
self.store.create_room_alias_association(
|
|
self.your_room, "!8765asdf:test", ["test"]
|
|
)
|
|
)
|
|
|
|
response = self.get_success(
|
|
self.handler.on_directory_query({"room_alias": "#your-room:test"})
|
|
)
|
|
|
|
self.assertEquals({"room_id": "!8765asdf:test", "servers": ["test"]}, response)
|
|
|
|
|
|
class TestCreateAlias(unittest.HomeserverTestCase):
|
|
servlets = [
|
|
synapse.rest.admin.register_servlets,
|
|
login.register_servlets,
|
|
room.register_servlets,
|
|
directory.register_servlets,
|
|
]
|
|
|
|
def prepare(self, reactor, clock, hs):
|
|
self.handler = hs.get_directory_handler()
|
|
|
|
# Create user
|
|
self.admin_user = self.register_user("admin", "pass", admin=True)
|
|
self.admin_user_tok = self.login("admin", "pass")
|
|
|
|
# Create a test room
|
|
self.room_id = self.helper.create_room_as(
|
|
self.admin_user, tok=self.admin_user_tok
|
|
)
|
|
|
|
self.test_alias = "#test:test"
|
|
self.room_alias = RoomAlias.from_string(self.test_alias)
|
|
|
|
# Create a test user.
|
|
self.test_user = self.register_user("user", "pass", admin=False)
|
|
self.test_user_tok = self.login("user", "pass")
|
|
self.helper.join(room=self.room_id, user=self.test_user, tok=self.test_user_tok)
|
|
|
|
def test_create_alias_joined_room(self):
|
|
"""A user can create an alias for a room they're in."""
|
|
self.get_success(
|
|
self.handler.create_association(
|
|
create_requester(self.test_user),
|
|
self.room_alias,
|
|
self.room_id,
|
|
)
|
|
)
|
|
|
|
def test_create_alias_other_room(self):
|
|
"""A user cannot create an alias for a room they're NOT in."""
|
|
other_room_id = self.helper.create_room_as(
|
|
self.admin_user, tok=self.admin_user_tok
|
|
)
|
|
|
|
self.get_failure(
|
|
self.handler.create_association(
|
|
create_requester(self.test_user),
|
|
self.room_alias,
|
|
other_room_id,
|
|
),
|
|
synapse.api.errors.SynapseError,
|
|
)
|
|
|
|
def test_create_alias_admin(self):
|
|
"""An admin can create an alias for a room they're NOT in."""
|
|
other_room_id = self.helper.create_room_as(
|
|
self.test_user, tok=self.test_user_tok
|
|
)
|
|
|
|
self.get_success(
|
|
self.handler.create_association(
|
|
create_requester(self.admin_user),
|
|
self.room_alias,
|
|
other_room_id,
|
|
)
|
|
)
|
|
|
|
|
|
class TestDeleteAlias(unittest.HomeserverTestCase):
|
|
servlets = [
|
|
synapse.rest.admin.register_servlets,
|
|
login.register_servlets,
|
|
room.register_servlets,
|
|
directory.register_servlets,
|
|
]
|
|
|
|
def prepare(self, reactor, clock, hs):
|
|
self.store = hs.get_datastore()
|
|
self.handler = hs.get_directory_handler()
|
|
self.state_handler = hs.get_state_handler()
|
|
|
|
# Create user
|
|
self.admin_user = self.register_user("admin", "pass", admin=True)
|
|
self.admin_user_tok = self.login("admin", "pass")
|
|
|
|
# Create a test room
|
|
self.room_id = self.helper.create_room_as(
|
|
self.admin_user, tok=self.admin_user_tok
|
|
)
|
|
|
|
self.test_alias = "#test:test"
|
|
self.room_alias = RoomAlias.from_string(self.test_alias)
|
|
|
|
# Create a test user.
|
|
self.test_user = self.register_user("user", "pass", admin=False)
|
|
self.test_user_tok = self.login("user", "pass")
|
|
self.helper.join(room=self.room_id, user=self.test_user, tok=self.test_user_tok)
|
|
|
|
def _create_alias(self, user):
|
|
# Create a new alias to this room.
|
|
self.get_success(
|
|
self.store.create_room_alias_association(
|
|
self.room_alias, self.room_id, ["test"], user
|
|
)
|
|
)
|
|
|
|
def test_delete_alias_not_allowed(self):
|
|
"""A user that doesn't meet the expected guidelines cannot delete an alias."""
|
|
self._create_alias(self.admin_user)
|
|
self.get_failure(
|
|
self.handler.delete_association(
|
|
create_requester(self.test_user), self.room_alias
|
|
),
|
|
synapse.api.errors.AuthError,
|
|
)
|
|
|
|
def test_delete_alias_creator(self):
|
|
"""An alias creator can delete their own alias."""
|
|
# Create an alias from a different user.
|
|
self._create_alias(self.test_user)
|
|
|
|
# Delete the user's alias.
|
|
result = self.get_success(
|
|
self.handler.delete_association(
|
|
create_requester(self.test_user), self.room_alias
|
|
)
|
|
)
|
|
self.assertEquals(self.room_id, result)
|
|
|
|
# Confirm the alias is gone.
|
|
self.get_failure(
|
|
self.handler.get_association(self.room_alias),
|
|
synapse.api.errors.SynapseError,
|
|
)
|
|
|
|
def test_delete_alias_admin(self):
|
|
"""A server admin can delete an alias created by another user."""
|
|
# Create an alias from a different user.
|
|
self._create_alias(self.test_user)
|
|
|
|
# Delete the user's alias as the admin.
|
|
result = self.get_success(
|
|
self.handler.delete_association(
|
|
create_requester(self.admin_user), self.room_alias
|
|
)
|
|
)
|
|
self.assertEquals(self.room_id, result)
|
|
|
|
# Confirm the alias is gone.
|
|
self.get_failure(
|
|
self.handler.get_association(self.room_alias),
|
|
synapse.api.errors.SynapseError,
|
|
)
|
|
|
|
def test_delete_alias_sufficient_power(self):
|
|
"""A user with a sufficient power level should be able to delete an alias."""
|
|
self._create_alias(self.admin_user)
|
|
|
|
# Increase the user's power level.
|
|
self.helper.send_state(
|
|
self.room_id,
|
|
"m.room.power_levels",
|
|
{"users": {self.test_user: 100}},
|
|
tok=self.admin_user_tok,
|
|
)
|
|
|
|
# They can now delete the alias.
|
|
result = self.get_success(
|
|
self.handler.delete_association(
|
|
create_requester(self.test_user), self.room_alias
|
|
)
|
|
)
|
|
self.assertEquals(self.room_id, result)
|
|
|
|
# Confirm the alias is gone.
|
|
self.get_failure(
|
|
self.handler.get_association(self.room_alias),
|
|
synapse.api.errors.SynapseError,
|
|
)
|
|
|
|
|
|
class CanonicalAliasTestCase(unittest.HomeserverTestCase):
|
|
"""Test modifications of the canonical alias when delete aliases."""
|
|
|
|
servlets = [
|
|
synapse.rest.admin.register_servlets,
|
|
login.register_servlets,
|
|
room.register_servlets,
|
|
directory.register_servlets,
|
|
]
|
|
|
|
def prepare(self, reactor, clock, hs):
|
|
self.store = hs.get_datastore()
|
|
self.handler = hs.get_directory_handler()
|
|
self.state_handler = hs.get_state_handler()
|
|
|
|
# Create user
|
|
self.admin_user = self.register_user("admin", "pass", admin=True)
|
|
self.admin_user_tok = self.login("admin", "pass")
|
|
|
|
# Create a test room
|
|
self.room_id = self.helper.create_room_as(
|
|
self.admin_user, tok=self.admin_user_tok
|
|
)
|
|
|
|
self.test_alias = "#test:test"
|
|
self.room_alias = self._add_alias(self.test_alias)
|
|
|
|
def _add_alias(self, alias: str) -> RoomAlias:
|
|
"""Add an alias to the test room."""
|
|
room_alias = RoomAlias.from_string(alias)
|
|
|
|
# Create a new alias to this room.
|
|
self.get_success(
|
|
self.store.create_room_alias_association(
|
|
room_alias, self.room_id, ["test"], self.admin_user
|
|
)
|
|
)
|
|
return room_alias
|
|
|
|
def _set_canonical_alias(self, content):
|
|
"""Configure the canonical alias state on the room."""
|
|
self.helper.send_state(
|
|
self.room_id,
|
|
"m.room.canonical_alias",
|
|
content,
|
|
tok=self.admin_user_tok,
|
|
)
|
|
|
|
def _get_canonical_alias(self):
|
|
"""Get the canonical alias state of the room."""
|
|
return self.get_success(
|
|
self.state_handler.get_current_state(
|
|
self.room_id, EventTypes.CanonicalAlias, ""
|
|
)
|
|
)
|
|
|
|
def test_remove_alias(self):
|
|
"""Removing an alias that is the canonical alias should remove it there too."""
|
|
# Set this new alias as the canonical alias for this room
|
|
self._set_canonical_alias(
|
|
{"alias": self.test_alias, "alt_aliases": [self.test_alias]}
|
|
)
|
|
|
|
data = self._get_canonical_alias()
|
|
self.assertEqual(data["content"]["alias"], self.test_alias)
|
|
self.assertEqual(data["content"]["alt_aliases"], [self.test_alias])
|
|
|
|
# Finally, delete the alias.
|
|
self.get_success(
|
|
self.handler.delete_association(
|
|
create_requester(self.admin_user), self.room_alias
|
|
)
|
|
)
|
|
|
|
data = self._get_canonical_alias()
|
|
self.assertNotIn("alias", data["content"])
|
|
self.assertNotIn("alt_aliases", data["content"])
|
|
|
|
def test_remove_other_alias(self):
|
|
"""Removing an alias listed as in alt_aliases should remove it there too."""
|
|
# Create a second alias.
|
|
other_test_alias = "#test2:test"
|
|
other_room_alias = self._add_alias(other_test_alias)
|
|
|
|
# Set the alias as the canonical alias for this room.
|
|
self._set_canonical_alias(
|
|
{
|
|
"alias": self.test_alias,
|
|
"alt_aliases": [self.test_alias, other_test_alias],
|
|
}
|
|
)
|
|
|
|
data = self._get_canonical_alias()
|
|
self.assertEqual(data["content"]["alias"], self.test_alias)
|
|
self.assertEqual(
|
|
data["content"]["alt_aliases"], [self.test_alias, other_test_alias]
|
|
)
|
|
|
|
# Delete the second alias.
|
|
self.get_success(
|
|
self.handler.delete_association(
|
|
create_requester(self.admin_user), other_room_alias
|
|
)
|
|
)
|
|
|
|
data = self._get_canonical_alias()
|
|
self.assertEqual(data["content"]["alias"], self.test_alias)
|
|
self.assertEqual(data["content"]["alt_aliases"], [self.test_alias])
|
|
|
|
|
|
class TestCreateAliasACL(unittest.HomeserverTestCase):
|
|
user_id = "@test:test"
|
|
|
|
servlets = [directory.register_servlets, room.register_servlets]
|
|
|
|
def prepare(self, reactor, clock, hs):
|
|
# We cheekily override the config to add custom alias creation rules
|
|
config = {}
|
|
config["alias_creation_rules"] = [
|
|
{"user_id": "*", "alias": "#unofficial_*", "action": "allow"}
|
|
]
|
|
config["room_list_publication_rules"] = []
|
|
|
|
rd_config = RoomDirectoryConfig()
|
|
rd_config.read_config(config)
|
|
|
|
self.hs.config.is_alias_creation_allowed = rd_config.is_alias_creation_allowed
|
|
|
|
return hs
|
|
|
|
def test_denied(self):
|
|
room_id = self.helper.create_room_as(self.user_id)
|
|
|
|
channel = self.make_request(
|
|
"PUT",
|
|
b"directory/room/%23test%3Atest",
|
|
('{"room_id":"%s"}' % (room_id,)).encode("ascii"),
|
|
)
|
|
self.assertEquals(403, channel.code, channel.result)
|
|
|
|
def test_allowed(self):
|
|
room_id = self.helper.create_room_as(self.user_id)
|
|
|
|
channel = self.make_request(
|
|
"PUT",
|
|
b"directory/room/%23unofficial_test%3Atest",
|
|
('{"room_id":"%s"}' % (room_id,)).encode("ascii"),
|
|
)
|
|
self.assertEquals(200, channel.code, channel.result)
|
|
|
|
|
|
class TestRoomListSearchDisabled(unittest.HomeserverTestCase):
|
|
user_id = "@test:test"
|
|
|
|
servlets = [directory.register_servlets, room.register_servlets]
|
|
|
|
def prepare(self, reactor, clock, hs):
|
|
room_id = self.helper.create_room_as(self.user_id)
|
|
|
|
channel = self.make_request(
|
|
"PUT", b"directory/list/room/%s" % (room_id.encode("ascii"),), b"{}"
|
|
)
|
|
self.assertEquals(200, channel.code, channel.result)
|
|
|
|
self.room_list_handler = hs.get_room_list_handler()
|
|
self.directory_handler = hs.get_directory_handler()
|
|
|
|
return hs
|
|
|
|
def test_disabling_room_list(self):
|
|
self.room_list_handler.enable_room_list_search = True
|
|
self.directory_handler.enable_room_list_search = True
|
|
|
|
# Room list is enabled so we should get some results
|
|
channel = self.make_request("GET", b"publicRooms")
|
|
self.assertEquals(200, channel.code, channel.result)
|
|
self.assertTrue(len(channel.json_body["chunk"]) > 0)
|
|
|
|
self.room_list_handler.enable_room_list_search = False
|
|
self.directory_handler.enable_room_list_search = False
|
|
|
|
# Room list disabled so we should get no results
|
|
channel = self.make_request("GET", b"publicRooms")
|
|
self.assertEquals(200, channel.code, channel.result)
|
|
self.assertTrue(len(channel.json_body["chunk"]) == 0)
|
|
|
|
# Room list disabled so we shouldn't be allowed to publish rooms
|
|
room_id = self.helper.create_room_as(self.user_id)
|
|
channel = self.make_request(
|
|
"PUT", b"directory/list/room/%s" % (room_id.encode("ascii"),), b"{}"
|
|
)
|
|
self.assertEquals(403, channel.code, channel.result)
|