summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorFelix Schäfer <felix@thegcat.net>2018-06-01 12:18:35 +0200
committerFelix Schäfer <felix@thegcat.net>2018-06-01 12:18:35 +0200
commit4ef76f3ac4cec1e2faf84c5423eb1c305966b646 (patch)
tree968f037a1146d1cdfe680e4d6ab94f6eaa9181b7 /synapse/config
parentcode_style.rst: formatting (diff)
downloadsynapse-4ef76f3ac4cec1e2faf84c5423eb1c305966b646.tar.xz
Add private IPv6 addresses to preview blacklist #3312
The added addresses are expected to be local or loopback addresses and
shouldn't be spidered for previews.

Signed-off-by: Felix Schäfer <felix@thegcat.net>
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/repository.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py
index 25ea77738a..81ecf9778c 100644
--- a/synapse/config/repository.py
+++ b/synapse/config/repository.py
@@ -250,6 +250,9 @@ class ContentRepositoryConfig(Config):
         # - '192.168.0.0/16'
         # - '100.64.0.0/10'
         # - '169.254.0.0/16'
+        # - '::1/128'
+        # - 'fe80::/64'
+        # - 'fc00::/7'
         #
         # 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.