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

Serve CAS login over r0 #5286

Merged
merged 2 commits into from
May 29, 2019
Merged

Serve CAS login over r0 #5286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
641c017
serve CAS over r0
hawkowl May 29, 2019
eadf1bc
changelog
hawkowl May 29, 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/5286.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CAS login will now hit the r0 API, not the deprecated v1 one.
4 changes: 2 additions & 2 deletions synapse/rest/client/v1/login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ def on_GET(self, request):
b"redirectUrl": args[b"redirectUrl"][0]
}).encode('ascii')
hs_redirect_url = (self.cas_service_url +
b"/_matrix/client/api/v1/login/cas/ticket")
b"/_matrix/client/r0/login/cas/ticket")
service_param = urllib.parse.urlencode({
b"service": b"%s?%s" % (hs_redirect_url, client_redirect_url_param)
}).encode('ascii')
Expand All @@ -395,7 +395,7 @@ def on_GET(self, request):


class CasTicketServlet(ClientV1RestServlet):
PATTERNS = client_path_patterns("/login/cas/ticket", releases=())
PATTERNS = client_path_patterns("/login/cas/ticket")

def __init__(self, hs):
super(CasTicketServlet, self).__init__(hs)
Expand Down