From 712003ac56bc25c6f0c182b59cdcc25f973af40f Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 27 Apr 2011 13:58:47 +0000
Subject: [PATCH] NIHVIVO-2492 Restrict these admin pages by RequestedActions,
 not login level.

---
 .../freemarker/SDBSetupController.java        | 15 +++++++-------
 .../SimpleReasonerRecomputeController.java    | 20 ++++++++-----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SDBSetupController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SDBSetupController.java
index bb2db6522..26613dda7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SDBSetupController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SDBSetupController.java
@@ -18,11 +18,10 @@ import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.sdb.Store;
 import com.hp.hpl.jena.sdb.StoreDesc;
 
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupSDB;
@@ -34,12 +33,12 @@ public class SDBSetupController extends FreemarkerHttpServlet {
     
     private static final String SDB_SETUP_FTL = "sdbSetup.ftl";
     
+    @Override
+	protected Actions requiredActions(VitroRequest vreq) {
+    	return new Actions(new UseMiscellaneousAdminPages());
+	}
+
     protected ResponseValues processRequest(VitroRequest vreq) { 
-        // Due to requiresLoginLevel(), we don't get here unless logged in as DBA
-        if (!LoginStatusBean.getBean(vreq)
-                .isLoggedInAtLeast(LoginStatusBean.DBA)) {
-            return new RedirectResponseValues(Route.LOGIN);
-        }
         Map<String, Object> body = new HashMap<String, Object>();
         
         String messageStr = "";
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java
index 9c773b367..dae33d8f2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java
@@ -7,17 +7,13 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.Template;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
 import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner;
-import edu.cornell.mannlib.vitro.webapp.search.IndexingException;
-import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
 
 public class SimpleReasonerRecomputeController extends FreemarkerHttpServlet {
 
@@ -26,12 +22,12 @@ public class SimpleReasonerRecomputeController extends FreemarkerHttpServlet {
     
     private static final String RECOMPUTE_INFERENCES_FTL = "recomputeInferences.ftl";
     
-    protected ResponseValues processRequest(VitroRequest vreq) { 
-        // Due to requiresLoginLevel(), we don't get here unless logged in as DBA
-        if (!LoginStatusBean.getBean(vreq)
-                .isLoggedInAtLeast(LoginStatusBean.DBA)) {
-            return new RedirectResponseValues(Route.LOGIN);
-        }
+    @Override
+	protected Actions requiredActions(VitroRequest vreq) {
+    	return new Actions(new UseMiscellaneousAdminPages());
+	}
+
+	protected ResponseValues processRequest(VitroRequest vreq) { 
         Map<String, Object> body = new HashMap<String, Object>();
         
         String messageStr = "";