summary refs log tree commit diff
diff options
context:
space:
mode:
authorEuan Kemp <euan.kemp@coreos.com>2016-11-06 17:02:25 -0800
committerEuan Kemp <euan.kemp@coreos.com>2016-11-06 17:02:25 -0800
commitc6bbad109bfa97bc31ae76d6f4d83111ffa04ec4 (patch)
treee8dff12e67f82c1bd44568a564e5544bd4c66b56
parentMerge branch 'release-v0.18.2' of github.com:matrix-org/synapse (diff)
downloadsynapse-c6bbad109bfa97bc31ae76d6f4d83111ffa04ec4.tar.xz
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.