summary refs log tree commit diff
diff options
context:
space:
mode:
authorV02460 <V02460@gmail.com>2024-03-19 18:19:12 +0100
committerGitHub <noreply@github.com>2024-03-19 17:19:12 +0000
commit05489d89c6ded7825cc7547e601390c2df78fb21 (patch)
tree7936811cfb231ae118103f73b5ed2f22e275ee85
parentClarify docs for some room state functions (#16950) (diff)
downloadsynapse-05489d89c6ded7825cc7547e601390c2df78fb21.tar.xz
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:
https://github.com/netaddr/netaddr/pull/360
-rw-r--r--changelog.d/16953.misc1
-rw-r--r--tests/api/test_auth.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/16953.misc b/changelog.d/16953.misc
new file mode 100644

index 0000000000..81abcc3df0 --- /dev/null +++ b/changelog.d/16953.misc
@@ -0,0 +1 @@ +Specify IP subnets in canonical form. diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py
index ce85ddf22a..bd229cf7e9 100644 --- a/tests/api/test_auth.py +++ b/tests/api/test_auth.py
@@ -128,7 +128,7 @@ class AuthTestCase(unittest.HomeserverTestCase): token="foobar", url="a_url", sender=self.test_user, - ip_range_whitelist=IPSet(["192.168/16"]), + ip_range_whitelist=IPSet(["192.168.0.0/16"]), ) self.store.get_app_service_by_token = Mock(return_value=app_service) self.store.get_user_by_access_token = AsyncMock(return_value=None) @@ -147,7 +147,7 @@ class AuthTestCase(unittest.HomeserverTestCase): token="foobar", url="a_url", sender=self.test_user, - ip_range_whitelist=IPSet(["192.168/16"]), + ip_range_whitelist=IPSet(["192.168.0.0/16"]), ) self.store.get_app_service_by_token = Mock(return_value=app_service) self.store.get_user_by_access_token = AsyncMock(return_value=None)