diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-25 17:16:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-09-25 17:16:28 +0100 |
| commit | d2bd0bc6b188cca8c85ec34c79a70596ec0e46b1 (patch) | |
| tree | 15032c3b14c0c9e3e52db8cd5fa4a04d985f034e /synapse/config/server.py | |
| parent | Use if `is not None` (diff) | |
| parent | Threepid validity checks on msisdns should not be dependent on 'threepid_beha... (diff) | |
| download | synapse-d2bd0bc6b188cca8c85ec34c79a70596ec0e46b1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 7f8d315954..419787a89c 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -545,6 +545,9 @@ class ServerConfig(Config): # blacklist IP address CIDR ranges. If this option is not specified, or # specified with an empty list, no ip range blacklist will be enforced. # + # As of Synapse v1.4.0 this option also affects any outbound requests to identity + # servers provided by user input. + # # (0.0.0.0 and :: are always blacklisted, whether or not they are explicitly # listed here, since they correspond to unroutable addresses.) # |