summary refs log tree commit diff
diff options
context:
space:
mode:
authorDmitry Borodaenko <angdraug@gmail.com>2020-11-26 02:57:26 -0800
committerGitHub <noreply@github.com>2020-11-26 10:57:26 +0000
commit7c4344747709e9a03e96f85f96affd5faa22e0ee (patch)
treec8de5157aaea7627411342f3e7ca569e91b1c93e
parentImprove documentation how to configure prometheus for workers (#8822) (diff)
downloadsynapse-7c4344747709e9a03e96f85f96affd5faa22e0ee.tar.xz
Strip trailing / from server_url in register_new_matrix_user (#8823)
When server URL provided to register_new_matrix_user includes path
component (e.g. "http://localhost:8008/"), the command fails with
"ERROR! Received 400 Bad Request". Stripping trailing slash from the
server_url command argument makes sure combined endpoint URL remains
valid.

Signed-off-by: Dmitry Borodaenko angdraug@debian.org
-rw-r--r--changelog.d/8823.bugfix1
-rw-r--r--synapse/_scripts/register_new_matrix_user.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/8823.bugfix b/changelog.d/8823.bugfix
new file mode 100644
index 0000000000..74af1c20b6
--- /dev/null
+++ b/changelog.d/8823.bugfix
@@ -0,0 +1 @@
+Fix `register_new_matrix_user` failing with "Bad Request" when trailing slash is included in server URL. Contributed by @angdraug.
diff --git a/synapse/_scripts/register_new_matrix_user.py b/synapse/_scripts/register_new_matrix_user.py
index d37ccccd5b..dfe26dea6d 100644
--- a/synapse/_scripts/register_new_matrix_user.py
+++ b/synapse/_scripts/register_new_matrix_user.py
@@ -37,7 +37,7 @@ def request_registration(
     exit=sys.exit,
 ):
 
-    url = "%s/_synapse/admin/v1/register" % (server_location,)
+    url = "%s/_synapse/admin/v1/register" % (server_location.rstrip("/"),)
 
     # Get the nonce
     r = requests.get(url, verify=False)