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

NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean.

Browse source
This commit is contained in:
jeb228 2010-10-13 19:57:54 +00:00
parent 5bfa8e6bd8
commit 5c3307ac59
12 changed files with 59 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

18
webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
View file

@ -115,7 +115,12 @@ public class BaseEditController extends VitroHttpServlet {
*/ */
protected boolean checkLoginStatus(HttpServletRequest request, protected boolean checkLoginStatus(HttpServletRequest request,
HttpServletResponse response) { HttpServletResponse response) {
return checkLoginStatus(request, response, LoginStatusBean.ANYBODY); if (LoginStatusBean.getBean(request).isLoggedIn()) {
return true;
} else {
redirectToLoginPage(request, response);
return false;
}
} }
/** /**
@ -125,8 +130,18 @@ public class BaseEditController extends VitroHttpServlet {
HttpServletResponse response, int minimumLevel) { HttpServletResponse response, int minimumLevel) {
if (LoginStatusBean.getBean(request).isLoggedInAtLeast(minimumLevel)) { if (LoginStatusBean.getBean(request).isLoggedInAtLeast(minimumLevel)) {
return true; return true;
} else {
redirectToLoginPage(request, response);
return false;
} }
}
/**
* Not adequately logged in. Send them to the login page, and then back to
* the page that invoked this.
*/
private void redirectToLoginPage(HttpServletRequest request,
HttpServletResponse response) {
request.getSession().setAttribute("postLoginRequest", request.getSession().setAttribute("postLoginRequest",
request.getRequestURI() + "?" + request.getQueryString()); request.getRequestURI() + "?" + request.getQueryString());
try { try {
@ -135,7 +150,6 @@ public class BaseEditController extends VitroHttpServlet {
} catch (IOException ioe) { } catch (IOException ioe) {
log.error("checkLoginStatus() could not redirect to login page"); log.error("checkLoginStatus() could not redirect to login page");
} }
return false;
} }
protected void setRequestAttributes(HttpServletRequest request, EditProcessObject epo){ protected void setRequestAttributes(HttpServletRequest request, EditProcessObject epo){

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

@ -17,7 +17,6 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItem;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -34,7 +33,7 @@ import com.hp.hpl.jena.vocabulary.RDFS;
import com.hp.hpl.jena.vocabulary.XSD; import com.hp.hpl.jena.vocabulary.XSD;
import com.ibm.icu.util.Calendar; import com.ibm.icu.util.Calendar;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties;
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
@ -483,9 +482,7 @@ public class FedoraDatastreamController extends VitroHttpServlet implements Cons
//System.out.println("Delete event name is " +deleteEventName + " - delete time is " + formattedDeleteDate); //System.out.println("Delete event name is " +deleteEventName + " - delete time is " + formattedDeleteDate);
//Get current user //Get current user
HttpSession session = req.getSession(true); String userURI = LoginStatusBean.getBean(req).getUserURI();
LoginFormBean loginBean = (LoginFormBean) session.getAttribute("loginHandler");
String userURI = loginBean.getUserURI();
//System.out.println("Current logged in user uri is " + userURI); //System.out.println("Current logged in user uri is " + userURI);
//Update model //Update model

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java
View file

@ -107,8 +107,9 @@ public class SparqlQueryServlet extends BaseEditController {
// TODO Actually, this only allows someone who is logged in to use this servlet. // TODO Actually, this only allows someone who is logged in to use this servlet.
// If a self-editor is not logged in, they will not have access. -- jb // If a self-editor is not logged in, they will not have access. -- jb
if( !checkLoginStatus(request, response) ) if( !checkLoginStatus(request, response) ) {
return; return;
}
VitroRequest vreq = new VitroRequest(request); VitroRequest vreq = new VitroRequest(request);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java
View file

@ -18,7 +18,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance; import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
@ -79,7 +79,7 @@ public class CloneEntityServlet extends BaseEditController {
return; return;
} }
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler"); LoginStatusBean loginBean = LoginStatusBean.getBean(request);
WebappDaoFactory myWebappDaoFactory = request.getFullWebappDaoFactory().getUserAwareDaoFactory(loginBean.getUserURI()); WebappDaoFactory myWebappDaoFactory = request.getFullWebappDaoFactory().getUserAwareDaoFactory(loginBean.getUserURI());
IndividualDao individualDao = myWebappDaoFactory.getIndividualDao(); IndividualDao individualDao = myWebappDaoFactory.getIndividualDao();
PropertyInstanceDao propertyInstanceDao = myWebappDaoFactory.getPropertyInstanceDao(); PropertyInstanceDao propertyInstanceDao = myWebappDaoFactory.getPropertyInstanceDao();

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
View file

@ -28,7 +28,7 @@ import edu.cornell.mannlib.vedit.beans.DynamicField;
import edu.cornell.mannlib.vedit.beans.DynamicFieldRow; import edu.cornell.mannlib.vedit.beans.DynamicFieldRow;
import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.EditProcessObject;
import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.FormObject;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.beans.Option;
import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
@ -86,7 +86,7 @@ public class EntityRetryController extends BaseEditController {
WebappDaoFactory wadf = (vreq.getAssertionsWebappDaoFactory()!=null) ? vreq.getAssertionsWebappDaoFactory() : vreq.getFullWebappDaoFactory(); WebappDaoFactory wadf = (vreq.getAssertionsWebappDaoFactory()!=null) ? vreq.getAssertionsWebappDaoFactory() : vreq.getFullWebappDaoFactory();
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler"); LoginStatusBean loginBean = LoginStatusBean.getBean(request);
WebappDaoFactory myWebappDaoFactory = wadf.getUserAwareDaoFactory(loginBean.getUserURI()); WebappDaoFactory myWebappDaoFactory = wadf.getUserAwareDaoFactory(loginBean.getUserURI());
IndividualDao ewDao = myWebappDaoFactory.getIndividualDao(); IndividualDao ewDao = myWebappDaoFactory.getIndividualDao();

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUpload.java
View file

@ -32,7 +32,7 @@ import com.hp.hpl.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.StmtIterator; import com.hp.hpl.jena.rdf.model.StmtIterator;
import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.shared.Lock;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties;
import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@ -508,7 +508,7 @@ public class N3MultiPartUpload extends VitroHttpServlet {
} }
public void sendUserEmail(HttpServletRequest request, HttpSession session, String uploadFileName) { public void sendUserEmail(HttpServletRequest request, HttpSession session, String uploadFileName) {
LoginFormBean loginBean = (LoginFormBean) session.getAttribute("loginHandler"); LoginStatusBean loginBean = LoginStatusBean.getBean(request);
String userURI = loginBean.getUserURI(); String userURI = loginBean.getUserURI();
try{ try{
System.out.println("User URI is " + userURI); System.out.println("User URI is " + userURI);

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
View file

@ -4,9 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
@ -23,7 +21,7 @@ import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.shared.Lock;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
@ -236,12 +234,7 @@ public class PrimitiveRdfEdit extends FreemarkerHttpServlet{
static public boolean checkLoginStatus(HttpServletRequest request){ static public boolean checkLoginStatus(HttpServletRequest request){
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler"); return LoginStatusBean.getBean(request).isLoggedIn();
if (loginBean == null){
return false;
} else {
return true;
}
} }

34
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
View file

@ -16,11 +16,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.iri.IRI;
import com.hp.hpl.jena.iri.IRIFactory;
import com.hp.hpl.jena.iri.Violation;
import com.hp.hpl.jena.ontology.DatatypeProperty; import com.hp.hpl.jena.ontology.DatatypeProperty;
import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.ontology.OntProperty; import com.hp.hpl.jena.ontology.OntProperty;
@ -42,11 +38,9 @@ import com.hp.hpl.jena.util.iterator.ClosableIterator;
import com.hp.hpl.jena.util.iterator.ExtendedIterator; import com.hp.hpl.jena.util.iterator.ExtendedIterator;
import com.hp.hpl.jena.vocabulary.RDF; import com.hp.hpl.jena.vocabulary.RDF;
import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.EditProcessObject;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy.ContextSetup;
import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@ -58,13 +52,6 @@ public class RefactorOperationController extends BaseEditController {
private String doFixDataTypes(HttpServletRequest request, HttpServletResponse response) private String doFixDataTypes(HttpServletRequest request, HttpServletResponse response)
{ {
String userURI = null;
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
if (loginBean != null) {
userURI = loginBean.getUserURI();
}
try { try {
super.doGet(request,response); super.doGet(request,response);
} catch (Exception e) { } catch (Exception e) {
@ -196,12 +183,7 @@ public class RefactorOperationController extends BaseEditController {
} }
private String doRenameResource(VitroRequest request, HttpServletResponse response, EditProcessObject epo) { private String doRenameResource(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
String userURI = LoginStatusBean.getBean(request).getUserURI();
String userURI = null;
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
if (loginBean != null) {
userURI = loginBean.getUserURI();
}
OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel"); OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel");
@ -296,11 +278,7 @@ public class RefactorOperationController extends BaseEditController {
} }
private void doMovePropertyStatements(VitroRequest request, HttpServletResponse response, EditProcessObject epo) { private void doMovePropertyStatements(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
String userURI = null; String userURI = LoginStatusBean.getBean(request).getUserURI();
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
if (loginBean != null) {
userURI = loginBean.getUserURI();
}
OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel"); OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
@ -379,11 +357,7 @@ public class RefactorOperationController extends BaseEditController {
} }
private void doMoveInstances(VitroRequest request, HttpServletResponse response, EditProcessObject epo) { private void doMoveInstances(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
String userURI = null; String userURI = LoginStatusBean.getBean(request).getUserURI();
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
if (loginBean != null) {
userURI = loginBean.getUserURI();
}
OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel"); OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel");
if (ontModel==null) { if (ontModel==null) {

26
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/SiteAdminController.java
View file

@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.EditProcessObject;
import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.FormObject;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vedit.util.FormUtils;
import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Portal;
@ -59,22 +59,14 @@ public class SiteAdminController extends BaseEditController {
request.setAttribute("languageModeStr", "RDF Schema Mode" ); request.setAttribute("languageModeStr", "RDF Schema Mode" );
} }
if (LoginStatusBean.getBean(vreq).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
LoginFormBean loginHandler = (LoginFormBean)request.getSession().getAttribute("loginHandler"); String verbose = request.getParameter("verbose");
if( loginHandler != null ){ if ("true".equals(verbose)) {
String status = loginHandler.getLoginStatus(); request.getSession().setAttribute(VERBOSE, Boolean.TRUE);
if ( "authenticated".equals(status) ) { } else if ("false".equals(verbose)) {
int securityLevel = Integer.parseInt( loginHandler.getLoginRole() ); request.getSession().setAttribute(VERBOSE, Boolean.FALSE);
if(securityLevel >= loginHandler.CURATOR ){ }
String verbose = request.getParameter("verbose"); }
if( "true".equals(verbose)) {
request.getSession().setAttribute(VERBOSE, Boolean.TRUE);
} else if( "false".equals(verbose)) {
request.getSession().setAttribute(VERBOSE, Boolean.FALSE);
}
}
}
}
request.setAttribute("singlePortal",new Boolean(vreq.getFullWebappDaoFactory().getPortalDao().isSinglePortal())); request.setAttribute("singlePortal",new Boolean(vreq.getFullWebappDaoFactory().getPortalDao().isSinglePortal()));

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UpdateEntityFlagServlet.java
View file

@ -6,19 +6,15 @@ import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy.ContextSetup;
import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
public class UpdateEntityFlagServlet extends VitroHttpServlet { public class UpdateEntityFlagServlet extends VitroHttpServlet {
private static final int DEFAULT_PORTAL_ID=1; private static final int DEFAULT_PORTAL_ID=1;
@ -30,11 +26,6 @@ public class UpdateEntityFlagServlet extends VitroHttpServlet {
Connection con=null; Connection con=null;
try { try {
HttpSession session = request.getSession();
LoginFormBean f = (LoginFormBean) session.getAttribute( "loginHandler" );
//don't need to touch the users database for now
// JCR 20040905 passing on portal home parameter // JCR 20040905 passing on portal home parameter
String portalIdStr=(portalIdStr=request.getParameter("home"))==null?String.valueOf(DEFAULT_PORTAL_ID):portalIdStr; String portalIdStr=(portalIdStr=request.getParameter("home"))==null?String.valueOf(DEFAULT_PORTAL_ID):portalIdStr;
//request.setAttribute("home",portalIdStr); //request.setAttribute("home",portalIdStr);

20
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java
View file

@ -18,7 +18,7 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.EditProcessObject;
import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.FormObject;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.beans.Option;
import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
@ -126,34 +126,34 @@ public class UserRetryController extends BaseEditController {
HashMap optionMap = new HashMap(); HashMap optionMap = new HashMap();
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler"); LoginStatusBean loginBean = LoginStatusBean.getBean(request);
List roleOptionList = new LinkedList(); List roleOptionList = new LinkedList();
/* bdc34: Datastar needs non-backend-editing users for logging in non-Cornell people*/ /* bdc34: Datastar needs non-backend-editing users for logging in non-Cornell people*/
/* SelfEditingPolicySetup.SELF_EDITING_POLICY_WAS_SETUP is set by the SelfEditingPolicySetup context listener */ /* SelfEditingPolicySetup.SELF_EDITING_POLICY_WAS_SETUP is set by the SelfEditingPolicySetup context listener */
boolean selfEditing = (Boolean)getServletContext().getAttribute(SelfEditingPolicySetup.SELF_EDITING_POLICY_WAS_SETUP) == Boolean.TRUE; boolean selfEditing = (Boolean)getServletContext().getAttribute(SelfEditingPolicySetup.SELF_EDITING_POLICY_WAS_SETUP) == Boolean.TRUE;
Option nonEditor = new Option(ROLE_PROTOCOL+loginBean.NON_EDITOR, "self editor"); Option nonEditor = new Option(ROLE_PROTOCOL+LoginStatusBean.NON_EDITOR, "self editor");
/* self editing should be displayed if we are editing a user account that is already /* self editing should be displayed if we are editing a user account that is already
* self-editing even if self editing is off. */ * self-editing even if self editing is off. */
if( selfEditing || if( selfEditing ||
( !"insert".equals(action) && userForEditing.getRoleURI().equals(nonEditor.getValue()) )){ ( !"insert".equals(action) && userForEditing.getRoleURI().equals(nonEditor.getValue()) )){
nonEditor.setSelected(userForEditing.getRoleURI().equals(nonEditor.getValue())); nonEditor.setSelected(userForEditing.getRoleURI().equals(nonEditor.getValue()));
if (nonEditor.getSelected() || (Integer.decode(loginBean.getLoginRole()) >= loginBean.NON_EDITOR)) if (nonEditor.getSelected() || loginBean.isLoggedInAtLeast(LoginStatusBean.NON_EDITOR))
roleOptionList.add(nonEditor); roleOptionList.add(nonEditor);
} }
Option editor = new Option(ROLE_PROTOCOL+loginBean.EDITOR, "editor"); Option editor = new Option(ROLE_PROTOCOL+LoginStatusBean.EDITOR, "editor");
editor.setSelected(userForEditing.getRoleURI().equals(editor.getValue())); editor.setSelected(userForEditing.getRoleURI().equals(editor.getValue()));
Option curator = new Option(ROLE_PROTOCOL+loginBean.CURATOR, "curator"); Option curator = new Option(ROLE_PROTOCOL+LoginStatusBean.CURATOR, "curator");
curator.setSelected(userForEditing.getRoleURI().equals(curator.getValue())); curator.setSelected(userForEditing.getRoleURI().equals(curator.getValue()));
Option administrator = new Option (ROLE_PROTOCOL+loginBean.DBA, "system administrator"); Option administrator = new Option (ROLE_PROTOCOL+LoginStatusBean.DBA, "system administrator");
administrator.setSelected(userForEditing.getRoleURI().equals(administrator.getValue())); administrator.setSelected(userForEditing.getRoleURI().equals(administrator.getValue()));
if (editor.getSelected() || (Integer.decode(loginBean.getLoginRole()) >= loginBean.EDITOR)) if (editor.getSelected() || loginBean.isLoggedInAtLeast(LoginStatusBean.EDITOR))
roleOptionList.add(editor); roleOptionList.add(editor);
if (curator.getSelected() || (Integer.decode(loginBean.getLoginRole()) >= loginBean.CURATOR)) if (curator.getSelected() || loginBean.isLoggedInAtLeast(LoginStatusBean.CURATOR))
roleOptionList.add(curator); roleOptionList.add(curator);
if (administrator.getSelected() || (Integer.decode(loginBean.getLoginRole()) >= loginBean.DBA)) if (administrator.getSelected() || loginBean.isLoggedInAtLeast(LoginStatusBean.DBA))
roleOptionList.add(administrator); roleOptionList.add(administrator);
optionMap.put("Role", roleOptionList); optionMap.put("Role", roleOptionList);

26
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java
View file

@ -8,7 +8,7 @@ import java.util.Map;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
@ -40,15 +40,7 @@ public class IndexController extends FreemarkerHttpServlet {
// //
// public void doGet( HttpServletRequest request, HttpServletResponse response ) // public void doGet( HttpServletRequest request, HttpServletResponse response )
// throws IOException, ServletException { // throws IOException, ServletException {
// // if (!LoginStatusBean.getBean(vreq).isLoggedInAtLeast(LoginStatusBean.DBA)) {
// Object obj = request.getSession().getAttribute("loginHandler");
// LoginFormBean loginHandler = null;
// if( obj != null && obj instanceof LoginFormBean )
// loginHandler = ((LoginFormBean)obj);
// if( loginHandler == null ||
// ! "authenticated".equalsIgnoreCase(loginHandler.getLoginStatus()) ||
// Integer.parseInt(loginHandler.getLoginRole()) <= 5 ){
//
// String redirectURL=request.getContextPath() + Controllers.SITE_ADMIN + "?login=block"; // String redirectURL=request.getContextPath() + Controllers.SITE_ADMIN + "?login=block";
// response.sendRedirect(redirectURL); // response.sendRedirect(redirectURL);
// return; // return;
@ -77,20 +69,12 @@ public class IndexController extends FreemarkerHttpServlet {
@Override @Override
protected ResponseValues processRequest(VitroRequest vreq) { protected ResponseValues processRequest(VitroRequest vreq) {
if (!LoginStatusBean.getBean(vreq).isLoggedInAtLeast(LoginStatusBean.DBA)) {
Object obj = vreq.getSession().getAttribute("loginHandler");
Map<String, Object> body = new HashMap<String, Object>();
LoginFormBean loginHandler = null;
if( obj != null && obj instanceof LoginFormBean )
loginHandler = ((LoginFormBean)obj);
if( loginHandler == null ||
! "authenticated".equalsIgnoreCase(loginHandler.getLoginStatus()) ||
Integer.parseInt(loginHandler.getLoginRole()) <= LoginFormBean.CURATOR ){
return new RedirectResponseValues(UrlBuilder.getUrl(Route.LOGIN)); return new RedirectResponseValues(UrlBuilder.getUrl(Route.LOGIN));
} }
Map<String, Object> body = new HashMap<String, Object>();
// long start = System.currentTimeMillis(); // long start = System.currentTimeMillis();
try { try {
IndexBuilder builder = (IndexBuilder)getServletContext().getAttribute(IndexBuilder.class.getName()); IndexBuilder builder = (IndexBuilder)getServletContext().getAttribute(IndexBuilder.class.getName());