summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-23 17:01:18 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-23 17:01:18 +0000
commit45e098eb4c181f7356aad1fbb34b8f9bb6ad1bed (patch)
treede93441dc2d0dc982f571bf70b7bbd537fca7c3f /synapse/api
parentWarn if postgres database has non-C locale. (#6734) (diff)
parentPass room version object into event_auth.check and check_redaction (#6788) (diff)
downloadsynapse-45e098eb4c181f7356aad1fbb34b8f9bb6ad1bed.tar.xz
Pass room version object into event_auth.check and check_redaction (#6788)
* commit 'a8ce7aeb4':
  Pass room version object into event_auth.check and check_redaction (#6788)
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/auth.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index 59be9b64a6..4e792fdb93 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py
@@ -33,6 +33,7 @@ from synapse.api.errors import ( MissingClientTokenError, ResourceLimitError, ) +from synapse.api.room_versions import KNOWN_ROOM_VERSIONS from synapse.config.server import is_threepid_reserved from synapse.types import StateMap, UserID from synapse.util.caches import CACHE_SIZE_FACTOR, register_cache @@ -77,15 +78,17 @@ class Auth(object): self._account_validity = hs.config.account_validity @defer.inlineCallbacks - def check_from_context(self, room_version, event, context, do_sig_check=True): + def check_from_context(self, room_version: str, event, context, do_sig_check=True): prev_state_ids = yield context.get_prev_state_ids() auth_events_ids = yield self.compute_auth_events( event, prev_state_ids, for_verification=True ) auth_events = yield self.store.get_events(auth_events_ids) auth_events = {(e.type, e.state_key): e for e in itervalues(auth_events)} + + room_version_obj = KNOWN_ROOM_VERSIONS[room_version] event_auth.check( - room_version, event, auth_events=auth_events, do_sig_check=do_sig_check + room_version_obj, event, auth_events=auth_events, do_sig_check=do_sig_check ) @defer.inlineCallbacks