summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-11-07 09:41:34 +0000
committerGitHub <noreply@github.com>2016-11-07 09:41:34 +0000
commitd24197bead84ff1caa692258fe85618da3b4f456 (patch)
tree7f96ec2d91b2c07b9d5861a18fbc49f4b19f796b
parentMerge pull request #1195 from matrix-org/erikj/incorrect_func (diff)
parentdefault config: blacklist more internal ips (diff)
downloadsynapse-d24197bead84ff1caa692258fe85618da3b4f456.tar.xz
Merge pull request #1198 from euank/more-ip-blacklist
default config: blacklist more internal ips
-rw-r--r--synapse/config/repository.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py
index 8810079848..2c6f57168e 100644
--- a/synapse/config/repository.py
+++ b/synapse/config/repository.py
@@ -167,6 +167,8 @@ class ContentRepositoryConfig(Config):
         # - '10.0.0.0/8'
         # - '172.16.0.0/12'
         # - '192.168.0.0/16'
+        # - '100.64.0.0/10'
+        # - '169.254.0.0/16'
         #
         # List of IP address CIDR ranges that the URL preview spider is allowed
         # to access even if they are specified in url_preview_ip_range_blacklist.