Use federation ip blacklist for Identity and RoomMember's SimpleHttpClient

Author: anoadragon453

synapse/handlers/identity.py

@@ -30,6 +30,7 @@
     SynapseError,
 )
 from synapse.util.stringutils import random_string
+from synapse.http.client import SimpleHttpClient
 
 from ._base import BaseHandler
 
@@ -40,7 +41,9 @@ class IdentityHandler(BaseHandler):
     def __init__(self, hs):
         super(IdentityHandler, self).__init__(hs)
 
-        self.http_client = hs.get_simple_http_client()
+        self.http_client = SimpleHttpClient(
+            hs, ip_blacklist=hs.config.federation_ip_range_blacklist
+        )
         self.federation_http_client = hs.get_http_client()
         self.hs = hs
 

synapse/handlers/room_member.py

@@ -33,6 +33,7 @@
 from synapse.types import RoomID, UserID
 from synapse.util.async_helpers import Linearizer
 from synapse.util.distributor import user_joined_room, user_left_room
+from synapse.http.client import SimpleHttpClient
 from synapse.util.hash import sha256_and_url_safe_base64
 
 from ._base import BaseHandler
@@ -61,7 +62,9 @@ def __init__(self, hs):
         self.auth = hs.get_auth()
         self.state_handler = hs.get_state_handler()
         self.config = hs.config
-        self.simple_http_client = hs.get_simple_http_client()
+        self.simple_http_client = SimpleHttpClient(
+            hs, ip_blacklist=hs.config.federation_ip_range_blacklist
+        )
 
         self.federation_handler = hs.get_handlers().federation_handler
         self.directory_handler = hs.get_handlers().directory_handler