summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-03 13:46:50 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-03 15:35:49 +0100
commit1a7104fde3abc5392b90ca084efa896d46e24f91 (patch)
treefcec649cd875481ec120b8fed4c9719d838bdc7d /docs
parent0.99.3 (diff)
downloadsynapse-1a7104fde3abc5392b90ca084efa896d46e24f91.tar.xz
Blacklist 0.0.0.0 and :: by default for URL previews
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml14
1 files changed, 9 insertions, 5 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 4ada0fba0e..0589734b8a 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -506,11 +506,12 @@ uploads_path: "DATADIR/uploads"
 #    height: 600
 #    method: scale
 
-# Is the preview URL API enabled?  If enabled, you *must* specify
-# an explicit url_preview_ip_range_blacklist of IPs that the spider is
-# denied from accessing.
+# Is the preview URL API enabled?
 #
-#url_preview_enabled: false
+# 'false' by default: uncomment the following to enable it (and specify a
+# url_preview_ip_range_blacklist blacklist).
+#
+#url_preview_enabled: true
 
 # List of IP address CIDR ranges that the URL preview spider is denied
 # from accessing.  There are no defaults: you must explicitly
@@ -520,6 +521,9 @@ uploads_path: "DATADIR/uploads"
 # synapse to issue arbitrary GET requests to your internal services,
 # causing serious security issues.
 #
+# This must be specified if url_preview_enabled. It is recommended that you
+# uncomment the following list as a starting point.
+#
 #url_preview_ip_range_blacklist:
 #  - '127.0.0.0/8'
 #  - '10.0.0.0/8'
@@ -530,7 +534,7 @@ uploads_path: "DATADIR/uploads"
 #  - '::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.
 # This is useful for specifying exceptions to wide-ranging blacklisted