OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid getting stuck in a loop in CAS login 

498ea53 made it so that the #/login URL fragment was prioritised over the token
params in the query string; unfortunately that also means that CAS login gets
stuck in a loop where you always get redirected back to the login view.

Prioritising the URL fragment over the token params may or may not be the
correct thing to, but I also think it's incorrect that we ask the CAS server to
redirect us back to #/login. Accordingly, the easiest fix here is just to clear
the URL fragment before redirecting to CAS.
pull/21833/head
Richard van der Hoff 2017-06-16 13:06:28 +01:00
parent 3b23fc75ae
commit 1f719b3f7d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Login.js
View File

@ -178,11 +178,18 @@ export default class Login {
} }
redirectToCas() { redirectToCas() {
var client = this._createTemporaryClient(); const client = this._createTemporaryClient();
var parsedUrl = url.parse(window.location.href, true); const parsedUrl = url.parse(window.location.href, true);
// XXX: at this point, the fragment will always be #/login, which is no
// use to anyone. Ideally, we would get the intended fragment from
// MatrixChat.screenAfterLogin so that you could follow #/room links etc
// through a CAS login.
parsedUrl.hash = "";
parsedUrl.query["homeserver"] = client.getHomeserverUrl(); parsedUrl.query["homeserver"] = client.getHomeserverUrl();
parsedUrl.query["identityServer"] = client.getIdentityServerUrl(); parsedUrl.query["identityServer"] = client.getIdentityServerUrl();
var casUrl = client.getCasLoginUrl(url.format(parsedUrl)); const casUrl = client.getCasLoginUrl(url.format(parsedUrl));
window.location.href = casUrl; window.location.href = casUrl;
} }
} }