From 68be42f6b6433e93c7dccc0eae70177500ca60bc Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 9 Jun 2022 15:51:34 +0100
Subject: Remove `room_version` param from `validate_event_for_room_version`
Instead, use the `room_version` property of the event we're validating.
The `room_version` was originally added as a parameter somewhere around #4482,
but really it's been redundant since #6875 added a `room_version` field to `EventBase`.
---
synapse/handlers/federation.py | 4 ++--
synapse/handlers/federation_event.py | 4 ++--
synapse/handlers/message.py | 2 +-
synapse/handlers/room.py | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'synapse/handlers')
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 6a143440d3..b596417769 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1206,7 +1206,7 @@ class FederationHandler:
event.internal_metadata.send_on_behalf_of = self.hs.hostname
try:
- validate_event_for_room_version(room_version_obj, event)
+ validate_event_for_room_version(event)
await self._event_auth_handler.check_auth_rules_from_context(
room_version_obj, event, context
)
@@ -1258,7 +1258,7 @@ class FederationHandler:
)
try:
- validate_event_for_room_version(room_version_obj, event)
+ validate_event_for_room_version(event)
await self._event_auth_handler.check_auth_rules_from_context(
room_version_obj, event, context
)
diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py
index 87a0608359..420ad8b969 100644
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -1453,7 +1453,7 @@ class FederationEventHandler:
context = EventContext.for_outlier(self._storage_controllers)
try:
- validate_event_for_room_version(room_version_obj, event)
+ validate_event_for_room_version(event)
check_auth_rules_for_event(room_version_obj, event, auth)
except AuthError as e:
logger.warning("Rejecting %r because %s", event, e)
@@ -1501,7 +1501,7 @@ class FederationEventHandler:
room_version_obj = KNOWN_ROOM_VERSIONS[room_version]
try:
- validate_event_for_room_version(room_version_obj, event)
+ validate_event_for_room_version(event)
except AuthError as e:
logger.warning("While validating received event %r: %s", event, e)
# TODO: use a different rejected reason here?
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index f455158a2c..b078e2424f 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -1297,7 +1297,7 @@ class EventCreationHandler:
assert event.content["membership"] == Membership.LEAVE
else:
try:
- validate_event_for_room_version(room_version_obj, event)
+ validate_event_for_room_version(event)
await self._event_auth_handler.check_auth_rules_from_context(
room_version_obj, event, context
)
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 520663f172..44d9784077 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -227,7 +227,7 @@ class RoomCreationHandler:
},
)
old_room_version = await self.store.get_room_version(old_room_id)
- validate_event_for_room_version(old_room_version, tombstone_event)
+ validate_event_for_room_version(tombstone_event)
await self._event_auth_handler.check_auth_rules_from_context(
old_room_version, tombstone_event, tombstone_context
)
--
cgit 1.5.1