Move some event auth checks out to a different method

synapse/event_auth.py

@@ -209,7 +209,7 @@ async def check_state_independent_auth_rules(
         raise AuthError(403, "No create event in auth events")
 
 
-def check_auth_rules_for_event(
+def check_state_dependent_auth_rules(
     event: "EventBase",
     auth_events: Iterable["EventBase"],
 ) -> None:

synapse/handlers/event_auth.py

@@ -24,7 +24,7 @@
 from synapse.api.errors import AuthError, Codes, SynapseError
 from synapse.api.room_versions import RoomVersion
 from synapse.event_auth import (
-    check_auth_rules_for_event,
+    check_state_dependent_auth_rules,
     check_state_independent_auth_rules,
 )
 from synapse.events import EventBase
@@ -58,7 +58,7 @@ async def check_auth_rules_from_context(
         await check_state_independent_auth_rules(self._store, event)
         auth_event_ids = event.auth_event_ids()
         auth_events_by_id = await self._store.get_events(auth_event_ids)
-        check_auth_rules_for_event(event, auth_events_by_id.values())
+        check_state_dependent_auth_rules(event, auth_events_by_id.values())
 
     def compute_auth_events(
         self,

synapse/handlers/federation_event.py

@@ -50,7 +50,7 @@
 from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, RoomVersion, RoomVersions
 from synapse.event_auth import (
     auth_types_for_event,
-    check_auth_rules_for_event,
+    check_state_dependent_auth_rules,
     check_state_independent_auth_rules,
     validate_event_for_room_version,
 )
@@ -1457,7 +1457,7 @@ async def prep(event: EventBase) -> None:
                 try:
                     validate_event_for_room_version(event)
                     await check_state_independent_auth_rules(self._store, event)
-                    check_auth_rules_for_event(event, auth)
+                    check_state_dependent_auth_rules(event, auth)
                 except AuthError as e:
                     logger.warning("Rejecting %r because %s", event, e)
                     context.rejected = RejectedReason.AUTH_ERROR
@@ -1522,7 +1522,7 @@ async def _check_event_auth(
         # ... and check that the event passes auth at those auth events.
         try:
             await check_state_independent_auth_rules(self._store, event)
-            check_auth_rules_for_event(event, claimed_auth_events)
+            check_state_dependent_auth_rules(event, claimed_auth_events)
         except AuthError as e:
             logger.warning(
                 "While checking auth of %r against auth_events: %s", event, e
@@ -1570,7 +1570,7 @@ async def _check_event_auth(
             auth_events_for_auth = calculated_auth_event_map
 
         try:
-            check_auth_rules_for_event(event, auth_events_for_auth.values())
+            check_state_dependent_auth_rules(event, auth_events_for_auth.values())
         except AuthError as e:
             logger.warning("Failed auth resolution for %r because %s", event, e)
             context.rejected = RejectedReason.AUTH_ERROR
@@ -1670,7 +1670,7 @@ async def _check_for_soft_fail(
         )
 
         try:
-            check_auth_rules_for_event(event, current_auth_events)
+            check_state_dependent_auth_rules(event, current_auth_events)
         except AuthError as e:
             logger.warning(
                 "Soft-failing %r (from %s) because %s",

synapse/state/v1.py

@@ -330,7 +330,7 @@ def _resolve_auth_events(
         auth_events[(prev_event.type, prev_event.state_key)] = prev_event
         try:
             # The signatures have already been checked at this point
-            event_auth.check_auth_rules_for_event(
+            event_auth.check_state_dependent_auth_rules(
                 event,
                 auth_events.values(),
             )
@@ -347,7 +347,7 @@ def _resolve_normal_events(
     for event in _ordered_events(events):
         try:
             # The signatures have already been checked at this point
-            event_auth.check_auth_rules_for_event(
+            event_auth.check_state_dependent_auth_rules(
                 event,
                 auth_events.values(),
             )

synapse/state/v2.py

@@ -573,7 +573,7 @@ async def _iterative_auth_checks(
                     auth_events[key] = event_map[ev_id]
 
         try:
-            event_auth.check_auth_rules_for_event(
+            event_auth.check_state_dependent_auth_rules(
                 event,
                 auth_events.values(),
             )