diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-02-11 07:20:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 07:20:16 -0500 |
| commit | a121507cfec0ffce45a89f5a1019034eda5b0c70 (patch) | |
| tree | 5a2f858ce5e86d2a572f4f023b76eba276308b90 /synapse/http | |
| parent | Tests: replace mocked Authenticator with the real thing (#11913) (diff) | |
| download | synapse-a121507cfec0ffce45a89f5a1019034eda5b0c70.tar.xz | |
Adds misc missing type hints (#11953)
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/client.py | 11 | ||||
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index d617055617..c01d2326cf 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -322,21 +322,20 @@ class SimpleHttpClient: self._ip_whitelist = ip_whitelist self._ip_blacklist = ip_blacklist self._extra_treq_args = treq_args or {} - - self.user_agent = hs.version_string self.clock = hs.get_clock() + + user_agent = hs.version_string if hs.config.server.user_agent_suffix: - self.user_agent = "%s %s" % ( - self.user_agent, + user_agent = "%s %s" % ( + user_agent, hs.config.server.user_agent_suffix, ) + self.user_agent = user_agent.encode("ascii") # We use this for our body producers to ensure that they use the correct # reactor. self._cooperator = Cooperator(scheduler=_make_scheduler(hs.get_reactor())) - self.user_agent = self.user_agent.encode("ascii") - if self._ip_blacklist: # If we have an IP blacklist, we need to use a DNS resolver which # filters out blacklisted IP addresses, to prevent DNS rebinding. diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 2e668363b2..c5f8fcbb2a 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -334,12 +334,11 @@ class MatrixFederationHttpClient: user_agent = hs.version_string if hs.config.server.user_agent_suffix: user_agent = "%s %s" % (user_agent, hs.config.server.user_agent_suffix) - user_agent = user_agent.encode("ascii") federation_agent = MatrixFederationAgent( self.reactor, tls_client_options_factory, - user_agent, + user_agent.encode("ascii"), hs.config.server.federation_ip_range_whitelist, hs.config.server.federation_ip_range_blacklist, ) |