cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Properly handle session next url

Browse Source
This commit is contained in:
Maxime Dor
2017-10-06 14:10:08 +02:00
parent 7e92bfa474
commit 0e48edf86e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/io/kamax/mxisd/controller/identity/v1/SessionController.java
View File

@@ -35,6 +35,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.net.MalformedURLException;
import java.net.URL;
import static org.springframework.web.bind.annotation.RequestMethod.GET; import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -67,7 +69,13 @@ class SessionController {
ValidationResult r = mgr.validate(sid, secret, token); ValidationResult r = mgr.validate(sid, secret, token);
log.info("Session {} was validated", sid); log.info("Session {} was validated", sid);
if (r.getNextUrl().isPresent()) { if (r.getNextUrl().isPresent()) {
String url = srvCfg.getPublicUrl() + r.getNextUrl().get(); String url = r.getNextUrl().get();
try {
url = new URL(url).toString();
} catch (MalformedURLException e) {
log.info("Session next URL {} is not a valid one, will prepend public URL {}", url, srvCfg.getPublicUrl());
url = srvCfg.getPublicUrl() + r.getNextUrl().get();
}
log.info("Session {} validation: next URL is present, redirecting to {}", sid, url); log.info("Session {} validation: next URL is present, redirecting to {}", sid, url);
return "redirect:" + url; return "redirect:" + url;
} else { } else {