Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

rstrip slashes from url on appservice #6306

Merged
merged 6 commits into from
Oct 31, 2019
Merged

rstrip slashes from url on appservice #6306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84963af
rstrip slashes from url on appservice
Half-Shot Oct 31, 2019
aefb86a
newsfile
Half-Shot Oct 31, 2019
2103d57
space
Half-Shot Oct 31, 2019
21464f4
only strip if url is a string
Half-Shot Oct 31, 2019
95bd231
Update __init__.py
Half-Shot Oct 31, 2019
68c89b9
Update synapse/appservice/__init__.py
Half-Shot Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/6306.bugfix
View file
Open in desktop
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.
4 changes: 3 additions & 1 deletion synapse/appservice/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down