summary refs log tree commit diff
path: root/synapse/config/repository.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-06-01 14:45:14 +0100
committerGitHub <noreply@github.com>2018-06-01 14:45:14 +0100
commita9e97dcd65dfebb0683621aa1efdff2c11d204f6 (patch)
treea6cc8e9e9e82e557b3f3e0a5d1a04d0ec2fe8700 /synapse/config/repository.py
parentMerge pull request #3264 from matrix-org/neil/sign-up-stats (diff)
parentAdd private IPv6 addresses to preview blacklist #3312 (diff)
downloadsynapse-a9e97dcd65dfebb0683621aa1efdff2c11d204f6.tar.xz
Merge pull request #3317 from thegcat/feature/3312-add_ipv6_to_blacklist_example_config
Add private IPv6 addresses to example config for url preview blacklist
Diffstat (limited to 'synapse/config/repository.py')
-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.