mirror of
https://github.com/element-hq/synapse.git
synced 2024-11-23 01:55:53 +03:00
e059094119
============================== Server administrators are reminded to read [the upgrade notes](docs/upgrade.md#upgrading-to-v1420). Features -------- - Add support for [MSC3231](https://github.com/matrix-org/matrix-doc/pull/3231): Token authenticated registration. Users can be required to submit a token during registration to authenticate themselves. Contributed by Callum Brown. ([\#10142](https://github.com/matrix-org/synapse/issues/10142)) - Add support for [MSC3283](https://github.com/matrix-org/matrix-doc/pull/3283): Expose `enable_set_displayname` in capabilities. ([\#10452](https://github.com/matrix-org/synapse/issues/10452)) - Port the `PresenceRouter` module interface to the new generic interface. ([\#10524](https://github.com/matrix-org/synapse/issues/10524)) - Add pagination to the spaces summary based on updates to [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946). ([\#10613](https://github.com/matrix-org/synapse/issues/10613), [\#10725](https://github.com/matrix-org/synapse/issues/10725)) Bugfixes -------- - Validate new `m.room.power_levels` events. Contributed by @aaronraimist. ([\#10232](https://github.com/matrix-org/synapse/issues/10232)) - Display an error on User-Interactive Authentication fallback pages when authentication fails. Contributed by Callum Brown. ([\#10561](https://github.com/matrix-org/synapse/issues/10561)) - Remove pushers when deleting an e-mail address from an account. Pushers for old unlinked emails will also be deleted. ([\#10581](https://github.com/matrix-org/synapse/issues/10581), [\#10734](https://github.com/matrix-org/synapse/issues/10734)) - Reject Client-Server `/keys/query` requests which provide `device_ids` incorrectly. ([\#10593](https://github.com/matrix-org/synapse/issues/10593)) - Rooms with unsupported room versions are no longer returned via `/sync`. ([\#10644](https://github.com/matrix-org/synapse/issues/10644)) - Enforce the maximum length for per-room display names and avatar URLs. ([\#10654](https://github.com/matrix-org/synapse/issues/10654)) - Fix a bug which caused the `synapse_user_logins_total` Prometheus metric not to be correctly initialised on restart. ([\#10677](https://github.com/matrix-org/synapse/issues/10677)) - Improve `ServerNoticeServlet` to avoid duplicate requests and add unit tests. ([\#10679](https://github.com/matrix-org/synapse/issues/10679)) - Fix long-standing issue which caused an error when a thumbnail is requested and there are multiple thumbnails with the same quality rating. ([\#10684](https://github.com/matrix-org/synapse/issues/10684)) - Fix a regression introduced in v1.41.0 which affected the performance of concurrent fetches of large sets of events, in extreme cases causing the process to hang. ([\#10703](https://github.com/matrix-org/synapse/issues/10703)) - Fix a regression introduced in Synapse 1.41 which broke email transmission on Systems using older versions of the Twisted library. ([\#10713](https://github.com/matrix-org/synapse/issues/10713)) Improved Documentation ---------------------- - Add documentation on how to connect Django with Synapse using OpenID Connect and django-oauth-toolkit. Contributed by @HugoDelval. ([\#10192](https://github.com/matrix-org/synapse/issues/10192)) - Advertise https://matrix-org.github.io/synapse documentation in the `README` and `CONTRIBUTING` files. ([\#10595](https://github.com/matrix-org/synapse/issues/10595)) - Fix some of the titles not rendering in the OpenID Connect documentation. ([\#10639](https://github.com/matrix-org/synapse/issues/10639)) - Minor clarifications to the documentation for reverse proxies. ([\#10708](https://github.com/matrix-org/synapse/issues/10708)) - Remove table of contents from the top of installation and contributing documentation pages. ([\#10711](https://github.com/matrix-org/synapse/issues/10711)) Deprecations and Removals ------------------------- - Remove deprecated Shutdown Room and Purge Room Admin API. ([\#8830](https://github.com/matrix-org/synapse/issues/8830)) Internal Changes ---------------- - Improve type hints for the proxy agent and SRV resolver modules. Contributed by @dklimpel. ([\#10608](https://github.com/matrix-org/synapse/issues/10608)) - Clean up some of the federation event authentication code for clarity. ([\#10614](https://github.com/matrix-org/synapse/issues/10614), [\#10615](https://github.com/matrix-org/synapse/issues/10615), [\#10624](https://github.com/matrix-org/synapse/issues/10624), [\#10640](https://github.com/matrix-org/synapse/issues/10640)) - Add a comment asking developers to leave a reason when bumping the database schema version. ([\#10621](https://github.com/matrix-org/synapse/issues/10621)) - Remove not needed database updates in modify user admin API. ([\#10627](https://github.com/matrix-org/synapse/issues/10627)) - Convert room member storage tuples to `attrs` classes. ([\#10629](https://github.com/matrix-org/synapse/issues/10629), [\#10642](https://github.com/matrix-org/synapse/issues/10642)) - Use auto-attribs for the attrs classes used in sync. ([\#10630](https://github.com/matrix-org/synapse/issues/10630)) - Make `backfill` and `get_missing_events` use the same codepath. ([\#10645](https://github.com/matrix-org/synapse/issues/10645)) - Improve the performance of the `/hierarchy` API (from [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946)) by caching responses received over federation. ([\#10647](https://github.com/matrix-org/synapse/issues/10647)) - Run a nightly CI build against Twisted trunk. ([\#10651](https://github.com/matrix-org/synapse/issues/10651), [\#10672](https://github.com/matrix-org/synapse/issues/10672)) - Do not print out stack traces for network errors when fetching data over federation. ([\#10662](https://github.com/matrix-org/synapse/issues/10662)) - Simplify tests for device admin rest API. ([\#10664](https://github.com/matrix-org/synapse/issues/10664)) - Add missing type hints to REST servlets. ([\#10665](https://github.com/matrix-org/synapse/issues/10665), [\#10666](https://github.com/matrix-org/synapse/issues/10666), [\#10674](https://github.com/matrix-org/synapse/issues/10674)) - Flatten the `tests.synapse.rests` package by moving the contents of `v1` and `v2_alpha` into the parent. ([\#10667](https://github.com/matrix-org/synapse/issues/10667)) - Update `complement.sh` to rebuild the base Docker image when run with workers. ([\#10686](https://github.com/matrix-org/synapse/issues/10686)) - Split the event-processing methods in `FederationHandler` into a separate `FederationEventHandler`. ([\#10692](https://github.com/matrix-org/synapse/issues/10692)) - Remove unused `compare_digest` function. ([\#10706](https://github.com/matrix-org/synapse/issues/10706)) -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE8SRSDO7gYkSP4chELS76LzL74EcFAmEvd3cACgkQLS76LzL7 4EcF0hAAvOjDeH2hn0eI4YX03/BTCesJ5pCTbEJeC9Hsui3SbWamyYarH0Ae0gM6 BP9x5/XkCdsZhKT2OJedtZQUQ0cUws5FdJP87NnE1m7KBW9djbTxmkue3JKaHNTT ajvEoLe8UjOFbjvyMc+188uWVgtKQ6KLcetwllTpYY3FJ3+yk9CQP1ydYzwfHcHe hXW3b20WoRdAmH0B27mj1oQzCeXclbj1kCthcBcxH5RytA8bBc1itBtpAP2FFaeS Ml6paoXSs0wZaXXL5T1MhQtcVOOG5Yh7EPsemdyfqkwhIk9QtV3nmGfC7K5iEeq0 DldTgBNE0wLO+ycdgEZ2oCvitCLT4WDoKkVqKPA91wpuvCMeK5lnDdqbFUSN3hfd l8Oz+ydhjsCx7+pBBopnsyGrPIHNaN/vySYGF3lPa3ANKS2J0IVlAaJ59bZqzg2C vzdyMBCnn0fhnXMkADPLnIYqtebvC09JlPBRGo5BKmwmlM8Ea1dLQ+Lcy5vXalcw +GaYw3U805c03EvsWQxWchjwq6IwMeP06YpK/1ruMjlrCWYJp3V7f/4hXjlTdYm5 OEWc/kHOnlLfH2cA4aS0sV5WsnEuftotQIzBXuXWw5hSMdFmH7eAviPg0vXgfeA/ i0FOkOgEYR8O3RMh4Cip8+h44t8SPNjYUFJK9ip3DmNateeUCH0= =XxMc -----END PGP SIGNATURE----- Merge tag 'v1.42.0rc1' into develop Synapse 1.42.0rc1 (2021-09-01) ============================== Server administrators are reminded to read [the upgrade notes](docs/upgrade.md#upgrading-to-v1420). Features -------- - Add support for [MSC3231](https://github.com/matrix-org/matrix-doc/pull/3231): Token authenticated registration. Users can be required to submit a token during registration to authenticate themselves. Contributed by Callum Brown. ([\#10142](https://github.com/matrix-org/synapse/issues/10142)) - Add support for [MSC3283](https://github.com/matrix-org/matrix-doc/pull/3283): Expose `enable_set_displayname` in capabilities. ([\#10452](https://github.com/matrix-org/synapse/issues/10452)) - Port the `PresenceRouter` module interface to the new generic interface. ([\#10524](https://github.com/matrix-org/synapse/issues/10524)) - Add pagination to the spaces summary based on updates to [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946). ([\#10613](https://github.com/matrix-org/synapse/issues/10613), [\#10725](https://github.com/matrix-org/synapse/issues/10725)) Bugfixes -------- - Validate new `m.room.power_levels` events. Contributed by @aaronraimist. ([\#10232](https://github.com/matrix-org/synapse/issues/10232)) - Display an error on User-Interactive Authentication fallback pages when authentication fails. Contributed by Callum Brown. ([\#10561](https://github.com/matrix-org/synapse/issues/10561)) - Remove pushers when deleting an e-mail address from an account. Pushers for old unlinked emails will also be deleted. ([\#10581](https://github.com/matrix-org/synapse/issues/10581), [\#10734](https://github.com/matrix-org/synapse/issues/10734)) - Reject Client-Server `/keys/query` requests which provide `device_ids` incorrectly. ([\#10593](https://github.com/matrix-org/synapse/issues/10593)) - Rooms with unsupported room versions are no longer returned via `/sync`. ([\#10644](https://github.com/matrix-org/synapse/issues/10644)) - Enforce the maximum length for per-room display names and avatar URLs. ([\#10654](https://github.com/matrix-org/synapse/issues/10654)) - Fix a bug which caused the `synapse_user_logins_total` Prometheus metric not to be correctly initialised on restart. ([\#10677](https://github.com/matrix-org/synapse/issues/10677)) - Improve `ServerNoticeServlet` to avoid duplicate requests and add unit tests. ([\#10679](https://github.com/matrix-org/synapse/issues/10679)) - Fix long-standing issue which caused an error when a thumbnail is requested and there are multiple thumbnails with the same quality rating. ([\#10684](https://github.com/matrix-org/synapse/issues/10684)) - Fix a regression introduced in v1.41.0 which affected the performance of concurrent fetches of large sets of events, in extreme cases causing the process to hang. ([\#10703](https://github.com/matrix-org/synapse/issues/10703)) - Fix a regression introduced in Synapse 1.41 which broke email transmission on Systems using older versions of the Twisted library. ([\#10713](https://github.com/matrix-org/synapse/issues/10713)) Improved Documentation ---------------------- - Add documentation on how to connect Django with Synapse using OpenID Connect and django-oauth-toolkit. Contributed by @HugoDelval. ([\#10192](https://github.com/matrix-org/synapse/issues/10192)) - Advertise https://matrix-org.github.io/synapse documentation in the `README` and `CONTRIBUTING` files. ([\#10595](https://github.com/matrix-org/synapse/issues/10595)) - Fix some of the titles not rendering in the OpenID Connect documentation. ([\#10639](https://github.com/matrix-org/synapse/issues/10639)) - Minor clarifications to the documentation for reverse proxies. ([\#10708](https://github.com/matrix-org/synapse/issues/10708)) - Remove table of contents from the top of installation and contributing documentation pages. ([\#10711](https://github.com/matrix-org/synapse/issues/10711)) Deprecations and Removals ------------------------- - Remove deprecated Shutdown Room and Purge Room Admin API. ([\#8830](https://github.com/matrix-org/synapse/issues/8830)) Internal Changes ---------------- - Improve type hints for the proxy agent and SRV resolver modules. Contributed by @dklimpel. ([\#10608](https://github.com/matrix-org/synapse/issues/10608)) - Clean up some of the federation event authentication code for clarity. ([\#10614](https://github.com/matrix-org/synapse/issues/10614), [\#10615](https://github.com/matrix-org/synapse/issues/10615), [\#10624](https://github.com/matrix-org/synapse/issues/10624), [\#10640](https://github.com/matrix-org/synapse/issues/10640)) - Add a comment asking developers to leave a reason when bumping the database schema version. ([\#10621](https://github.com/matrix-org/synapse/issues/10621)) - Remove not needed database updates in modify user admin API. ([\#10627](https://github.com/matrix-org/synapse/issues/10627)) - Convert room member storage tuples to `attrs` classes. ([\#10629](https://github.com/matrix-org/synapse/issues/10629), [\#10642](https://github.com/matrix-org/synapse/issues/10642)) - Use auto-attribs for the attrs classes used in sync. ([\#10630](https://github.com/matrix-org/synapse/issues/10630)) - Make `backfill` and `get_missing_events` use the same codepath. ([\#10645](https://github.com/matrix-org/synapse/issues/10645)) - Improve the performance of the `/hierarchy` API (from [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946)) by caching responses received over federation. ([\#10647](https://github.com/matrix-org/synapse/issues/10647)) - Run a nightly CI build against Twisted trunk. ([\#10651](https://github.com/matrix-org/synapse/issues/10651), [\#10672](https://github.com/matrix-org/synapse/issues/10672)) - Do not print out stack traces for network errors when fetching data over federation. ([\#10662](https://github.com/matrix-org/synapse/issues/10662)) - Simplify tests for device admin rest API. ([\#10664](https://github.com/matrix-org/synapse/issues/10664)) - Add missing type hints to REST servlets. ([\#10665](https://github.com/matrix-org/synapse/issues/10665), [\#10666](https://github.com/matrix-org/synapse/issues/10666), [\#10674](https://github.com/matrix-org/synapse/issues/10674)) - Flatten the `tests.synapse.rests` package by moving the contents of `v1` and `v2_alpha` into the parent. ([\#10667](https://github.com/matrix-org/synapse/issues/10667)) - Update `complement.sh` to rebuild the base Docker image when run with workers. ([\#10686](https://github.com/matrix-org/synapse/issues/10686)) - Split the event-processing methods in `FederationHandler` into a separate `FederationEventHandler`. ([\#10692](https://github.com/matrix-org/synapse/issues/10692)) - Remove unused `compare_digest` function. ([\#10706](https://github.com/matrix-org/synapse/issues/10706))
474 lines
17 KiB
Python
474 lines
17 KiB
Python
# Copyright 2018 New Vector
|
|
#
|
|
# 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 email.message
|
|
import os
|
|
from typing import Dict, List, Sequence, Tuple
|
|
|
|
import attr
|
|
import pkg_resources
|
|
|
|
from twisted.internet.defer import Deferred
|
|
|
|
import synapse.rest.admin
|
|
from synapse.api.errors import Codes, SynapseError
|
|
from synapse.rest.client import login, room
|
|
|
|
from tests.unittest import HomeserverTestCase
|
|
|
|
|
|
@attr.s
|
|
class _User:
|
|
"Helper wrapper for user ID and access token"
|
|
id = attr.ib()
|
|
token = attr.ib()
|
|
|
|
|
|
class EmailPusherTests(HomeserverTestCase):
|
|
|
|
servlets = [
|
|
synapse.rest.admin.register_servlets_for_client_rest_resource,
|
|
room.register_servlets,
|
|
login.register_servlets,
|
|
]
|
|
user_id = True
|
|
hijack_auth = False
|
|
|
|
def make_homeserver(self, reactor, clock):
|
|
|
|
config = self.default_config()
|
|
config["email"] = {
|
|
"enable_notifs": True,
|
|
"template_dir": os.path.abspath(
|
|
pkg_resources.resource_filename("synapse", "res/templates")
|
|
),
|
|
"expiry_template_html": "notice_expiry.html",
|
|
"expiry_template_text": "notice_expiry.txt",
|
|
"notif_template_html": "notif_mail.html",
|
|
"notif_template_text": "notif_mail.txt",
|
|
"smtp_host": "127.0.0.1",
|
|
"smtp_port": 20,
|
|
"require_transport_security": False,
|
|
"smtp_user": None,
|
|
"smtp_pass": None,
|
|
"app_name": "Matrix",
|
|
"notif_from": "test@example.com",
|
|
"riot_base_url": None,
|
|
}
|
|
config["public_baseurl"] = "aaa"
|
|
config["start_pushers"] = True
|
|
|
|
hs = self.setup_test_homeserver(config=config)
|
|
|
|
# List[Tuple[Deferred, args, kwargs]]
|
|
self.email_attempts: List[Tuple[Deferred, Sequence, Dict]] = []
|
|
|
|
def sendmail(*args, **kwargs):
|
|
# This mocks out synapse.reactor.send_email._sendmail.
|
|
d = Deferred()
|
|
self.email_attempts.append((d, args, kwargs))
|
|
return d
|
|
|
|
hs.get_send_email_handler()._sendmail = sendmail
|
|
|
|
return hs
|
|
|
|
def prepare(self, reactor, clock, hs):
|
|
# Register the user who gets notified
|
|
self.user_id = self.register_user("user", "pass")
|
|
self.access_token = self.login("user", "pass")
|
|
|
|
# Register other users
|
|
self.others = [
|
|
_User(
|
|
id=self.register_user("otheruser1", "pass"),
|
|
token=self.login("otheruser1", "pass"),
|
|
),
|
|
_User(
|
|
id=self.register_user("otheruser2", "pass"),
|
|
token=self.login("otheruser2", "pass"),
|
|
),
|
|
]
|
|
|
|
# Register the pusher
|
|
user_tuple = self.get_success(
|
|
self.hs.get_datastore().get_user_by_access_token(self.access_token)
|
|
)
|
|
self.token_id = user_tuple.token_id
|
|
|
|
# We need to add email to account before we can create a pusher.
|
|
self.get_success(
|
|
hs.get_datastore().user_add_threepid(
|
|
self.user_id, "email", "a@example.com", 0, 0
|
|
)
|
|
)
|
|
|
|
self.pusher = self.get_success(
|
|
self.hs.get_pusherpool().add_pusher(
|
|
user_id=self.user_id,
|
|
access_token=self.token_id,
|
|
kind="email",
|
|
app_id="m.email",
|
|
app_display_name="Email Notifications",
|
|
device_display_name="a@example.com",
|
|
pushkey="a@example.com",
|
|
lang=None,
|
|
data={},
|
|
)
|
|
)
|
|
|
|
self.auth_handler = hs.get_auth_handler()
|
|
|
|
def test_need_validated_email(self):
|
|
"""Test that we can only add an email pusher if the user has validated
|
|
their email.
|
|
"""
|
|
with self.assertRaises(SynapseError) as cm:
|
|
self.get_success_or_raise(
|
|
self.hs.get_pusherpool().add_pusher(
|
|
user_id=self.user_id,
|
|
access_token=self.token_id,
|
|
kind="email",
|
|
app_id="m.email",
|
|
app_display_name="Email Notifications",
|
|
device_display_name="b@example.com",
|
|
pushkey="b@example.com",
|
|
lang=None,
|
|
data={},
|
|
)
|
|
)
|
|
|
|
self.assertEqual(400, cm.exception.code)
|
|
self.assertEqual(Codes.THREEPID_NOT_FOUND, cm.exception.errcode)
|
|
|
|
def test_simple_sends_email(self):
|
|
# Create a simple room with two users
|
|
room = self.helper.create_room_as(self.user_id, tok=self.access_token)
|
|
self.helper.invite(
|
|
room=room, src=self.user_id, tok=self.access_token, targ=self.others[0].id
|
|
)
|
|
self.helper.join(room=room, user=self.others[0].id, tok=self.others[0].token)
|
|
|
|
# The other user sends a single message.
|
|
self.helper.send(room, body="Hi!", tok=self.others[0].token)
|
|
|
|
# We should get emailed about that message
|
|
self._check_for_mail()
|
|
|
|
# The other user sends multiple messages.
|
|
self.helper.send(room, body="Hi!", tok=self.others[0].token)
|
|
self.helper.send(room, body="There!", tok=self.others[0].token)
|
|
|
|
self._check_for_mail()
|
|
|
|
def test_invite_sends_email(self):
|
|
# Create a room and invite the user to it
|
|
room = self.helper.create_room_as(self.others[0].id, tok=self.others[0].token)
|
|
self.helper.invite(
|
|
room=room,
|
|
src=self.others[0].id,
|
|
tok=self.others[0].token,
|
|
targ=self.user_id,
|
|
)
|
|
|
|
# We should get emailed about the invite
|
|
self._check_for_mail()
|
|
|
|
def test_invite_to_empty_room_sends_email(self):
|
|
# Create a room and invite the user to it
|
|
room = self.helper.create_room_as(self.others[0].id, tok=self.others[0].token)
|
|
self.helper.invite(
|
|
room=room,
|
|
src=self.others[0].id,
|
|
tok=self.others[0].token,
|
|
targ=self.user_id,
|
|
)
|
|
|
|
# Then have the original user leave
|
|
self.helper.leave(room, self.others[0].id, tok=self.others[0].token)
|
|
|
|
# We should get emailed about the invite
|
|
self._check_for_mail()
|
|
|
|
def test_multiple_members_email(self):
|
|
# We want to test multiple notifications, so we pause processing of push
|
|
# while we send messages.
|
|
self.pusher._pause_processing()
|
|
|
|
# Create a simple room with multiple other users
|
|
room = self.helper.create_room_as(self.user_id, tok=self.access_token)
|
|
|
|
for other in self.others:
|
|
self.helper.invite(
|
|
room=room, src=self.user_id, tok=self.access_token, targ=other.id
|
|
)
|
|
self.helper.join(room=room, user=other.id, tok=other.token)
|
|
|
|
# The other users send some messages
|
|
self.helper.send(room, body="Hi!", tok=self.others[0].token)
|
|
self.helper.send(room, body="There!", tok=self.others[1].token)
|
|
self.helper.send(room, body="There!", tok=self.others[1].token)
|
|
|
|
# Nothing should have happened yet, as we're paused.
|
|
assert not self.email_attempts
|
|
|
|
self.pusher._resume_processing()
|
|
|
|
# We should get emailed about those messages
|
|
self._check_for_mail()
|
|
|
|
def test_multiple_rooms(self):
|
|
# We want to test multiple notifications from multiple rooms, so we pause
|
|
# processing of push while we send messages.
|
|
self.pusher._pause_processing()
|
|
|
|
# Create a simple room with multiple other users
|
|
rooms = [
|
|
self.helper.create_room_as(self.user_id, tok=self.access_token),
|
|
self.helper.create_room_as(self.user_id, tok=self.access_token),
|
|
]
|
|
|
|
for r, other in zip(rooms, self.others):
|
|
self.helper.invite(
|
|
room=r, src=self.user_id, tok=self.access_token, targ=other.id
|
|
)
|
|
self.helper.join(room=r, user=other.id, tok=other.token)
|
|
|
|
# The other users send some messages
|
|
self.helper.send(rooms[0], body="Hi!", tok=self.others[0].token)
|
|
self.helper.send(rooms[1], body="There!", tok=self.others[1].token)
|
|
self.helper.send(rooms[1], body="There!", tok=self.others[1].token)
|
|
|
|
# Nothing should have happened yet, as we're paused.
|
|
assert not self.email_attempts
|
|
|
|
self.pusher._resume_processing()
|
|
|
|
# We should get emailed about those messages
|
|
self._check_for_mail()
|
|
|
|
def test_room_notifications_include_avatar(self):
|
|
# Create a room and set its avatar.
|
|
room = self.helper.create_room_as(self.user_id, tok=self.access_token)
|
|
self.helper.send_state(
|
|
room, "m.room.avatar", {"url": "mxc://DUMMY_MEDIA_ID"}, self.access_token
|
|
)
|
|
|
|
# Invite two other uses.
|
|
for other in self.others:
|
|
self.helper.invite(
|
|
room=room, src=self.user_id, tok=self.access_token, targ=other.id
|
|
)
|
|
self.helper.join(room=room, user=other.id, tok=other.token)
|
|
|
|
# The other users send some messages.
|
|
# TODO It seems that two messages are required to trigger an email?
|
|
self.helper.send(room, body="Alpha", tok=self.others[0].token)
|
|
self.helper.send(room, body="Beta", tok=self.others[1].token)
|
|
|
|
# We should get emailed about those messages
|
|
args, kwargs = self._check_for_mail()
|
|
|
|
# That email should contain the room's avatar
|
|
msg: bytes = args[5]
|
|
# Multipart: plain text, base 64 encoded; html, base 64 encoded
|
|
html = (
|
|
email.message_from_bytes(msg)
|
|
.get_payload()[1]
|
|
.get_payload(decode=True)
|
|
.decode()
|
|
)
|
|
self.assertIn("_matrix/media/v1/thumbnail/DUMMY_MEDIA_ID", html)
|
|
|
|
def test_empty_room(self):
|
|
"""All users leaving a room shouldn't cause the pusher to break."""
|
|
# Create a simple room with two users
|
|
room = self.helper.create_room_as(self.user_id, tok=self.access_token)
|
|
self.helper.invite(
|
|
room=room, src=self.user_id, tok=self.access_token, targ=self.others[0].id
|
|
)
|
|
self.helper.join(room=room, user=self.others[0].id, tok=self.others[0].token)
|
|
|
|
# The other user sends a single message.
|
|
self.helper.send(room, body="Hi!", tok=self.others[0].token)
|
|
|
|
# Leave the room before the message is processed.
|
|
self.helper.leave(room, self.user_id, tok=self.access_token)
|
|
self.helper.leave(room, self.others[0].id, tok=self.others[0].token)
|
|
|
|
# We should get emailed about that message
|
|
self._check_for_mail()
|
|
|
|
def test_empty_room_multiple_messages(self):
|
|
"""All users leaving a room shouldn't cause the pusher to break."""
|
|
# Create a simple room with two users
|
|
room = self.helper.create_room_as(self.user_id, tok=self.access_token)
|
|
self.helper.invite(
|
|
room=room, src=self.user_id, tok=self.access_token, targ=self.others[0].id
|
|
)
|
|
self.helper.join(room=room, user=self.others[0].id, tok=self.others[0].token)
|
|
|
|
# The other user sends a single message.
|
|
self.helper.send(room, body="Hi!", tok=self.others[0].token)
|
|
self.helper.send(room, body="There!", tok=self.others[0].token)
|
|
|
|
# Leave the room before the message is processed.
|
|
self.helper.leave(room, self.user_id, tok=self.access_token)
|
|
self.helper.leave(room, self.others[0].id, tok=self.others[0].token)
|
|
|
|
# We should get emailed about that message
|
|
self._check_for_mail()
|
|
|
|
def test_encrypted_message(self):
|
|
room = self.helper.create_room_as(self.user_id, tok=self.access_token)
|
|
self.helper.invite(
|
|
room=room, src=self.user_id, tok=self.access_token, targ=self.others[0].id
|
|
)
|
|
self.helper.join(room=room, user=self.others[0].id, tok=self.others[0].token)
|
|
|
|
# The other user sends some messages
|
|
self.helper.send_event(room, "m.room.encrypted", {}, tok=self.others[0].token)
|
|
|
|
# We should get emailed about that message
|
|
self._check_for_mail()
|
|
|
|
def test_no_email_sent_after_removed(self):
|
|
# Create a simple room with two users
|
|
room = self.helper.create_room_as(self.user_id, tok=self.access_token)
|
|
self.helper.invite(
|
|
room=room,
|
|
src=self.user_id,
|
|
tok=self.access_token,
|
|
targ=self.others[0].id,
|
|
)
|
|
self.helper.join(
|
|
room=room,
|
|
user=self.others[0].id,
|
|
tok=self.others[0].token,
|
|
)
|
|
|
|
# The other user sends a single message.
|
|
self.helper.send(room, body="Hi!", tok=self.others[0].token)
|
|
|
|
# We should get emailed about that message
|
|
self._check_for_mail()
|
|
|
|
# disassociate the user's email address
|
|
self.get_success(
|
|
self.auth_handler.delete_threepid(
|
|
user_id=self.user_id,
|
|
medium="email",
|
|
address="a@example.com",
|
|
)
|
|
)
|
|
|
|
# check that the pusher for that email address has been deleted
|
|
pushers = self.get_success(
|
|
self.hs.get_datastore().get_pushers_by({"user_name": self.user_id})
|
|
)
|
|
pushers = list(pushers)
|
|
self.assertEqual(len(pushers), 0)
|
|
|
|
def test_remove_unlinked_pushers_background_job(self):
|
|
"""Checks that all existing pushers associated with unlinked email addresses are removed
|
|
upon running the remove_deleted_email_pushers background update.
|
|
"""
|
|
# disassociate the user's email address manually (without deleting the pusher).
|
|
# This resembles the old behaviour, which the background update below is intended
|
|
# to clean up.
|
|
self.get_success(
|
|
self.hs.get_datastore().user_delete_threepid(
|
|
self.user_id, "email", "a@example.com"
|
|
)
|
|
)
|
|
|
|
# Run the "remove_deleted_email_pushers" background job
|
|
self.get_success(
|
|
self.hs.get_datastore().db_pool.simple_insert(
|
|
table="background_updates",
|
|
values={
|
|
"update_name": "remove_deleted_email_pushers",
|
|
"progress_json": "{}",
|
|
"depends_on": None,
|
|
},
|
|
)
|
|
)
|
|
|
|
# ... and tell the DataStore that it hasn't finished all updates yet
|
|
self.hs.get_datastore().db_pool.updates._all_done = False
|
|
|
|
# Now let's actually drive the updates to completion
|
|
while not self.get_success(
|
|
self.hs.get_datastore().db_pool.updates.has_completed_background_updates()
|
|
):
|
|
self.get_success(
|
|
self.hs.get_datastore().db_pool.updates.do_next_background_update(100),
|
|
by=0.1,
|
|
)
|
|
|
|
# Check that all pushers with unlinked addresses were deleted
|
|
pushers = self.get_success(
|
|
self.hs.get_datastore().get_pushers_by({"user_name": self.user_id})
|
|
)
|
|
pushers = list(pushers)
|
|
self.assertEqual(len(pushers), 0)
|
|
|
|
def _check_for_mail(self) -> Tuple[Sequence, Dict]:
|
|
"""
|
|
Assert that synapse sent off exactly one email notification.
|
|
|
|
Returns:
|
|
args and kwargs passed to synapse.reactor.send_email._sendmail for
|
|
that notification.
|
|
"""
|
|
# Get the stream ordering before it gets sent
|
|
pushers = self.get_success(
|
|
self.hs.get_datastore().get_pushers_by({"user_name": self.user_id})
|
|
)
|
|
pushers = list(pushers)
|
|
self.assertEqual(len(pushers), 1)
|
|
last_stream_ordering = pushers[0].last_stream_ordering
|
|
|
|
# Advance time a bit, so the pusher will register something has happened
|
|
self.pump(10)
|
|
|
|
# It hasn't succeeded yet, so the stream ordering shouldn't have moved
|
|
pushers = self.get_success(
|
|
self.hs.get_datastore().get_pushers_by({"user_name": self.user_id})
|
|
)
|
|
pushers = list(pushers)
|
|
self.assertEqual(len(pushers), 1)
|
|
self.assertEqual(last_stream_ordering, pushers[0].last_stream_ordering)
|
|
|
|
# One email was attempted to be sent
|
|
self.assertEqual(len(self.email_attempts), 1)
|
|
|
|
deferred, sendmail_args, sendmail_kwargs = self.email_attempts[0]
|
|
# Make the email succeed
|
|
deferred.callback(True)
|
|
self.pump()
|
|
|
|
# One email was attempted to be sent
|
|
self.assertEqual(len(self.email_attempts), 1)
|
|
|
|
# The stream ordering has increased
|
|
pushers = self.get_success(
|
|
self.hs.get_datastore().get_pushers_by({"user_name": self.user_id})
|
|
)
|
|
pushers = list(pushers)
|
|
self.assertEqual(len(pushers), 1)
|
|
self.assertTrue(pushers[0].last_stream_ordering > last_stream_ordering)
|
|
|
|
# Reset the attempts.
|
|
self.email_attempts = []
|
|
return sendmail_args, sendmail_kwargs
|