summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-25 17:46:09 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-25 17:46:09 +0000
commite034f14fca26b3871eb22e8a253cfa91609b8ec5 (patch)
treecfa4bb419104a4c517d63d6f1fedec45a2e25c52 /docs
parentAdd m.id_access_token to /versions unstable_features (MSC2264) (#5974) (diff)
parentUse the federation blacklist for requests to untrusted Identity Servers (#6000) (diff)
downloadsynapse-e034f14fca26b3871eb22e8a253cfa91609b8ec5.tar.xz
Use the federation blacklist for requests to untrusted Identity Servers (#6000)
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 722f111ad8..1b101b2ff5 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -117,6 +117,9 @@ pid_file: DATADIR/homeserver.pid
 # blacklist IP address CIDR ranges. If this option is not specified, or
 # specified with an empty list, no ip range blacklist will be enforced.
 #
+# As of Synapse v1.4.0 this option also affects any outbound requests to identity
+# servers provided by user input.
+#
 # (0.0.0.0 and :: are always blacklisted, whether or not they are explicitly
 # listed here, since they correspond to unroutable addresses.)
 #