Skip to content

Commit 05489d8

Browse files
authored
Specify IP subnet literals in canonical form (#16953)
This is needed, because the netaddr package removed support for the implicit prefix form in version 1.0.0: netaddr/netaddr#360
1 parent 9635822 commit 05489d8

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

changelog.d/16953.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Specify IP subnets in canonical form.

tests/api/test_auth.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def test_get_user_by_req_appservice_valid_token_good_ip(self) -> None:
128128
token="foobar",
129129
url="a_url",
130130
sender=self.test_user,
131-
ip_range_whitelist=IPSet(["192.168/16"]),
131+
ip_range_whitelist=IPSet(["192.168.0.0/16"]),
132132
)
133133
self.store.get_app_service_by_token = Mock(return_value=app_service)
134134
self.store.get_user_by_access_token = AsyncMock(return_value=None)
@@ -147,7 +147,7 @@ def test_get_user_by_req_appservice_valid_token_bad_ip(self) -> None:
147147
token="foobar",
148148
url="a_url",
149149
sender=self.test_user,
150-
ip_range_whitelist=IPSet(["192.168/16"]),
150+
ip_range_whitelist=IPSet(["192.168.0.0/16"]),
151151
)
152152
self.store.get_app_service_by_token = Mock(return_value=app_service)
153153
self.store.get_user_by_access_token = AsyncMock(return_value=None)

0 commit comments

Comments
 (0)