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-08 19:38:43 +00:00
parent 172f7589c1
commit 4f7bcbbcb7
7 changed files with 9 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
View file

@ -18,7 +18,6 @@ import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.shared.Lock;
import com.hp.hpl.jena.util.iterator.ClosableIterator; import com.hp.hpl.jena.util.iterator.ClosableIterator;
import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.controller.BaseEditController;
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;
@ -40,8 +39,6 @@ public class NamespacesListingController extends BaseEditController {
t.printStackTrace(); t.printStackTrace();
} }
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel"); OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
ArrayList results = new ArrayList(); ArrayList results = new ArrayList();

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
View file

@ -25,7 +25,6 @@ import com.hp.hpl.jena.shared.Lock;
import com.hp.hpl.jena.util.iterator.ClosableIterator; import com.hp.hpl.jena.util.iterator.ClosableIterator;
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.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.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
@ -58,8 +57,6 @@ public class RestrictionsListingController extends BaseEditController {
epo = super.createEpo(request); epo = super.createEpo(request);
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel"); OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
ObjectPropertyDao opDao = vrequest.getFullWebappDaoFactory().getObjectPropertyDao(); ObjectPropertyDao opDao = vrequest.getFullWebappDaoFactory().getObjectPropertyDao();

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/StatementChangeListingController.java
View file

@ -24,7 +24,7 @@ import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Resource;
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.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.beans.User;
@ -59,7 +59,7 @@ public class StatementChangeListingController extends BaseEditController {
try { try {
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler"); LoginStatusBean loginBean = LoginStatusBean.getBean(vrequest);
// TODO: need to make this more restrictive // TODO: need to make this more restrictive
String userURI = (request.getParameter("userURI") != null) ? request.getParameter("userURI") : loginBean.getUserURI(); String userURI = (request.getParameter("userURI") != null) ? request.getParameter("userURI") : loginBean.getUserURI();

5
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java
View file

@ -13,7 +13,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
/** /**
* Manipulate the maximum inactive interval on sessions. * Manipulate the maximum inactive interval on sessions.
@ -56,8 +56,7 @@ public class SessionTimeoutLimitingFilter implements Filter {
} }
// If logged in, leave it alone. // If logged in, leave it alone.
Object loginBean = session.getAttribute("loginHandler"); if (LoginStatusBean.getBean(request).isLoggedIn()) {
if (loginBean instanceof LoginFormBean) {
return; return;
} }

4
webapp/src/edu/cornell/mannlib/vitro/webapp/flags/AuthFlag.java
View file

@ -2,10 +2,6 @@
package edu.cornell.mannlib.vitro.webapp.flags; package edu.cornell.mannlib.vitro.webapp.flags;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import edu.cornell.mannlib.vedit.beans.LoginFormBean;
public class AuthFlag { public class AuthFlag {
private boolean filterByAuthLevel = true; private boolean filterByAuthLevel = true;

24
webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToAuthFlag.java
View file

@ -2,11 +2,9 @@
package edu.cornell.mannlib.vitro.webapp.flags; package edu.cornell.mannlib.vitro.webapp.flags;
import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vitro.webapp.flags.AuthFlag;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.
@ -18,23 +16,7 @@ import javax.servlet.http.HttpSession;
public class RequestToAuthFlag { public class RequestToAuthFlag {
public static AuthFlag makeAuthFlag(HttpServletRequest request){ public static AuthFlag makeAuthFlag(HttpServletRequest request){
AuthFlag authFlag = new AuthFlag(); AuthFlag authFlag = new AuthFlag();
authFlag.setUserSecurityLevel(0); authFlag.setUserSecurityLevel(LoginStatusBean.getBean(request).getSecurityLevel());
HttpSession currentSession = request.getSession();
if( currentSession == null )
return authFlag;
LoginFormBean f = (LoginFormBean) currentSession.getAttribute( "loginHandler" );
if (f!=null) {
if (f.getLoginStatus().equals("authenticated")) { // test if session is still valid
if (currentSession.getId().equals(f.getSessionId())) {
if (request.getRemoteAddr().equals(f.getLoginRemoteAddr())) {
authFlag.setUserSecurityLevel(Integer.parseInt(f.getLoginRole()));
}
}
}
}
return authFlag; return authFlag;
} }
} }

13
webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToPortalFlag.java
View file

@ -10,7 +10,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@ -180,16 +180,7 @@ public class RequestToPortalFlag {
if (authFlag!=null) { if (authFlag!=null) {
currentUserSecurityLevel=authFlag.getUserSecurityLevel(); currentUserSecurityLevel=authFlag.getUserSecurityLevel();
} else { } else {
LoginFormBean f = (LoginFormBean) currentSession.getAttribute( "loginHandler" ); currentUserSecurityLevel=LoginStatusBean.getBean(request).getSecurityLevel();
if (f!=null) {
if (f.getLoginStatus().equals("authenticated")) { // test if session is still valid
if (currentSession.getId().equals(f.getSessionId())) {
if (request.getRemoteAddr().equals(f.getLoginRemoteAddr())) {
currentUserSecurityLevel=Integer.parseInt(f.getLoginRole());
}
}
}
}
} }
if (portalFlag.isFilteringActive() ){ if (portalFlag.isFilteringActive() ){