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

Apply the federation_ip_range_blacklist to push and key revocation requests #8821

Merged
merged 16 commits into from
Dec 2, 2020
Merged

Apply the federation_ip_range_blacklist to push and key revocation requests #8821

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9e8b37f
Apply the federation_ip_range_blacklist to push.
clokep Nov 20, 2020
2c4d34b
Use the new blacklisted client for identity.
clokep Nov 20, 2020
8741ba4
Remove unused HTTP clients.
clokep Nov 25, 2020
1adfd35
Apply the federation_ip_range_blacklist to key revocation.
clokep Nov 25, 2020
82c067d
Apply the federation_ip_range_blacklist to well-known look-ups.
clokep Nov 25, 2020
f559354
Abstract the code to blacklist IP address resolutions.
clokep Nov 25, 2020
b22a244
Rename get_http_client to get_federation_http_client.
clokep Nov 25, 2020
2d2b5f4
Add a newsfragment.
clokep Nov 25, 2020
2a8d6c6
Add a ip_range_blacklist setting and fallback to federation_ip_range_…
clokep Nov 30, 2020
d5ba7a9
Merge remote-tracking branch 'origin/develop' into clokep/ip-blacklists
clokep Nov 30, 2020
7233d25
Lint
clokep Nov 30, 2020
772ab20
Fix whitespace.
clokep Nov 30, 2020
4a33a09
Merge remote-tracking branch 'origin/develop' into clokep/ip-blacklists
clokep Dec 1, 2020
a502bdc
Fix typo.
clokep Dec 2, 2020
67de92d
Clarify wording in the sample configuration.
clokep Dec 2, 2020
f4deee7
Merge remote-tracking branch 'origin/develop' into clokep/ip-blacklists
clokep Dec 2, 2020
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
2 changes: 1 addition & 1 deletion docs/sample_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ acme:
# servers provided by user input.
#
# As of Synapse v1.24.0 this option also affects any outbound requests to push
# servers provided by user input.
# servers provided by user input and to key revocation requests.
Copy link
Member

Choose a reason for hiding this comment

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

we should be clearer about what sort of "key" this is talking about. It might be clearer to say "for checking key validitity for third-party invite events".

#
# (0.0.0.0 and :: are always blacklisted, whether or not they are explicitly
# listed here, since they correspond to unroutable addresses.)
Expand Down
2 changes: 1 addition & 1 deletion synapse/config/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs):
# servers provided by user input.
#
# As of Synapse v1.24.0 this option also affects any outbound requests to push
# servers provided by user input.
# servers provided by user input and to key revocation requests.
#
# (0.0.0.0 and :: are always blacklisted, whether or not they are explicitly
# listed here, since they correspond to unroutable addresses.)
Expand Down
2 changes: 1 addition & 1 deletion synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def __init__(self, hs: "HomeServer"):
self._message_handler = hs.get_message_handler()
self._server_notices_mxid = hs.config.server_notices_mxid
self.config = hs.config
self.http_client = hs.get_simple_http_client()
self.http_client = hs.get_proxied_blacklisted_http_client()
self._instance_name = hs.get_instance_name()
self._replication = hs.get_replication_data_handler()

Expand Down