Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit e9a0419

Browse files
author
David Robertson
authored
Fix sending events into rooms with non-integer power levels (#14073)
1 parent 720b12c commit e9a0419

File tree

4 files changed

+86
-1
lines changed

4 files changed

+86
-1
lines changed

changelog.d/14073.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a bug introduced in Synapse 1.68.0 where messages could not be sent in rooms with non-integer `notifications` power level.

mypy.ini

+3
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ disallow_untyped_defs = False
106106
[mypy-tests.handlers.test_user_directory]
107107
disallow_untyped_defs = True
108108

109+
[mypy-tests.push.test_bulk_push_rule_evaluator]
110+
disallow_untyped_defs = True
111+
109112
[mypy-tests.test_server]
110113
disallow_untyped_defs = True
111114

synapse/push/bulk_push_rule_evaluator.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -289,11 +289,18 @@ async def action_for_event_by_user(
289289
if relation.rel_type == RelationTypes.THREAD:
290290
thread_id = relation.parent_id
291291

292+
# It's possible that old room versions have non-integer power levels (floats or
293+
# strings). Workaround this by explicitly converting to int.
294+
notification_levels = power_levels.get("notifications", {})
295+
if not event.room_version.msc3667_int_only_power_levels:
296+
for user_id, level in notification_levels.items():
297+
notification_levels[user_id] = int(level)
298+
292299
evaluator = PushRuleEvaluator(
293300
_flatten_dict(event),
294301
room_member_count,
295302
sender_power_level,
296-
power_levels.get("notifications", {}),
303+
notification_levels,
297304
relations,
298305
self._relations_match_enabled,
299306
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
from unittest.mock import patch
2+
3+
from synapse.api.room_versions import RoomVersions
4+
from synapse.push.bulk_push_rule_evaluator import BulkPushRuleEvaluator
5+
from synapse.rest import admin
6+
from synapse.rest.client import login, register, room
7+
from synapse.types import create_requester
8+
9+
from tests import unittest
10+
11+
12+
class TestBulkPushRuleEvaluator(unittest.HomeserverTestCase):
13+
14+
servlets = [
15+
admin.register_servlets_for_client_rest_resource,
16+
room.register_servlets,
17+
login.register_servlets,
18+
register.register_servlets,
19+
]
20+
21+
def test_action_for_event_by_user_handles_noninteger_power_levels(self) -> None:
22+
"""We should convert floats and strings to integers before passing to Rust.
23+
24+
Reproduces #14060.
25+
26+
A lack of validation: the gift that keeps on giving.
27+
"""
28+
# Create a new user and room.
29+
alice = self.register_user("alice", "pass")
30+
token = self.login(alice, "pass")
31+
32+
room_id = self.helper.create_room_as(
33+
alice, room_version=RoomVersions.V9.identifier, tok=token
34+
)
35+
36+
# Alter the power levels in that room to include stringy and floaty levels.
37+
# We need to suppress the validation logic or else it will reject these dodgy
38+
# values. (Presumably this validation was not always present.)
39+
event_creation_handler = self.hs.get_event_creation_handler()
40+
requester = create_requester(alice)
41+
with patch("synapse.events.validator.validate_canonicaljson"), patch(
42+
"synapse.events.validator.jsonschema.validate"
43+
):
44+
self.helper.send_state(
45+
room_id,
46+
"m.room.power_levels",
47+
{
48+
"users": {alice: "100"}, # stringy
49+
"notifications": {"room": 100.0}, # float
50+
},
51+
token,
52+
state_key="",
53+
)
54+
55+
# Create a new message event, and try to evaluate it under the dodgy
56+
# power level event.
57+
event, context = self.get_success(
58+
event_creation_handler.create_event(
59+
requester,
60+
{
61+
"type": "m.room.message",
62+
"room_id": room_id,
63+
"content": {
64+
"msgtype": "m.text",
65+
"body": "helo",
66+
},
67+
"sender": alice,
68+
},
69+
)
70+
)
71+
72+
bulk_evaluator = BulkPushRuleEvaluator(self.hs)
73+
# should not raise
74+
self.get_success(bulk_evaluator.action_for_event_by_user(event, context))

0 commit comments

Comments
 (0)