summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2019-10-31 17:32:25 +0000
committerAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-10-31 17:32:25 +0000
commit42e707c663505cecb63da579d5fa2c4d30811db7 (patch)
treef8dd5c0802072c4b2ab0a188fee86f2547cfcc5e /synapse
parentUpdate black to 19.10b0 (#6304) (diff)
downloadsynapse-42e707c663505cecb63da579d5fa2c4d30811db7.tar.xz
rstrip slashes from url on appservice (#6306)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/appservice/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py

index 33b3579425..aea3985a5f 100644 --- a/synapse/appservice/__init__.py +++ b/synapse/appservice/__init__.py
@@ -94,7 +94,9 @@ class ApplicationService(object): 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