diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-05-19 08:25:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-19 12:25:25 +0000 |
| commit | 1e89976b268c296e1fd8fface36ade29c0354254 (patch) | |
| tree | af3679cfeb0fc9710adc96d5e1cfb008997fc475 /synapse/server.py | |
| parent | Do not allow deactivated users to login with JWT. (#15624) (diff) | |
| download | synapse-1e89976b268c296e1fd8fface36ade29c0354254.tar.xz | |
Rename blacklist/whitelist internally. (#15620)
Avoid renaming configuration settings for now and rename internal code to use blocklist and allowlist instead.
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/server.py b/synapse/server.py index aa90465047..f6e245569c 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -454,15 +454,15 @@ class HomeServer(metaclass=abc.ABCMeta): return SimpleHttpClient(self, use_proxy=True) @cache_in_self - def get_proxied_blacklisted_http_client(self) -> SimpleHttpClient: + def get_proxied_blocklisted_http_client(self) -> SimpleHttpClient: """ - An HTTP client that uses configured HTTP(S) proxies and blacklists IPs - based on the IP range blacklist/whitelist. + An HTTP client that uses configured HTTP(S) proxies and blocks IPs + based on the configured IP ranges. """ return SimpleHttpClient( self, - ip_whitelist=self.config.server.ip_range_whitelist, - ip_blacklist=self.config.server.ip_range_blacklist, + ip_allowlist=self.config.server.ip_range_allowlist, + ip_blocklist=self.config.server.ip_range_blocklist, use_proxy=True, ) |