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

Fix TLS in the federation outbound proxy #15886

Closed
MadLittleMods wants to merge 2 commits into from
Closed

Fix TLS in the federation outbound proxy #15886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b019062
Fix TLS when using the `ProxyAgent`
MadLittleMods Jul 6, 2023
b3271f5
Same changelog as #15773
MadLittleMods Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/15886.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow configuring the set of workers to proxy outbound federation traffic through via `outbound_federation_restricted_to`.
Copy link
Contributor Author

@MadLittleMods MadLittleMods Jul 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same changelog as #15773 so they merge since we're fixing something that was just merged.

Copy link
Contributor Author

@MadLittleMods MadLittleMods Jul 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review @clokep! Since we had to revert the original PR, I've just incorporated this change in the PR to re-introduce everything -> #15913

2 changes: 1 addition & 1 deletion synapse/http/proxyagent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def __init__(

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)
Expand Down