OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid duplicate the URLs.

pull/7186/head
Patrick Cloke 2020-04-01 11:27:04 -04:00
parent 49a79fa24f
commit 79f7a9a405
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/cas_handler.py
View File

@ -173,7 +173,7 @@ class CasHandler:
return "%s/login?%s" % (self._cas_server_url, args) return "%s/login?%s" % (self._cas_server_url, args)
async def handle_ticket_for_login( async def handle_ticket_for_login(
self, request: SynapseRequest, client_redirect_url: str, ticket: str self, request: SynapseRequest, client_redirect_url: str, ticket: str,
) -> None: ) -> None:
""" """
Validates a CAS ticket sent by the client and completes the login process. Validates a CAS ticket sent by the client and completes the login process.
@ -191,7 +191,7 @@ class CasHandler:
ticket: The CAS ticket provided by the client. ticket: The CAS ticket provided by the client.
""" """
username, user_display_name = await self._validate_ticket( username, user_display_name = await self._validate_ticket(
ticket, "/_matrix/client/r0/login/cas/ticket", client_redirect_url ticket, request.path, client_redirect_url
) )
localpart = map_username_to_mxid_localpart(username) localpart = map_username_to_mxid_localpart(username)
@ -223,9 +223,7 @@ class CasHandler:
session_id: The UI Auth session ID. session_id: The UI Auth session ID.
""" """
client_redirect_url = "" client_redirect_url = ""
user, _ = await self._validate_ticket( user, _ = await self._validate_ticket(ticket, request.path, client_redirect_url)
ticket, "/_matrix/client/r0/auth/cas/ticket", client_redirect_url
)
localpart = map_username_to_mxid_localpart(user) localpart = map_username_to_mxid_localpart(user)
user_id = UserID(localpart, self._hostname).to_string() user_id = UserID(localpart, self._hostname).to_string()