summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorMartin Milata <martin@martinmilata.cz>2020-04-03 17:57:34 +0200
committerGitHub <noreply@github.com>2020-04-03 11:57:34 -0400
commitb0db928c633ad2e225623cffb20293629c5d5a43 (patch)
tree5478d4e177404ec3996f2a946006e8f2364562dd /synapse/config/server.py
parentAdd some benchmarks for LruCache (#6446) (diff)
downloadsynapse-b0db928c633ad2e225623cffb20293629c5d5a43.tar.xz
Extend web_client_location to handle absolute URLs (#7006)
Log warning when filesystem path is used.

Signed-off-by: Martin Milata <martin@martinmilata.cz>
Diffstat (limited to '')
-rw-r--r--synapse/config/server.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 7525765fee..28e2a031fb 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -604,10 +604,15 @@ class ServerConfig(Config):
         #
         pid_file: %(pid_file)s
 
-        # The path to the web client which will be served at /_matrix/client/
-        # if 'webclient' is configured under the 'listeners' configuration.
+        # The absolute URL to the web client which /_matrix/client will redirect
+        # to if 'webclient' is configured under the 'listeners' configuration.
         #
-        #web_client_location: "/path/to/web/root"
+        # This option can be also set to the filesystem path to the web client
+        # which will be served at /_matrix/client/ if 'webclient' is configured
+        # under the 'listeners' configuration, however this is a security risk:
+        # https://github.com/matrix-org/synapse#security-note
+        #
+        #web_client_location: https://riot.example.com/
 
         # The public-facing base URL that clients use to access this HS
         # (not including _matrix/...). This is the same URL a user would