diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:24:42 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:24:42 +0100 |
| commit | 9b86d3dee69702cd9fa02e7f454fd0e92a7761bb (patch) | |
| tree | 73bc79d1abde252d6433a6ccfd5ca7956589588e /docs | |
| parent | add gpg key fingerprint (diff) | |
| parent | 0.99.3.2 (diff) | |
| download | synapse-9b86d3dee69702cd9fa02e7f454fd0e92a7761bb.tar.xz | |
Merge tag 'v0.99.3.2'
Synapse 0.99.3.2 (2019-05-03) ============================= Internal Changes ---------------- - Ensure that we have `urllib3` <1.25, to resolve incompatibility with `requests`. ([\#5135](https://github.com/matrix-org/synapse/issues/5135))
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 4ada0fba0e..6ed75ff764 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,12 @@ uploads_path: "DATADIR/uploads" # synapse to issue arbitrary GET requests to your internal services, # causing serious security issues. # +# (0.0.0.0 and :: are always blacklisted, whether or not they are explicitly +# listed here, since they correspond to unroutable addresses.) +# +# This must be specified if url_preview_enabled is set. 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 +537,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 |