Merge branch 'develop' into madlittlemods/msc3575-sliding-sync-e2ee

Conflicts:
	synapse/handlers/sync.py
	tests/handlers/test_sync.py

synapse/handlers/sync.py

@@ -1921,18 +1921,18 @@ async def get_sync_result_builder(
         """
         user_id = sync_config.user.to_string()
 
+        # Note: we get the users room list *before* we get the current token, this
+        # avoids checking back in history if rooms are joined after the token is fetched.
+        token_before_rooms = self.event_sources.get_current_token()
+        mutable_joined_room_ids = set(await self.store.get_rooms_for_user(user_id))
+
         # NB: The `now_token` gets changed by some of the `generate_sync_*` methods,
         # this is due to some of the underlying streams not supporting the ability
         # to query up to a given point.
         # Always use the `now_token` in `SyncResultBuilder`
         now_token = self.event_sources.get_current_token()
         log_kv({"now_token": now_token})
 
-        # Note: we get the users room list *before* we get the current token, this
-        # avoids checking back in history if rooms are joined after the token is fetched.
-        token_before_rooms = self.event_sources.get_current_token()
-        mutable_joined_room_ids = set(await self.store.get_rooms_for_user(user_id))
-
         # Since we fetched the users room list before the token, there's a small window
         # during which membership events may have been persisted, so we fetch these now
         # and modify the joined room list for any changes between the get_rooms_for_user

tests/handlers/test_sync.py

@@ -82,15 +82,21 @@ def test_wait_for_sync_for_user_auth_blocking(self) -> None:
         self.get_success(self.store.upsert_monthly_active_user(user_id1))
         self.get_success(
             self.sync_handler.wait_for_sync_for_user(
-                requester, sync_config, SyncVersion.SYNC_V2, generate_request_key()
+                requester,
+                sync_config,
+                sync_version=SyncVersion.SYNC_V2,
+                request_key=generate_request_key(),
             )
         )
 
         # Test that global lock works
         self.auth_blocking._hs_disabled = True
         e = self.get_failure(
             self.sync_handler.wait_for_sync_for_user(
-                requester, sync_config, SyncVersion.SYNC_V2, generate_request_key()
+                requester,
+                sync_config,
+                sync_version=SyncVersion.SYNC_V2,
+                request_key=generate_request_key(),
             ),
             ResourceLimitError,
         )
@@ -103,7 +109,10 @@ def test_wait_for_sync_for_user_auth_blocking(self) -> None:
 
         e = self.get_failure(
             self.sync_handler.wait_for_sync_for_user(
-                requester, sync_config, SyncVersion.SYNC_V2, generate_request_key()
+                requester,
+                sync_config,
+                sync_version=SyncVersion.SYNC_V2,
+                request_key=generate_request_key(),
             ),
             ResourceLimitError,
         )
@@ -286,7 +295,7 @@ def test_ban_wins_race_with_join(self) -> None:
                 eve_sync_config,
                 sync_version=SyncVersion.SYNC_V2,
                 request_key=generate_request_key(),
-            ),
+            )
         )
 
         # Sanity check this sync result. We shouldn't be joined to the room.
@@ -735,7 +744,7 @@ def test_archived_rooms_do_not_include_state_after_leave(
                 generate_sync_config(bob),
                 sync_version=SyncVersion.SYNC_V2,
                 request_key=generate_request_key(),
-            ),
+            )
         )
 
         # Alice sends a message and a state
@@ -924,6 +933,31 @@ def test_push_rules_with_bad_account_data(self) -> None:
         """Some old accounts have managed to set a `m.push_rules` account data,
         which we should ignore in /sync response.
         """
+        user = self.register_user("alice", "password")
+
+        # Insert the bad account data.
+        self.get_success(
+            self.store.add_account_data_for_user(user, AccountDataTypes.PUSH_RULES, {})
+        )
+
+        sync_result: SyncResult = self.get_success(
+            self.sync_handler.wait_for_sync_for_user(
+                create_requester(user),
+                generate_sync_config(user),
+                sync_version=SyncVersion.SYNC_V2,
+                request_key=generate_request_key(),
+            )
+        )
+
+        for account_dict in sync_result.account_data:
+            if account_dict["type"] == AccountDataTypes.PUSH_RULES:
+                # We should have lots of push rules here, rather than the bad
+                # empty data.
+                self.assertNotEqual(account_dict["content"], {})
+                return
+
+        self.fail("No push rules found")
+
 
 def generate_sync_config(
     user_id: str,

tests/rest/client/test_devices.py

@@ -24,8 +24,8 @@
 from twisted.test.proto_helpers import MemoryReactor
 
 from synapse.api.errors import NotFoundError
-from synapse.rest import admin, devices, room, sync
-from synapse.rest.client import account, keys, login, register
+from synapse.rest import admin, devices, sync
+from synapse.rest.client import keys, login, register
 from synapse.server import HomeServer
 from synapse.types import JsonDict, UserID, create_requester
 from synapse.util import Clock

tests/rest/client/test_sendtodevice.py

@@ -1,8 +1,4 @@
-from twisted.test.proto_helpers import MemoryReactor
 
-from synapse.server import HomeServer
-from synapse.types import JsonDict
-from synapse.util import Clock
 
 from tests.rest.client.test_sendtodevice_base import SendToDeviceTestCaseBase
 from tests.unittest import HomeserverTestCase