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

VIVO-241 Fix VitroRequestPrep.isSelfEditing(), which should fix the controllers that rely on this call. Previously, this worked correctly only for "fake" self-editing.

Browse source
This commit is contained in:
jeb228 2010-11-16 16:13:55 +00:00
parent 82581dc043
commit 279c083d89
2 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FakeSelfEditController.java
View file

@ -15,15 +15,16 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.FakeSelfEditingIdentifierFactory;
import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep;
/**
* TODO This is caught in the middle of the transition from LoginFormBean to LoginStatusBean.
*/
public class FakeSelfEditController extends VitroHttpServlet {
// TODO When the LoginFormBean goes away, these should too.
private static final String ATTRIBUTE_LOGIN_FORM_BEAN = "loginHandler";
private static final String ATTRIBUTE_LOGIN_STATUS_BEAN = "loginStatus";
private static final String ATTRIBUTE_LOGIN_FORM_SAVE = "saveLoginHandler";
private static final String ATTRIBUTE_LOGIN_STATUS_BEAN = "loginStatus";
private static final String ATTRIBUTE_LOGIN_STATUS_SAVE = "saveLoginStatus";
private static final Log log = LogFactory
@ -63,7 +64,6 @@ public class FakeSelfEditController extends VitroHttpServlet {
private void startFaking(VitroRequest vreq, HttpServletResponse response)
throws IOException {
HttpSession session = vreq.getSession();
VitroRequestPrep.forceToSelfEditing(vreq);
String id = vreq.getParameter("netid");
FakeSelfEditingIdentifierFactory.putFakeIdInSession(id, session);
@ -80,7 +80,6 @@ public class FakeSelfEditController extends VitroHttpServlet {
private void stopFaking(VitroRequest request, HttpServletResponse response,
HttpSession session) throws IOException {
VitroRequestPrep.forceOutOfSelfEditing(request);
FakeSelfEditingIdentifierFactory.clearFakeIdInSession(session);
// Restore our original login status.

40
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
View file

@ -20,11 +20,14 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.SelfEditing;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
import edu.cornell.mannlib.vitro.webapp.dao.PortalDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.filtering.WebappDaoFactoryFiltering;
@ -400,19 +403,28 @@ public class VitroRequestPrep implements Filter {
(new VitroRequest(request)).setPortalId( portalId.toString() );
}
public static void forceToSelfEditing(HttpServletRequest request){
HttpSession sess = request.getSession(true);
sess.setMaxInactiveInterval(Authenticator.LOGGED_IN_TIMEOUT_INTERVAL);
sess.setAttribute("inSelfEditing","true");
}
public static void forceOutOfSelfEditing(HttpServletRequest request){
HttpSession sess = request.getSession(true);
sess.removeAttribute("inSelfEditing");
}
public static boolean isSelfEditing(HttpServletRequest request){
HttpSession sess = request.getSession(false);
return sess != null && "true".equalsIgnoreCase((String)sess.getAttribute("inSelfEditing")) ;
}
/**
* Check to see whether any of the current identifiers is a SelfEditing
* identifier.
*/
public static boolean isSelfEditing(HttpServletRequest request) {
HttpSession session = request.getSession(false);
if (session == null) {
return false;
}
ServletContext sc = session.getServletContext();
IdentifierBundle idBundle = ServletIdentifierBundleFactory
.getIdBundleForRequest(request, session, sc);
for (Identifier id : idBundle) {
if (id instanceof SelfEditing) {
return true;
}
}
return false;
}
public void destroy() {
}