kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Check third party rules before persisting knocks over federation (#10212)

Browse Source 
An accidental mis-ordering of operations during #6739 technically allowed an incoming knock event over federation in before checking it against any configured Third Party Access Rules modules.

This PR corrects that by performing the TPAR check *before* persisting the event.
This commit is contained in:
Andrew Morgan
2021-06-21 11:57:09 +01:00
committed by GitHub
parent 107c06081f
commit 182147195b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/10212.feature Normal file
View File

@@ -0,0 +1 @@
Implement "room knocking" as per [MSC2403](https://github.com/matrix-org/matrix-doc/pull/2403). Contributed by Sorunome and anoa.

4
synapse/handlers/federation.py
View File

@@ -2086,8 +2086,6 @@ class FederationHandler(BaseHandler):
context = await self.state_handler.compute_event_context(event)
await self._auth_and_persist_event(origin, event, context)
event_allowed = await self.third_party_event_rules.check_event_allowed(
event, context
)
@@ -2097,6 +2095,8 @@ class FederationHandler(BaseHandler):
403, "This event is not allowed in this context", Codes.FORBIDDEN
)
await self._auth_and_persist_event(origin, event, context)
return context
async def get_state_for_pdu(self, room_id: str, event_id: str) -> List[EventBase]: