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

NIHVIVO-2492 convert final controllers from checkLoginStatus() to isAuthorizedToDisplayPage()

Browse source
This commit is contained in:
j2blake 2011-04-27 20:35:57 +00:00
parent 5610249bbc
commit 5678965935
7 changed files with 30 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

45
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java
View file

@ -129,51 +129,6 @@ public class VitroHttpServlet extends HttpServlet {
// static utility methods for all Vitro servlets
// ----------------------------------------------------------------------
/**
* If not logged in, redirect them to the login page.
*
* TODO this goes away as it is replace by annotations.
*/
public static boolean checkLoginStatus(HttpServletRequest request,
HttpServletResponse response) {
LogoutRedirector.recordRestrictedPageUri(request);
if (LoginStatusBean.getBean(request).isLoggedIn()) {
log.trace("Logged in. No minimum level.");
return true;
} else {
log.trace("Not logged in. No minimum level.");
redirectToLoginPage(request, response);
return false;
}
}
/**
* If not logged in at the required level, redirect them to the appropriate
* page.
*
* TODO this goes away as it is replace by annotations.
*/
public static boolean checkLoginStatus(HttpServletRequest request,
HttpServletResponse response, int minimumLevel) {
LogoutRedirector.recordRestrictedPageUri(request);
LoginStatusBean statusBean = LoginStatusBean.getBean(request);
if (statusBean.isLoggedInAtLeast(minimumLevel)) {
log.trace("Security level " + statusBean.getSecurityLevel()
+ " is sufficient for minimum of " + minimumLevel);
return true;
} else if (statusBean.isLoggedIn()) {
log.trace("Security level " + statusBean.getSecurityLevel()
+ " is insufficient for minimum of " + minimumLevel);
redirectToInsufficientAuthorizationPage(request, response);
return false;
} else {
log.trace("Not logged in; not sufficient for minimum of "
+ minimumLevel);
redirectToLoginPage(request, response);
return false;
}
}
/**
* Logged in, but with insufficent authorization. Send them to the home page
* with a message. They won't be coming back.

12
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java
View file

@ -14,6 +14,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@ -44,16 +46,12 @@ public class GetAllClasses extends BaseEditController {
*/
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
try {
super.doGet(request, response);
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseMiscellaneousPages()))) {
return;
}
VitroRequest vreq = new VitroRequest(request);
// EditProcessObject epo = super.createEpo(request);
List classGroups = vreq.getFullWebappDaoFactory().getVClassGroupDao()

12
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java
View file

@ -15,6 +15,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages;
import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
@ -45,15 +47,11 @@ public class GetAllPrefix extends BaseEditController {
*/
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
try {
super.doGet(request, response);
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseMiscellaneousPages()))) {
return;
VitroRequest vreq = new VitroRequest(request);
}
VitroRequest vreq = new VitroRequest(request);
// EditProcessObject epo = super.createEpo(request);
OntologyDao daoObj = vreq.getFullWebappDaoFactory().getOntologyDao();

12
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java
View file

@ -21,6 +21,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages;
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
@ -43,14 +45,10 @@ public class GetClazzAllProperties extends BaseEditController {
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
try {
super.doGet(request, response);
} catch (Exception e) {
e.printStackTrace();
if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseMiscellaneousPages()))) {
return;
}
if (!checkLoginStatus(request, response))
return;
VitroRequest vreq = new VitroRequest(request);
String vClassURI = vreq.getParameter("vClassURI");

14
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java
View file

@ -15,6 +15,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages;
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
@ -32,17 +34,11 @@ public class GetClazzDataProperties extends BaseEditController {
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
try {
super.doGet(request, response);
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseMiscellaneousPages()))) {
return;
VitroRequest vreq = new VitroRequest(request);
}
VitroRequest vreq = new VitroRequest(request);
String vClassURI = vreq.getParameter("vClassURI");
if (vClassURI == null || vClassURI.trim().equals("")) {

13
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java
View file

@ -20,6 +20,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@ -39,16 +41,11 @@ public class GetClazzObjectProperties extends BaseEditController {
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
try {
super.doGet(request, response);
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseMiscellaneousPages()))) {
return;
VitroRequest vreq = new VitroRequest(request);
}
VitroRequest vreq = new VitroRequest(request);
String vClassURI = vreq.getParameter("vClassURI");
if (vClassURI == null || vClassURI.trim().equals("")) {

12
webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
View file

@ -14,6 +14,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.controller.BaseEditController;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
@ -48,15 +50,11 @@ public class GetObjectClasses extends BaseEditController {
*/
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
try {
super.doGet(request, response);
} catch (Exception e) {
e.printStackTrace();
}
if( !checkLoginStatus(request, response) )
if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseMiscellaneousPages()))) {
return;
VitroRequest vreq = new VitroRequest(request);
}
VitroRequest vreq = new VitroRequest(request);
String predicate = vreq.getParameter("predicate");
if (predicate == null || predicate.trim().equals("")) {