diff options
| author | Kento Okamoto <Kentokamoto@users.noreply.github.com> | 2021-08-03 11:13:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-03 18:13:34 +0000 |
| commit | 72935b7c5053af122c8cb5767a3e85a3a0f3a20c (patch) | |
| tree | 46445f327f205e76a1285168aa3ac85794563ca2 /synapse/config/server.py | |
| parent | Fix debian package triggers (#10481) (diff) | |
| download | synapse-72935b7c5053af122c8cb5767a3e85a3a0f3a20c.tar.xz | |
Add warnings to ip_range_blacklist usage with proxies (#10129)
Per issue #9812 using `url_preview_ip_range_blacklist` with a proxy via `HTTPS_PROXY` or `HTTP_PROXY` environment variables has some inconsistent bahavior than mentioned. This PR changes the following: - Changes the Sample Config file to include a note mentioning that `url_preview_ip_range_blacklist` and `ip_range_blacklist` is ignored when using a proxy - Changes some logic in synapse/config/repository.py to send a warning when both `*ip_range_blacklist` configs and a proxy environment variable are set and but no longer throws an error. Signed-off-by: Kento Okamoto <kentokamoto@protonmail.com>
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index b9e0c0b300..187b4301a0 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -960,6 +960,8 @@ class ServerConfig(Config): # # This option replaces federation_ip_range_blacklist in Synapse v1.25.0. # + # Note: The value is ignored when an HTTP proxy is in use + # #ip_range_blacklist: %(ip_range_blacklist)s |