diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2022-06-15 19:48:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-15 19:48:22 +0100 |
| commit | 8ecf6be1e1a737a09f51137302ad0d9ae4ed519b (patch) | |
| tree | e346a0c742442219298cb96c582e81209fe80354 /synapse/state | |
| parent | Add headers to individual options in config documentation to allow for linkin... (diff) | |
| download | synapse-8ecf6be1e1a737a09f51137302ad0d9ae4ed519b.tar.xz | |
Move some event auth checks out to a different method (#13065)
* Add auth events to events used in tests * Move some event auth checks out to a different method Some of the event auth checks apply to an event's auth_events, rather than the state at the event - which means they can play no part in state resolution. Move them out to a separate method. * Rename check_auth_rules_for_event Now it only checks the state-dependent auth rules, it needs a better name.
Diffstat (limited to 'synapse/state')
| -rw-r--r-- | synapse/state/v1.py | 4 | ||||
| -rw-r--r-- | synapse/state/v2.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index 8bbb4ce41c..500e384695 100644 --- a/synapse/state/v1.py +++ b/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(), ) diff --git a/synapse/state/v2.py b/synapse/state/v2.py index 6a16f38a15..7db032203b 100644 --- a/synapse/state/v2.py +++ b/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(), ) |