rstrip slashes from url on appservice (#6306)

matrix-org · Oct 31, 2019 · 42e707c · 42e707c
1 parent 020add5
commit 42e707c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.d/6306.bugfix b/changelog.d/6306.bugfix
@@ -0,0 +1 @@
+Appservice requests will no longer contain a double slash prefix when the appservice url provided ends in a slash.
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py
@@ -94,7 +94,9 @@ def __init__(
         ip_range_whitelist=None,
     ):
         self.token = token
-        self.url = url
+        self.url = (
+            url.rstrip("/") if isinstance(url, str) else None
+        )  # url must not end with a slash
         self.hs_token = hs_token
         self.sender = sender
         self.server_name = hostname
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Appservice requests will no longer contain a double slash prefix when the appservice url provided ends in a slash.