1
0

Compare commits

...

2 Commits

Author SHA1 Message Date
Eric Eastwood
b3271f5b69 Same changelog as #15773 2023-07-06 09:55:28 -05:00
Eric Eastwood
b019062634 Fix TLS when using the ProxyAgent
Same fix as https://github.com/matrix-org/synapse/pull/15746

Thanks to @realtyem for pointing it out!

`creatorForNetloc(...)` doesn't come with typing and expects `host`
to be `bytes` instead of a `str`.

`ProxyAgent` was introduced with the federation outbound proxy:
https://github.com/matrix-org/synapse/pull/15773
2023-07-06 09:51:06 -05:00
2 changed files with 2 additions and 1 deletions

View File

@@ -0,0 +1 @@
Allow configuring the set of workers to proxy outbound federation traffic through via `outbound_federation_restricted_to`.

View File

@@ -152,7 +152,7 @@ class ProxyAgent(_AgentBase):
if federation_proxy.tls:
tls_connection_creator = self._policy_for_https.creatorForNetloc(
federation_proxy.host,
federation_proxy.host.encode("utf-8"),
federation_proxy.port,
)
endpoint = wrapClientTLS(tls_connection_creator, endpoint)