diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-03-09 07:09:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-09 07:09:49 -0500 |
| commit | e7c3832ba65aa3b82d3738c6f8554e21d9d87d04 (patch) | |
| tree | de209f4407fbd7e6337030ded146bbbd01e5a7cb /synapse | |
| parent | Add topic and name events to group of events that are batch persisted when cr... (diff) | |
| download | synapse-e7c3832ba65aa3b82d3738c6f8554e21d9d87d04.tar.xz | |
Pull in netaddr type hints. (#15231)
And fix any issues from having those type hints.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/http/client.py | 8 | ||||
| -rw-r--r-- | synapse/http/federation/matrix_federation_agent.py | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index ae48e7c3f0..d777d59ccf 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -268,8 +268,8 @@ class BlacklistingAgentWrapper(Agent): def __init__( self, agent: IAgent, + ip_blacklist: IPSet, ip_whitelist: Optional[IPSet] = None, - ip_blacklist: Optional[IPSet] = None, ): """ Args: @@ -291,7 +291,9 @@ class BlacklistingAgentWrapper(Agent): h = urllib.parse.urlparse(uri.decode("ascii")) try: - ip_address = IPAddress(h.hostname) + # h.hostname is Optional[str], None raises an AddrFormatError, so + # this is safe even though IPAddress requires a str. + ip_address = IPAddress(h.hostname) # type: ignore[arg-type] except AddrFormatError: # Not an IP pass @@ -388,8 +390,8 @@ class SimpleHttpClient: # by the DNS resolution. self.agent = BlacklistingAgentWrapper( self.agent, - ip_whitelist=self._ip_whitelist, ip_blacklist=self._ip_blacklist, + ip_whitelist=self._ip_whitelist, ) async def request( diff --git a/synapse/http/federation/matrix_federation_agent.py b/synapse/http/federation/matrix_federation_agent.py index 0359231e7d..8d7d0a3875 100644 --- a/synapse/http/federation/matrix_federation_agent.py +++ b/synapse/http/federation/matrix_federation_agent.py @@ -87,7 +87,7 @@ class MatrixFederationAgent: reactor: ISynapseReactor, tls_client_options_factory: Optional[FederationPolicyForHTTPS], user_agent: bytes, - ip_whitelist: IPSet, + ip_whitelist: Optional[IPSet], ip_blacklist: IPSet, _srv_resolver: Optional[SrvResolver] = None, _well_known_resolver: Optional[WellKnownResolver] = None, |