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

Commit 62db603

Browse files
authored
Consider IP whitelist for identity server resolution (#11120)
Signed-off-by: Robert Edström <[email protected]>
1 parent 0930e9a commit 62db603

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

changelog.d/11120.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Identity server connection is no longer ignoring `ip_range_whitelist`.

synapse/handlers/identity.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ def __init__(self, hs: "HomeServer"):
5454
self.http_client = SimpleHttpClient(hs)
5555
# An HTTP client for contacting identity servers specified by clients.
5656
self.blacklisting_http_client = SimpleHttpClient(
57-
hs, ip_blacklist=hs.config.server.federation_ip_range_blacklist
57+
hs,
58+
ip_blacklist=hs.config.server.federation_ip_range_blacklist,
59+
ip_whitelist=hs.config.server.federation_ip_range_whitelist,
5860
)
5961
self.federation_http_client = hs.get_federation_http_client()
6062
self.hs = hs

0 commit comments

Comments
 (0)