Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit eb3beb8

Browse files
authored
Add type hints and comments to event auth code. (#10393)
1 parent 0d5b08a commit eb3beb8

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

changelog.d/10393.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add type hints and comments to event auth code.

mypy.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ files =
8383
synapse/util/stringutils.py,
8484
synapse/visibility.py,
8585
tests/replication,
86+
tests/test_event_auth.py,
8687
tests/test_utils,
8788
tests/handlers/test_password_providers.py,
8889
tests/rest/client/v1/test_login.py,

synapse/event_auth.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ def check(
4848
room_version_obj: the version of the room
4949
event: the event being checked.
5050
auth_events: the existing room state.
51+
do_sig_check: True if it should be verified that the sending server
52+
signed the event.
53+
do_size_check: True if the size of the event fields should be verified.
5154
5255
Raises:
5356
AuthError if the checks fail

tests/test_event_auth.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
# limitations under the License.
1414

1515
import unittest
16+
from typing import Optional
1617

1718
from synapse import event_auth
1819
from synapse.api.errors import AuthError
1920
from synapse.api.room_versions import RoomVersions
20-
from synapse.events import make_event_from_dict
21-
from synapse.types import get_domain_from_id
21+
from synapse.events import EventBase, make_event_from_dict
22+
from synapse.types import JsonDict, get_domain_from_id
2223

2324

2425
class EventAuthTestCase(unittest.TestCase):
@@ -432,7 +433,7 @@ def test_join_rules_msc3083_restricted(self):
432433
TEST_ROOM_ID = "!test:room"
433434

434435

435-
def _create_event(user_id):
436+
def _create_event(user_id: str) -> EventBase:
436437
return make_event_from_dict(
437438
{
438439
"room_id": TEST_ROOM_ID,
@@ -444,7 +445,9 @@ def _create_event(user_id):
444445
)
445446

446447

447-
def _member_event(user_id, membership, sender=None):
448+
def _member_event(
449+
user_id: str, membership: str, sender: Optional[str] = None
450+
) -> EventBase:
448451
return make_event_from_dict(
449452
{
450453
"room_id": TEST_ROOM_ID,
@@ -458,11 +461,11 @@ def _member_event(user_id, membership, sender=None):
458461
)
459462

460463

461-
def _join_event(user_id):
464+
def _join_event(user_id: str) -> EventBase:
462465
return _member_event(user_id, "join")
463466

464467

465-
def _power_levels_event(sender, content):
468+
def _power_levels_event(sender: str, content: JsonDict) -> EventBase:
466469
return make_event_from_dict(
467470
{
468471
"room_id": TEST_ROOM_ID,
@@ -475,7 +478,7 @@ def _power_levels_event(sender, content):
475478
)
476479

477480

478-
def _alias_event(sender, **kwargs):
481+
def _alias_event(sender: str, **kwargs) -> EventBase:
479482
data = {
480483
"room_id": TEST_ROOM_ID,
481484
"event_id": _get_event_id(),
@@ -488,7 +491,7 @@ def _alias_event(sender, **kwargs):
488491
return make_event_from_dict(data)
489492

490493

491-
def _random_state_event(sender):
494+
def _random_state_event(sender: str) -> EventBase:
492495
return make_event_from_dict(
493496
{
494497
"room_id": TEST_ROOM_ID,
@@ -501,7 +504,7 @@ def _random_state_event(sender):
501504
)
502505

503506

504-
def _join_rules_event(sender, join_rule):
507+
def _join_rules_event(sender: str, join_rule: str) -> EventBase:
505508
return make_event_from_dict(
506509
{
507510
"room_id": TEST_ROOM_ID,
@@ -519,7 +522,7 @@ def _join_rules_event(sender, join_rule):
519522
event_count = 0
520523

521524

522-
def _get_event_id():
525+
def _get_event_id() -> str:
523526
global event_count
524527
c = event_count
525528
event_count += 1

0 commit comments

Comments
 (0)