litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-151 handle the case where we come from a bookmark of the login link -- a "return" parameter with no referrer.

Browse source
This commit is contained in:
jeb228 2010-12-10 16:30:22 +00:00
parent e3e7e1ebd6
commit 1a970e6262
3 changed files with 83 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

36
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java
View file

@ -30,7 +30,6 @@ public class LoginRedirector {
private final HttpSession session; private final HttpSession session;
private final String uriOfAssociatedIndividual; private final String uriOfAssociatedIndividual;
private final String loginProcessPage;
private final String afterLoginPage; private final String afterLoginPage;
public LoginRedirector(HttpServletRequest request, public LoginRedirector(HttpServletRequest request,
@ -43,7 +42,6 @@ public class LoginRedirector {
LoginProcessBean processBean = LoginProcessBean.getBean(request); LoginProcessBean processBean = LoginProcessBean.getBean(request);
log.debug("process bean is: " + processBean); log.debug("process bean is: " + processBean);
loginProcessPage = processBean.getLoginPageUrl();
afterLoginPage = processBean.getAfterLoginUrl(); afterLoginPage = processBean.getAfterLoginUrl();
} }
@ -80,18 +78,15 @@ public class LoginRedirector {
+ "but the system contains no profile for you."); + "but the system contains no profile for you.");
response.sendRedirect(getApplicationHomePageUrl()); response.sendRedirect(getApplicationHomePageUrl());
} else { } else {
if (hasSomeplaceToGoAfterLogin()) { if (isLoginPage(afterLoginPage)) {
log.debug("Returning to requested page: " + afterLoginPage);
response.sendRedirect(afterLoginPage);
} else if (loginProcessPage == null) {
log.debug("Don't know what to do. Go home.");
response.sendRedirect(getApplicationHomePageUrl());
} else if (isLoginPage(loginProcessPage)) {
log.debug("Coming from /login. Going to site admin page."); log.debug("Coming from /login. Going to site admin page.");
response.sendRedirect(getSiteAdminPageUrl()); response.sendRedirect(getSiteAdminPageUrl());
} else if (null != afterLoginPage) {
log.debug("Returning to requested page: " + afterLoginPage);
response.sendRedirect(afterLoginPage);
} else { } else {
log.debug("Coming from a login widget. Going back there."); log.debug("Don't know what to do. Go home.");
response.sendRedirect(loginProcessPage); response.sendRedirect(getApplicationHomePageUrl());
} }
} }
LoginProcessBean.removeBean(request); LoginProcessBean.removeBean(request);
@ -103,18 +98,15 @@ public class LoginRedirector {
public void redirectCancellingUser() throws IOException { public void redirectCancellingUser() throws IOException {
try { try {
if (hasSomeplaceToGoAfterLogin()) { if (isLoginPage(afterLoginPage)) {
log.debug("Returning to requested page: " + afterLoginPage);
response.sendRedirect(afterLoginPage);
} else if (loginProcessPage == null) {
log.debug("Don't know what to do. Go home.");
response.sendRedirect(getApplicationHomePageUrl());
} else if (isLoginPage(loginProcessPage)) {
log.debug("Coming from /login. Going to home."); log.debug("Coming from /login. Going to home.");
response.sendRedirect(getApplicationHomePageUrl()); response.sendRedirect(getApplicationHomePageUrl());
} else if (null != afterLoginPage) {
log.debug("Returning to requested page: " + afterLoginPage);
response.sendRedirect(afterLoginPage);
} else { } else {
log.debug("Coming from a login widget. Going back there."); log.debug("Don't know what to do. Go home.");
response.sendRedirect(loginProcessPage); response.sendRedirect(getApplicationHomePageUrl());
} }
LoginProcessBean.removeBean(request); LoginProcessBean.removeBean(request);
} catch (IOException e) { } catch (IOException e) {
@ -131,10 +123,6 @@ public class LoginRedirector {
response.sendRedirect(getApplicationHomePageUrl()); response.sendRedirect(getApplicationHomePageUrl());
} }
private boolean hasSomeplaceToGoAfterLogin() {
return afterLoginPage != null;
}
private boolean isMerelySelfEditor() { private boolean isMerelySelfEditor() {
return LoginStatusBean.getBean(session).isLoggedInExactly( return LoginStatusBean.getBean(session).isLoggedInExactly(
LoginStatusBean.NON_EDITOR); LoginStatusBean.NON_EDITOR);

62
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
View file

@ -135,36 +135,60 @@ public class Authenticate extends VitroHttpServlet {
/** /**
* If they supply an after-login page, record it and use the Login page for * If they supply an after-login page, record it and use the Login page for
* the process. * the process. Note that we expect it to be URL-encoded.
* *
* If they supply a return flag, record the referrer as the after-login page * If they supply a return flag, record the current page as the after-login
* and use the Login page for the process. * page and use the Login page for the process.
* *
* Otherwise, use the current page for the process. * Otherwise, use the current page for the process.
*
* The "current page" is the referrer, unless there is no referrer for some
* reason. In that case, pretend it's the login page.
*/ */
private void recordLoginProcessPages(HttpServletRequest request) { private void recordLoginProcessPages(HttpServletRequest request) {
LoginProcessBean bean = LoginProcessBean.getBean(request); LoginProcessBean bean = LoginProcessBean.getBean(request);
String afterLoginUrl = request.getParameter(PARAMETER_AFTER_LOGIN); String afterLoginUrl = decodeAfterLoginParameter(request);
boolean doReturn = isReturnParameterSet(request);
String referrer = whereDidWeComeFrom(request);
if (afterLoginUrl != null) { if (afterLoginUrl != null) {
try { bean.setAfterLoginUrl(afterLoginUrl);
String decoded = URLDecoder.decode(afterLoginUrl, "UTF-8"); bean.setLoginPageUrl(request.getContextPath() + Controllers.LOGIN);
bean.setAfterLoginUrl(decoded); } else if (doReturn) {
} catch (UnsupportedEncodingException e) {
log.error("Really? No UTF-8 encoding?");
}
}
String returnParameter = request.getParameter(PARAMETER_RETURN);
if (returnParameter != null) {
String referrer = request.getHeader("referer");
bean.setAfterLoginUrl(referrer); bean.setAfterLoginUrl(referrer);
}
if (bean.getAfterLoginUrl() != null) {
bean.setLoginPageUrl(request.getContextPath() + Controllers.LOGIN); bean.setLoginPageUrl(request.getContextPath() + Controllers.LOGIN);
} else { } else {
bean.setLoginPageUrl(request.getHeader("referer")); bean.setAfterLoginUrl(referrer);
bean.setLoginPageUrl(referrer);
}
}
private String decodeAfterLoginParameter(HttpServletRequest request) {
String parm = request.getParameter(PARAMETER_AFTER_LOGIN);
if (parm == null) {
return null;
} else {
try {
return URLDecoder.decode(parm, "UTF-8");
} catch (UnsupportedEncodingException e) {
log.error("No UTF-8 encoding? Really?", e);
return parm;
}
}
}
private boolean isReturnParameterSet(HttpServletRequest request) {
return (null != request.getParameter(PARAMETER_RETURN));
}
/** If no referrer, say we were on the login page. */
private String whereDidWeComeFrom(HttpServletRequest request) {
String referrer = request.getHeader("referer");
if (referrer != null) {
return referrer;
} else {
return request.getContextPath() + Controllers.LOGIN;
} }
} }

43
webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
View file

@ -183,8 +183,12 @@ public class AuthenticateTest extends AbstractTestClass {
private static final HowDidWeGetHere FROM_WIDGET = new HowDidWeGetHere( private static final HowDidWeGetHere FROM_WIDGET = new HowDidWeGetHere(
null, false, URL_WIDGET); null, false, URL_WIDGET);
private static final HowDidWeGetHere FROM_LOGIN = new HowDidWeGetHere(null, private static final HowDidWeGetHere FROM_LOGIN = new HowDidWeGetHere(
false, URL_LOGIN); null, false, URL_LOGIN);
/** "return" parameter with no referrer - like coming from the login page. */
private static final HowDidWeGetHere FROM_BOOKMARK_OF_LINK = new HowDidWeGetHere(
null, true, null);
// --------- All sets of test data ---------- // --------- All sets of test data ----------
@ -202,26 +206,28 @@ public class AuthenticateTest extends AbstractTestClass {
{ OLD_DBA, FROM_FORCED, { OLD_DBA, FROM_FORCED,
new WhereTo(URL_LOGIN, URL_RESTRICTED, null) }, // 4 new WhereTo(URL_LOGIN, URL_RESTRICTED, null) }, // 4
{ OLD_DBA, FROM_LINK, new WhereTo(URL_LOGIN, URL_LINK, null) }, // 5 { OLD_DBA, FROM_LINK, new WhereTo(URL_LOGIN, URL_LINK, null) }, // 5
{ OLD_DBA, FROM_BOOKMARK_OF_LINK,
new WhereTo(URL_LOGIN, URL_SITE_ADMIN, null) }, // 6
{ OLD_DBA, FROM_WIDGET, { OLD_DBA, FROM_WIDGET,
new WhereTo(URL_WIDGET, URL_WIDGET, null) }, // 6 new WhereTo(URL_WIDGET, URL_WIDGET, null) }, // 7
{ OLD_DBA, FROM_LOGIN, { OLD_DBA, FROM_LOGIN,
new WhereTo(URL_LOGIN, URL_SITE_ADMIN, null) }, // 7 new WhereTo(URL_LOGIN, URL_SITE_ADMIN, null) }, // 8
{ OLD_SELF, FROM_FORCED, { OLD_SELF, FROM_FORCED,
new WhereTo(URL_LOGIN, URL_SELF_PROFILE, null) }, // 8
{ OLD_SELF, FROM_LINK,
new WhereTo(URL_LOGIN, URL_SELF_PROFILE, null) }, // 9 new WhereTo(URL_LOGIN, URL_SELF_PROFILE, null) }, // 9
{ OLD_SELF, FROM_LINK,
new WhereTo(URL_LOGIN, URL_SELF_PROFILE, null) }, // 10
{ OLD_SELF, FROM_WIDGET, { OLD_SELF, FROM_WIDGET,
new WhereTo(URL_WIDGET, URL_SELF_PROFILE, null) }, // 10 new WhereTo(URL_WIDGET, URL_SELF_PROFILE, null) }, // 11
{ OLD_SELF, FROM_LOGIN, { OLD_SELF, FROM_LOGIN,
new WhereTo(URL_LOGIN, URL_SELF_PROFILE, null) }, // 11 new WhereTo(URL_LOGIN, URL_SELF_PROFILE, null) }, // 12
{ NEW_STRANGER, FROM_FORCED, { NEW_STRANGER, FROM_FORCED,
new WhereTo(URL_LOGIN, URL_HOME, URL_RESTRICTED) }, // 12 new WhereTo(URL_LOGIN, URL_HOME, URL_RESTRICTED) }, // 13
{ NEW_STRANGER, FROM_LINK, { NEW_STRANGER, FROM_LINK,
new WhereTo(URL_LOGIN, URL_HOME, URL_LINK) }, // 13 new WhereTo(URL_LOGIN, URL_HOME, URL_LINK) }, // 14
{ NEW_STRANGER, FROM_WIDGET, { NEW_STRANGER, FROM_WIDGET,
new WhereTo(URL_WIDGET, URL_HOME, URL_WIDGET) }, // 14 new WhereTo(URL_WIDGET, URL_HOME, URL_WIDGET) }, // 15
{ NEW_STRANGER, FROM_LOGIN, { NEW_STRANGER, FROM_LOGIN,
new WhereTo(URL_LOGIN, URL_HOME, URL_HOME) } // 15 new WhereTo(URL_LOGIN, URL_HOME, URL_HOME) } // 16
}; };
return Arrays.asList(data); return Arrays.asList(data);
} }
@ -503,7 +509,7 @@ public class AuthenticateTest extends AbstractTestClass {
processBean.setAfterLoginUrl(urlBundle.referrer); processBean.setAfterLoginUrl(urlBundle.referrer);
processBean.setLoginPageUrl(URL_LOGIN); processBean.setLoginPageUrl(URL_LOGIN);
} else { } else {
processBean.setAfterLoginUrl(null); processBean.setAfterLoginUrl(urlBundle.referrer);
processBean.setLoginPageUrl(urlBundle.referrer); processBean.setLoginPageUrl(urlBundle.referrer);
} }
LoginProcessBean.setBean(request, processBean); LoginProcessBean.setBean(request, processBean);
@ -562,10 +568,15 @@ public class AuthenticateTest extends AbstractTestClass {
assertEquals("username", username, bean.getUsername()); assertEquals("username", username, bean.getUsername());
// This should represent the URL bundle, every time. // This should represent the URL bundle, every time.
String expectedAfterLoginUrl = (urlBundle.returnParameterSet) ? urlBundle.referrer if (urlBundle.afterLoginUrl != null) {
: urlBundle.afterLoginUrl; assertEquals("after login URL", urlBundle.afterLoginUrl,
assertEquals("after login URL", expectedAfterLoginUrl,
bean.getAfterLoginUrl()); bean.getAfterLoginUrl());
} else if (urlBundle.referrer != null) {
assertEquals("after login URL", urlBundle.referrer,
bean.getAfterLoginUrl());
} else {
assertEquals("after login URL", URL_LOGIN, bean.getAfterLoginUrl());
}
} }
/** What logins were completed in this test? */ /** What logins were completed in this test? */