From 4baad05643dd266e834c6798bd6fd89caeec342b Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Fri, 25 Apr 2014 14:39:17 -0400 Subject: [PATCH] VIVO-761 Use RequestedAction instead of Actions Modify VitroHttpServlet, similar classes, and all subclasses to use RequestedAction instead of Actions. Modify PolicyHelper also. --- .../auth/permissions/SimplePermission.java | 3 - .../webapp/auth/policy/PolicyHelper.java | 32 +- .../webapp/auth/requestedAction/Actions.java | 282 ------------------ .../controller/SparqlQueryBuilderServlet.java | 2 +- .../webapp/controller/VitroHttpServlet.java | 13 +- .../admin/UserAccountsAdminController.java | 6 +- .../ajax/UserAccountsAjaxController.java | 6 +- .../ManageProxiesController.java | 6 +- .../ajax/ManageProxiesAjaxController.java | 6 +- .../user/UserAccountsMyAccountPage.java | 2 +- .../user/UserAccountsUserController.java | 9 +- .../admin/RestrictLoginsController.java | 6 +- .../controller/admin/ShowAuthController.java | 7 +- .../controller/admin/ShowConfiguration.java | 6 +- .../admin/SparqlQueryController.java | 3 +- .../admin/StartupStatusController.java | 6 +- .../ajax/SparqlQueryAjaxController.java | 8 +- .../webapp/controller/ajax/SparqlUtils.java | 8 - .../controller/ajax/VitroAjaxController.java | 8 +- .../api/SparqlQueryApiController.java | 4 +- .../api/SparqlUpdateApiController.java | 4 +- .../controller/api/VitroApiServlet.java | 4 +- .../authenticate/AdminLoginController.java | 7 +- .../authenticate/LoginRedirector.java | 2 +- .../authenticate/RestrictedAuthenticator.java | 6 +- .../edit/ApplicationBeanRetryController.java | 2 +- .../Classes2ClassesOperationController.java | 2 +- .../edit/Classes2ClassesRetryController.java | 2 +- .../edit/ClassgroupRetryController.java | 2 +- .../DataPropertyStatementRetryController.java | 2 +- .../edit/DatapropEditController.java | 2 +- .../edit/DatapropRetryController.java | 3 +- .../edit/DatatypeRetryController.java | 2 +- .../controller/edit/EntityEditController.java | 2 +- .../edit/EntityRetryController.java | 2 +- .../IndividualTypeOperationController.java | 2 +- .../edit/IndividualTypeRetryController.java | 8 +- .../NamespacePrefixOperationController.java | 2 +- .../edit/NamespacePrefixRetryController.java | 2 +- ...bjectPropertyStatementRetryController.java | 5 +- .../edit/OntologyEditController.java | 2 +- .../edit/OntologyRetryController.java | 2 +- .../controller/edit/PrimitiveDelete.java | 6 +- .../controller/edit/PrimitiveRdfEdit.java | 6 +- ...perties2PropertiesOperationController.java | 2 +- .../Properties2PropertiesRetryController.java | 8 +- .../edit/PropertyEditController.java | 2 +- .../edit/PropertyGroupRetryController.java | 2 +- .../edit/PropertyRetryController.java | 6 +- .../edit/RefactorOperationController.java | 2 +- .../edit/RefactorRetryController.java | 7 +- .../controller/edit/ReorderController.java | 6 +- .../edit/RestrictionOperationController.java | 3 +- .../edit/RestrictionRetryController.java | 3 +- .../controller/edit/VclassEditController.java | 4 +- .../edit/VclassRetryController.java | 2 +- .../AllClassGroupsListingController.java | 2 +- ...ataPropertyStatementListingController.java | 2 +- .../listing/IndividualsListingController.java | 2 +- ...ectPropertyStatementListingController.java | 2 +- .../listing/OntologiesListingController.java | 2 +- .../PropertyGroupsListingController.java | 2 +- ...sWebappWithInstancesListingController.java | 5 +- .../jena/NamespacesListingController.java | 2 +- .../jena/RestrictionsListingController.java | 2 +- .../freemarker/BaseSiteAdminController.java | 30 +- .../freemarker/DeletePropertyController.java | 7 +- .../freemarker/FreemarkerHttpServlet.java | 14 +- .../freemarker/ImageUploadController.java | 10 +- .../freemarker/ListClassGroupsController.java | 6 +- .../ListDatatypePropertiesController.java | 8 +- .../ListPropertyGroupsController.java | 6 +- .../ListPropertyWebappsController.java | 6 +- .../ListVClassWebappsController.java | 7 +- .../ManageLabelsForIndividualController.java | 17 +- .../freemarker/RevisionInfoController.java | 6 +- .../ShowClassHierarchyController.java | 7 +- .../ShowDataPropertyHierarchyController.java | 10 +- ...ShowObjectPropertyHierarchyController.java | 6 +- .../SimpleReasonerRecomputeController.java | 6 +- .../individual/IndividualResponseBuilder.java | 9 +- .../controller/jena/JenaAdminActions.java | 2 +- .../jena/JenaCsv2RdfController.java | 2 +- .../controller/jena/JenaExportController.java | 4 +- .../controller/jena/JenaIngestController.java | 2 +- .../controller/jena/JenaXMLFileUpload.java | 4 +- .../controller/jena/RDFUploadController.java | 2 +- .../jena/RDFUploadFormController.java | 2 +- .../ManageLabelsForIndividualGenerator.java | 3 +- .../controller/EditRequestAJAXController.java | 6 +- .../EditRequestDispatchController.java | 6 +- .../controller/PostEditCleanupController.java | 6 +- .../controller/ProcessRdfFormController.java | 7 +- .../vitro/webapp/filters/ModelSwitcher.java | 4 +- .../controller/AutocompleteController.java | 6 +- .../DataAutocompleteController.java | 6 +- .../search/controller/IndexController.java | 7 +- .../controller/SearchServiceController.java | 2 +- .../vitro/webapp/sparql/GetAllClasses.java | 2 +- .../vitro/webapp/sparql/GetAllPrefix.java | 3 +- .../webapp/sparql/GetClazzAllProperties.java | 2 +- .../webapp/sparql/GetClazzDataProperties.java | 2 +- .../sparql/GetClazzObjectProperties.java | 2 +- .../vitro/webapp/sparql/GetObjectClasses.java | 2 +- .../web/jsptags/ConfirmAuthorization.java | 4 +- .../BaseIndividualTemplateModel.java | 5 +- .../individual/PropertyTemplateModel.java | 3 +- ...PolicyHelper_AuthorizationRequestTest.java | 23 ++ .../AuthorizationRequestTest.java | 20 ++ 109 files changed, 281 insertions(+), 583 deletions(-) delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/Actions.java create mode 100644 webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_AuthorizationRequestTest.java create mode 100644 webapp/test/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/AuthorizationRequestTest.java diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java index 07c117869..a406ff83b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java @@ -10,7 +10,6 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.SimpleRequestedAction; @@ -119,7 +118,6 @@ public class SimplePermission extends Permission { //private final String localName; private final String uri; public final RequestedAction ACTION; - public final Actions ACTIONS; public SimplePermission(String uri) { super(uri); @@ -131,7 +129,6 @@ public class SimplePermission extends Permission { //this.localName = localName; this.uri = uri; this.ACTION = new SimpleRequestedAction(uri); - this.ACTIONS = new Actions(this.ACTION); if (allInstances.containsKey(this.uri)) { throw new IllegalStateException("A SimplePermission named '" diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java index 13330b255..c31ab8039 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java @@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFa import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement; @@ -44,8 +44,8 @@ public class PolicyHelper { * policies? */ public static boolean isAuthorizedForActions(HttpServletRequest req, - RequestedAction... actions) { - return isAuthorizedForActions(req, new Actions(actions)); + AuthorizationRequest... actions) { + return isAuthorizedForActions(req, AuthorizationRequest.and(actions)); } /** @@ -53,18 +53,27 @@ public class PolicyHelper { * policies? */ public static boolean isAuthorizedForActions(HttpServletRequest req, - Actions actions) { + Iterable actions) { + return isAuthorizedForActions(req, AuthorizationRequest.and(actions)); + } + + /** + * Are these actions authorized for the current user by the current + * policies? + */ + public static boolean isAuthorizedForActions(HttpServletRequest req, + AuthorizationRequest ar) { PolicyIface policy = ServletPolicyList.getPolicies(req); IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(req); - return isAuthorizedForActions(ids, policy, actions); + return ar.isAuthorized(ids, policy); } /** * Are these actions authorized for these identifiers by these policies? */ public static boolean isAuthorizedForActions(IdentifierBundle ids, - PolicyIface policy, Actions actions) { - return Actions.notNull(actions).isAuthorized(policy, ids); + PolicyIface policy, AuthorizationRequest ar) { + return ar.isAuthorized(ids, policy); } /** @@ -76,8 +85,7 @@ public class PolicyHelper { * identifier bundle. */ public static boolean isAuthorizedForActions(HttpServletRequest req, - String email, String password, Actions actions) { - + String email, String password, AuthorizationRequest ar) { if (password == null || email == null || password.isEmpty() || email.isEmpty()) { return false; @@ -106,11 +114,9 @@ public class PolicyHelper { IdentifierBundle ids = ActiveIdentifierBundleFactories .getUserIdentifierBundle(req, user); PolicyIface policy = ServletPolicyList.getPolicies(req); - return PolicyHelper.isAuthorizedForActions(ids, policy, actions); + return ar.isAuthorized(ids, policy); } catch (Exception ex) { - log.error( - "Error while attempting to authorize actions " - + actions.toString(), ex); + log.error("Error while attempting to authorize actions " + ar, ex); return false; } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/Actions.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/Actions.java deleted file mode 100644 index d31aa3345..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/Actions.java +++ /dev/null @@ -1,282 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.auth.requestedAction; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; -import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization; -import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision; -import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface; - -/** - * A list of RequiredAction objects. - * - * Authorization is considered successful if ALL of the actions are - * authorized, or if there are NO clauses. - * - * A previous version of this class had a capability to do OR clauses but - * this feature was unused and hindered composition of Actions - * objects. The ability to do an OR has been moved to AnyRequestedAction - * and AllRequestedAction. - * - */ -public class Actions { - private static final Log log = LogFactory.getLog(Actions.class); - - public static final Actions AUTHORIZED = new Actions(); - public static final Actions UNAUTHORIZED = new Actions( - new UnauthorizedAction()); - - public static Actions notNull(Actions actions) { - return (actions == null) ? AUTHORIZED : actions; - } - - /** - * This is a set of RequestedActions that get ANDed together. - * - * If all of the RequestedAction objects from the - * Sets are authorized, then the Actions object should - * be considered authorized. - */ - private Set requestedActions; - - public Actions(){ - requestedActions= Collections.emptySet(); - } - - /** - * AND together all the RequestedAction from all the actions. - */ - public Actions(Actions... actions){ - Set newActs = new HashSet(); - - for( Actions actionToAnd : actions){ - if( actionToAnd != null && actionToAnd.requestedActions != null ){ - newActs.addAll( actionToAnd.requestedActions ); - } - } - - this.requestedActions = Collections.unmodifiableSet( newActs ); - } - - public Actions(RequestedAction... actions) { - this(Arrays.asList(actions)); - } - - public Actions(Collection actions) { - this(Collections. emptySet(), actions); - } - - private Actions(Set oldList, - Collection newActions) { - - Set newActs = new HashSet(); - - if( oldList != null ){ - newActs.addAll(oldList); - } - - if ( newActions != null ) { - newActs.addAll( newActions ); - } - - this.requestedActions = Collections.unmodifiableSet(newActs); - } - - /** require all RequestedActions on this and the ones in newActions to authorize.*/ - public Actions and(RequestedAction... newActions){ - return and(Arrays.asList( newActions)); - } - - /** require all RequestedActions on this and the ones in newActions to authorize.*/ - public Actions and(Collection newActions){ - if( newActions == null || newActions.size() == 0) - return this; - else - return new Actions( this.requestedActions, newActions); - } - - /** require all RequestedActions on this and the ones in newActions to authorize.*/ - public Actions and(Actions newActions){ - return new Actions( this.requestedActions, newActions.requestedActions); - } - - public Actions or(RequestedAction... newActions) { - return or(Arrays.asList(newActions)); - } - - /** - * OR together this.requestedActions and newActions. - */ - public Actions or(Collection newActions) { - RequestedAction acts; - - if( newActions == null || newActions.size() == 0 ){ - return this; - } - - int thisActionCount = this.requestedActions.size(); - int newActionCount = newActions.size(); - - /* This minimizes the number of extra RequestedActions - * that get created when there is only one in this - * or newActions.*/ - if( thisActionCount == 1 && newActionCount == 1 ){ - return new Actions( - new AnyRequestedAction( - this.requestedActions.iterator().next(), - newActions.iterator().next() )); - } - - if( thisActionCount == 1 && newActionCount > 1 ){ - return new Actions( - new AnyRequestedAction( - this.requestedActions.iterator().next(), - new AllRequestedAction( newActions ))); - } - - if( thisActionCount > 1 && newActionCount == 1){ - return new Actions( new AnyRequestedAction( - new AllRequestedAction( this.requestedActions), - newActions.iterator().next())); - } - - if( thisActionCount > 1 && newActionCount > 1 ){ - return new Actions( - new AnyRequestedAction( - new AllRequestedAction( this.requestedActions ), - new AllRequestedAction( newActions ))); - } - //should never be reached. - log.error("Could not properly create disjunction"); - return null; - } - - public boolean isEmpty() { - return this.requestedActions.isEmpty(); - } - - - /** - * Are the RequestedAction objects for this Actions authorized - * with the ids and policy? - */ - public boolean isAuthorized(PolicyIface policy, IdentifierBundle ids) { - /* No clauses means everything is authorized */ - if (requestedActions.isEmpty()) { - log.debug("Empty Actions is authorized"); - return true; - } - - /* Are all the RequestedAction object authorized? */ - List decisions = new ArrayList(); - for (RequestedAction action : requestedActions) { - PolicyDecision decision = policy.isAuthorized(ids, action); - log.debug("decision for '" + action.getClass().getSimpleName() + "' was: " - + decision); - decisions.add( decision ); - } - return areAllAuthorized( decisions ); - } - - private boolean areAllAuthorized( List decisions ){ - for( PolicyDecision dec : decisions){ - if( dec == null || dec.getAuthorized() != Authorization.AUTHORIZED ){ - return false; - } - } - return true; - } - -// /** All actions in a clause must be authorized. */ -// private static boolean isAuthorizedForClause(PolicyIface policy, -// IdentifierBundle ids, Set clause) { -// for (RequestedAction action : clause) { -// if (!isAuthorizedForAction(policy, ids, action)) { -// log.debug("not authorized"); -// return false; -// } -// } -// return true; -// } -// -// /** Is this action authorized? */ -// private static boolean isAuthorizedForAction(PolicyIface policy, -// IdentifierBundle ids, RequestedAction action) { -// PolicyDecision decision = policy.isAuthorized(ids, action); -// log.debug("decision for '" + action.getClass().getSimpleName() + "' was: " -// + decision); -// return (decision != null) -// && (decision.getAuthorized() == Authorization.AUTHORIZED); -// } - - @Override - public String toString() { - StringBuffer sb = new StringBuffer("Actions["); - Iterator it = this.requestedActions.iterator(); - while( it.hasNext() ){ - RequestedAction act = it.next(); - sb.append( act.toString() ); - if (it.hasNext()) { - sb.append(", "); - } - } - sb.append("]"); - return sb.toString(); - } - - /** - * AND for Actions. - * ANDing with an Action with multiple disjoint clauses is not supported. - * - * To do the AND, we take each ORed clause, and add all of the RequestedActions - * so now in each of the alternative clauses, all of the singleClauseToAnd - * RequestedActions are required. - * - * @throws Exception when multiple disjoint clauses are present on both Actions. - */ - //private void andWithAction( Actions otherAct ) throws Exception{ -// Set singleClauseToAnd; -// List> clauses; -// -// if( otherAct.singleAndClause() ){ -// clauses = this.requestedActions; -// singleClauseToAnd = otherAct.requestedActions.get(0); -// }else if( this.singleAndClause() ){ -// clauses = new ArrayList>( otherAct.requestedActions ); -// singleClauseToAnd = this.requestedActions.get(0); -// }else{ -// //both have multiple ORed clauses, give up -// throw new Exception("ANDing with an Action with multiple disjoint clauses is not supported."); -// } -// -// // -// for( Set clause : clauses){ -// clause.addAll( singleClauseToAnd ); -// } -// this.requestedActions = clauses; - //} - -// private boolean singleAndClause(){ -// return requestedActions.size() == 1; -// } - -// /** -// * Nobody knows about this action class, so only the root user should be -// * authorized for it. -// */ -// private static class UnauthorizedAction extends RequestedAction { -// // no members -// } -} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java index 3083c4663..2fb49e222 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java @@ -72,7 +72,7 @@ public class SparqlQueryBuilderServlet extends BaseEditController { throws ServletException, IOException { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTIONS)) { + SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java index a70455fc7..932643b09 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java @@ -2,6 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.controller; +import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.AUTHORIZED; + import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -28,8 +30,7 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage; import edu.cornell.mannlib.vitro.webapp.beans.ResourceBean; import edu.cornell.mannlib.vitro.webapp.controller.authenticate.LogoutRedirector; @@ -116,9 +117,9 @@ public class VitroHttpServlet extends HttpServlet implements MultipartRequestWra * the RequestedActions that must be authorized. */ protected boolean isAuthorizedToDisplayPage(HttpServletRequest request, - HttpServletResponse response, RequestedAction... actions) { + HttpServletResponse response, AuthorizationRequest... actions) { return isAuthorizedToDisplayPage(request, response, - new Actions(Arrays.asList(actions))); + AuthorizationRequest.and(actions)); } /** @@ -128,9 +129,9 @@ public class VitroHttpServlet extends HttpServlet implements MultipartRequestWra * the combination of RequestedActions that must be authorized. */ protected boolean isAuthorizedToDisplayPage(HttpServletRequest request, - HttpServletResponse response, Actions actions) { + HttpServletResponse response, AuthorizationRequest actions) { // Record restricted pages so we won't return to them on logout - if (!actions.isEmpty()) { + if (actions != AUTHORIZED) { LogoutRedirector.recordRestrictedPageUri(request); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java index 31be2ecce..2361722a8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java @@ -8,7 +8,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; @@ -28,8 +28,8 @@ public class UserAccountsAdminController extends FreemarkerHttpServlet { private static final String ACTION_EDIT = "/edit"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.MANAGE_USER_ACCOUNTS.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.MANAGE_USER_ACCOUNTS.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java index 9643adc33..fa70026fb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java @@ -11,7 +11,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; @@ -25,8 +25,8 @@ public class UserAccountsAjaxController extends VitroAjaxController { private static final String PARAMETER_ACTION = "action"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.MANAGE_USER_ACCOUNTS.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.MANAGE_USER_ACCOUNTS.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java index 53169ef27..c1484257b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java @@ -8,7 +8,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.AbstractPageHandler.Message; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; @@ -26,8 +26,8 @@ public class ManageProxiesController extends FreemarkerHttpServlet { private static final String ACTION_EDIT = "/edit"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.MANAGE_PROXIES.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.MANAGE_PROXIES.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/ManageProxiesAjaxController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/ManageProxiesAjaxController.java index 7fbfd3e1d..d49d166ba 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/ManageProxiesAjaxController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/ManageProxiesAjaxController.java @@ -11,7 +11,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; @@ -25,8 +25,8 @@ public class ManageProxiesAjaxController extends VitroAjaxController { private static final String PARAMETER_ACTION = "action"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.MANAGE_OWN_PROXIES.ACTIONS + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.MANAGE_OWN_PROXIES.ACTION .or(SimplePermission.MANAGE_PROXIES.ACTION); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPage.java index fc55a9b17..8ef256088 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPage.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPage.java @@ -204,7 +204,7 @@ public class UserAccountsMyAccountPage extends UserAccountsPage { boolean isProxyPanelAuthorized() { return PolicyHelper.isAuthorizedForActions(vreq, - SimplePermission.MANAGE_OWN_PROXIES.ACTIONS) + SimplePermission.MANAGE_OWN_PROXIES.ACTION) && (getProfilePage(userAccount) != null); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java index b42489155..57b965d65 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java @@ -3,6 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.accounts.user; import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.EXTERNAL; +import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.AUTHORIZED; import javax.servlet.http.HttpServletRequest; @@ -10,7 +11,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -35,13 +36,13 @@ public class UserAccountsUserController extends FreemarkerHttpServlet { private static final String ACTION_FIRST_TIME_EXTERNAL = "/firstTimeExternal"; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { String action = vreq.getPathInfo(); if (ACTION_MY_ACCOUNT.equals(action)) { - return SimplePermission.EDIT_OWN_ACCOUNT.ACTIONS; + return SimplePermission.EDIT_OWN_ACCOUNT.ACTION; } else { - return Actions.AUTHORIZED; + return AUTHORIZED; } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java index 2d3eea28b..a3f04be48 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.AbstractPageHandler; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator; @@ -31,8 +31,8 @@ public class RestrictLoginsController extends FreemarkerHttpServlet { public static final String MESSAGE_ALREADY_OPEN = "messageAlreadyOpen"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.LOGIN_DURING_MAINTENANCE.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.LOGIN_DURING_MAINTENANCE.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java index f0abba7ba..329eb5b78 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.admin; +import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.AUTHORIZED; import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_PREDICATE; import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_URI; @@ -21,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers; import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasAssociatedIndividual; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; @@ -38,8 +39,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem public class ShowAuthController extends FreemarkerHttpServlet { @Override - protected Actions requiredActions(VitroRequest vreq) { - return Actions.AUTHORIZED; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return AUTHORIZED; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowConfiguration.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowConfiguration.java index c25d845eb..b19d7cb76 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowConfiguration.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowConfiguration.java @@ -9,7 +9,7 @@ import java.util.SortedMap; import java.util.TreeMap; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; @@ -21,8 +21,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem */ public class ShowConfiguration extends FreemarkerHttpServlet { @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.SEE_CONFIGURATION.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.SEE_CONFIGURATION.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java index ef9365684..86f36d874 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java @@ -27,7 +27,6 @@ import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery.InvalidQueryTypeException; -import edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery.ResultSetMediaType; import edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery.SparqlQueryApiExecutor; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; @@ -92,7 +91,7 @@ public class SparqlQueryController extends FreemarkerHttpServlet { public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException { if (!isAuthorizedToDisplayPage(req, resp, - SimplePermission.USE_SPARQL_QUERY_PAGE.ACTIONS)) { + SimplePermission.USE_SPARQL_QUERY_PAGE.ACTION)) { return; } if (req.getParameterMap().containsKey("query")) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java index 17e278b88..991f53792 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; 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.responsevalues.ResponseValues; @@ -19,8 +19,8 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; public class StartupStatusController extends FreemarkerHttpServlet { @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.SEE_STARTUP_STATUS.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.SEE_STARTUP_STATUS.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java index 6c6dacbf7..61ee72a20 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java @@ -17,7 +17,7 @@ import com.hp.hpl.jena.query.Query; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils.AjaxControllerException; import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; @@ -40,12 +40,12 @@ public class SparqlQueryAjaxController extends VitroAjaxController { public static final String OPTION_MODEL_USER_ACCOUNTS = "userAccounts"; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { String modelParam = getModelParam(vreq); if (OPTION_MODEL_USER_ACCOUNTS.equals(modelParam)) { - return SimplePermission.QUERY_USER_ACCOUNTS_MODEL.ACTIONS; + return SimplePermission.QUERY_USER_ACCOUNTS_MODEL.ACTION; } else { - return SimplePermission.QUERY_FULL_MODEL.ACTIONS; + return SimplePermission.QUERY_FULL_MODEL.ACTION; } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java index bbffa885a..9e5413bf7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java @@ -2,14 +2,11 @@ package edu.cornell.mannlib.vitro.webapp.controller.ajax; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import java.io.IOException; import java.io.OutputStream; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; @@ -26,11 +23,6 @@ import com.hp.hpl.jena.query.ResultSetFormatter; import com.hp.hpl.jena.query.Syntax; import com.hp.hpl.jena.rdf.model.Model; -import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; - /** * Handle an AJAX request for a SPARQL query. On entry, the "query" parameter * contains the query string. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java index ab848e895..3590e83a8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java @@ -2,6 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.ajax; +import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.AUTHORIZED; + import java.io.IOException; import java.io.PrintWriter; import java.util.Map; @@ -15,7 +17,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration; import freemarker.template.Configuration; @@ -65,8 +67,8 @@ public abstract class VitroAjaxController extends HttpServlet { * In some cases, the choice of actions will depend on the contents of the request. */ @SuppressWarnings("unused") - protected Actions requiredActions(VitroRequest vreq) { - return Actions.AUTHORIZED; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return AUTHORIZED; } /** diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java index b241fc7f0..8945b7cd4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse; import com.hp.hpl.jena.query.QueryParseException; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery.InvalidQueryTypeException; import edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery.SparqlQueryApiExecutor; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; @@ -42,7 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.http.NotAcceptableException; */ public class SparqlQueryApiController extends VitroApiServlet { - private static final Actions REQUIRED_ACTIONS = SimplePermission.USE_SPARQL_QUERY_API.ACTIONS; + private static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.USE_SPARQL_QUERY_API.ACTION; @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java index fc5bd6d04..8dee5c148 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java @@ -26,7 +26,7 @@ import com.hp.hpl.jena.update.UpdateFactory; import com.hp.hpl.jena.update.UpdateRequest; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder; @@ -50,7 +50,7 @@ public class SparqlUpdateApiController extends VitroApiServlet { private static final Log log = LogFactory .getLog(SparqlUpdateApiController.class); - private static final Actions REQUIRED_ACTIONS = SimplePermission.USE_SPARQL_UPDATE_API.ACTIONS; + private static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.USE_SPARQL_UPDATE_API.ACTION; @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java index 8786b4592..44e96830b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java @@ -13,7 +13,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator; @@ -36,7 +36,7 @@ public class VitroApiServlet extends HttpServlet { * them for this action, throw an AuthException. */ protected void confirmAuthorization(HttpServletRequest req, - Actions requiredActions) throws AuthException { + AuthorizationRequest requiredActions) throws AuthException { String email = req.getParameter("email"); String password = req.getParameter("password"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java index d7d0a9396..74c7156c1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java @@ -3,6 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.authenticate; import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.INTERNAL; +import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.AUTHORIZED; import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MAX_PASSWORD_LENGTH; import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MIN_PASSWORD_LENGTH; @@ -12,7 +13,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.LoginNotPermitted; @@ -53,8 +54,8 @@ public class AdminLoginController extends FreemarkerHttpServlet { private static final String MESSAGE_NEW_PASSWORD_MATCHES_OLD = "errorNewPasswordMatchesOld"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return Actions.AUTHORIZED; // No requirements to use this page. + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return AUTHORIZED; // No requirements to use this page. } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java index 13ea3e1ae..4b3dd4769 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java @@ -149,7 +149,7 @@ public class LoginRedirector { private boolean canSeeSiteAdminPage() { return PolicyHelper.isAuthorizedForActions(request, - SimplePermission.SEE_SITE_ADMIN_PAGE.ACTIONS); + SimplePermission.SEE_SITE_ADMIN_PAGE.ACTION); } private boolean isLoginPage(String page) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/RestrictedAuthenticator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/RestrictedAuthenticator.java index 0da3e3bf8..f5123c854 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/RestrictedAuthenticator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/RestrictedAuthenticator.java @@ -7,15 +7,11 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource; -import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle; -import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; -import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; /** @@ -58,7 +54,7 @@ public class RestrictedAuthenticator extends Authenticator { return PolicyHelper.isAuthorizedForActions(ids, ServletPolicyList.getPolicies(req), - SimplePermission.LOGIN_DURING_MAINTENANCE.ACTIONS); + SimplePermission.LOGIN_DURING_MAINTENANCE.ACTION); } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java index 9b47d17b6..f4a5ebd70 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java @@ -33,7 +33,7 @@ public class ApplicationBeanRetryController extends BaseEditController { public void doPost (HttpServletRequest req, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(req, response, - SimplePermission.EDIT_SITE_INFORMATION.ACTIONS)) { + SimplePermission.EDIT_SITE_INFORMATION.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java index 81d8f68c1..8e9d0359d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java @@ -23,7 +23,7 @@ public class Classes2ClassesOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(Classes2ClassesOperationController.class.getName()); public void doGet(HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java index 94318919a..436dbec80 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java @@ -27,7 +27,7 @@ public class Classes2ClassesRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(Classes2ClassesRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java index 41089aaa8..75272e45e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java @@ -35,7 +35,7 @@ public class ClassgroupRetryController extends BaseEditController { public void doPost (HttpServletRequest req, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(req, response, - SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java index 781e5b161..5414369c6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java @@ -35,7 +35,7 @@ public class DataPropertyStatementRetryController extends BaseEditController { public void doPost (HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.DO_BACK_END_EDITING.ACTIONS)) { + SimplePermission.DO_BACK_END_EDITING.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java index 007b1c11a..e213150b8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java @@ -35,7 +35,7 @@ public class DatapropEditController extends BaseEditController { private static final Log log = LogFactory.getLog(DatapropEditController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java index 4fa8f9ef4..af1ce0b38 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java @@ -36,7 +36,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao; import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao; -import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; @@ -46,7 +45,7 @@ public class DatapropRetryController extends BaseEditController { @Override public void doPost (HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java index fef3113ec..4127c4fa9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java @@ -28,7 +28,7 @@ public class DatatypeRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(DatatypeRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java index cc88e4ebd..74648713a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java @@ -40,7 +40,7 @@ public class EntityEditController extends BaseEditController { public void doGet (HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.DO_BACK_END_EDITING.ACTIONS)) { + SimplePermission.DO_BACK_END_EDITING.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java index b257515f4..bc1b6f2ed 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java @@ -57,7 +57,7 @@ public class EntityRetryController extends BaseEditController { public void doPost (HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.DO_BACK_END_EDITING.ACTIONS)) { + SimplePermission.DO_BACK_END_EDITING.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java index 16d36feff..1702863e0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java @@ -23,7 +23,7 @@ public class IndividualTypeOperationController extends BaseEditController { public void doGet(HttpServletRequest req, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(req, response, - SimplePermission.DO_BACK_END_EDITING.ACTIONS)) { + SimplePermission.DO_BACK_END_EDITING.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java index a22a94440..52d2a9f20 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java @@ -2,17 +2,11 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; -import java.text.Collator; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Set; import javax.servlet.RequestDispatcher; @@ -42,7 +36,7 @@ public class IndividualTypeRetryController extends BaseEditController { public void doGet (HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.DO_BACK_END_EDITING.ACTIONS)) { + SimplePermission.DO_BACK_END_EDITING.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java index 2015b88e5..c55c9f0cf 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java @@ -33,7 +33,7 @@ public class NamespacePrefixOperationController extends BaseEditController { public void doPost(HttpServletRequest req, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(req, response, - SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java index efa7480bf..81e996db4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java @@ -20,7 +20,7 @@ public class NamespacePrefixRetryController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java index 59985667b..b74b3b307 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java @@ -2,9 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; -import java.text.Collator; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -42,7 +39,7 @@ public class ObjectPropertyStatementRetryController extends BaseEditController { public void doPost (HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.DO_BACK_END_EDITING.ACTIONS)) { + SimplePermission.DO_BACK_END_EDITING.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java index 7a868a9e3..cfcf2c892 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java @@ -30,7 +30,7 @@ public class OntologyEditController extends BaseEditController { @Override public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java index f9814d647..211d54b4d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java @@ -34,7 +34,7 @@ public class OntologyRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(OntologyRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java index 16a958f7d..0bade4a44 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java @@ -10,7 +10,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; @@ -23,8 +23,8 @@ public class PrimitiveDelete extends VitroAjaxController { private static final Log log = LogFactory.getLog(PrimitiveDelete.class); @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java index 34f0f7ada..74378e48f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java @@ -20,7 +20,7 @@ import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; import edu.cornell.mannlib.vitro.webapp.dao.jena.DependentResourceDeleteJena; @@ -34,8 +34,8 @@ public class PrimitiveRdfEdit extends VitroAjaxController { //Using the same setup as primitive delete @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java index 966667104..cd5cac166 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java @@ -26,7 +26,7 @@ public class Properties2PropertiesOperationController extends private static final boolean REMOVE = true; public void doPost(HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java index 6d1633ad8..03b4fb508 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java @@ -2,14 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; -import java.text.Collator; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; @@ -34,7 +28,7 @@ public class Properties2PropertiesRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(Properties2PropertiesRetryController.class.getName()); public void doGet (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java index f57dee2c8..8741f65d1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java @@ -35,7 +35,7 @@ public class PropertyEditController extends BaseEditController { public void doPost (HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java index e3b4b0b2c..2066cbc8e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java @@ -34,7 +34,7 @@ public class PropertyGroupRetryController extends BaseEditController { public void doPost (HttpServletRequest req, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(req, response, - SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java index 1d2647c4f..935dfcf4c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java @@ -4,14 +4,10 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; import java.io.IOException; import java.net.URLEncoder; -import java.text.Collator; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; @@ -48,7 +44,7 @@ public class PropertyRetryController extends BaseEditController { @Override public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java index dfc02e0df..cc7a0a09f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java @@ -453,7 +453,7 @@ public class RefactorOperationController extends BaseEditController { } public void doPost(HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java index 7aaefe2b7..25252962f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java @@ -2,14 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit; -import java.text.Collator; -import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; @@ -102,7 +97,7 @@ public class RefactorRetryController extends BaseEditController { } public void doGet(HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java index 8e2c86a1c..3b0260a1d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java @@ -20,7 +20,7 @@ import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; @@ -45,8 +45,8 @@ public class ReorderController extends VitroAjaxController { private static String INDIVIDUAL_PREDICATE_PARAMETER_NAME = "individuals"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java index 3bdb0142b..69e686f1a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java @@ -23,7 +23,6 @@ import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.DAML_OIL; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; @@ -38,7 +37,7 @@ public class RestrictionOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(RestrictionOperationController.class.getName()); public void doPost(HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java index e800462b8..9093a698e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java @@ -22,7 +22,6 @@ import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.beans.Datatype; -import edu.cornell.mannlib.vitro.webapp.beans.Property; import edu.cornell.mannlib.vitro.webapp.beans.ResourceBean; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -37,7 +36,7 @@ public class RestrictionRetryController extends BaseEditController { private static final boolean OBJECT = false; public void doGet(HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java index 61cb59362..394bd527b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java @@ -20,6 +20,7 @@ import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; +import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -28,7 +29,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; -import edu.cornell.mannlib.vitro.webapp.beans.Ontology; public class VclassEditController extends BaseEditController { @@ -36,7 +36,7 @@ public class VclassEditController extends BaseEditController { private static final int NUM_COLS = 14; public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java index 46d970ec5..1e15f39c6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java @@ -42,7 +42,7 @@ public class VclassRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(VclassRetryController.class.getName()); public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java index 597954c87..b79ce3f6c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java @@ -27,7 +27,7 @@ public class AllClassGroupsListingController extends BaseEditController { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java index e63bcf120..8368a21fd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java @@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; public class DataPropertyStatementListingController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java index f5639382c..424a15331 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java @@ -28,7 +28,7 @@ public class IndividualsListingController extends BaseEditController { //private static final int MAX_INDIVIDUALS = 50; public void doGet(HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java index 65f5a1086..d98c1299e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java @@ -27,7 +27,7 @@ public class ObjectPropertyStatementListingController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java index ebd743a25..9028a6370 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java @@ -21,7 +21,7 @@ public class OntologiesListingController extends BaseEditController { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java index f168df4c5..6df029061 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java @@ -37,7 +37,7 @@ public class PropertyGroupsListingController extends BaseEditController { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java index eecaa4280..2320635bd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java @@ -3,9 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit.listing; import java.net.URLEncoder; -import java.text.Collator; import java.util.ArrayList; -import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -16,7 +14,6 @@ import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.beans.Individual; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -28,7 +25,7 @@ public class VClassWebappWithInstancesListingController extends BaseEditControll private int NUM_COLS = 6; public void doGet(HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java index 70845da91..87977762b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java @@ -29,7 +29,7 @@ public class NamespacesListingController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java index a66731a89..d04c07618 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java @@ -44,7 +44,7 @@ public class RestrictionsListingController extends BaseEditController { private EditProcessObject epo = null; public void doGet(HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java index 25fd60beb..4dc17f6d8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java @@ -17,7 +17,7 @@ import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; @@ -34,10 +34,10 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(BaseSiteAdminController.class); protected static final String TEMPLATE_DEFAULT = "siteAdmin-main.ftl"; - public static final Actions REQUIRED_ACTIONS = SimplePermission.SEE_SITE_ADMIN_PAGE.ACTIONS; + public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.SEE_SITE_ADMIN_PAGE.ACTION; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { return REQUIRED_ACTIONS; } @@ -64,7 +64,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { Map urls = new HashMap(); - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { urls.put("recomputeInferences", UrlBuilder.getUrl("/RecomputeInferences")); } @@ -72,11 +72,11 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { urls.put("rebuildSearchIndex", UrlBuilder.getUrl("/SearchIndex")); } - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.LOGIN_DURING_MAINTENANCE.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.LOGIN_DURING_MAINTENANCE.ACTION)) { urls.put("restrictLogins", UrlBuilder.getUrl("/admin/restrictLogins")); } - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.ENABLE_DEVELOPER_PANEL.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.ENABLE_DEVELOPER_PANEL.ACTION)) { urls.put("activateDeveloperPanel", "javascript:new DeveloperPanel(developerAjaxUrl).setupDeveloperPanel({developer_enabled: true});"); } @@ -88,7 +88,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { Map map = new HashMap(); if (PolicyHelper.isAuthorizedForActions(vreq, - SimplePermission.DO_BACK_END_EDITING.ACTIONS)) { + SimplePermission.DO_BACK_END_EDITING.ACTION)) { map.put("formAction", UrlBuilder.getUrl("/editRequestDispatch")); @@ -125,27 +125,27 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { Map data = new HashMap(); - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_USER_ACCOUNTS.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_USER_ACCOUNTS.ACTION)) { data.put("userAccounts", UrlBuilder.getUrl("/accountsAdmin")); } - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_PROXIES.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_PROXIES.ACTION)) { data.put("manageProxies", UrlBuilder.getUrl("/manageProxies")); } - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_SITE_INFORMATION.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_SITE_INFORMATION.ACTION)) { data.put("siteInfo", UrlBuilder.getUrl("/editForm", "controller", "ApplicationBean")); } //TODO: Add specific permissions for page management - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_MENUS.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_MENUS.ACTION)) { data.put("menuManagement", UrlBuilder.getUrl("/individual", "uri", "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DefaultMenu", "switchToDisplayModel", "true")); data.put("pageManagement", UrlBuilder.getUrl("/pageList")); } - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_STARTUP_STATUS.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_STARTUP_STATUS.ACTION)) { data.put("startupStatus", UrlBuilder.getUrl("/startupStatus")); data.put("startupStatusAlert", !StartupStatus.getBean(getServletContext()).allClear()); } @@ -157,7 +157,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { Map map = new HashMap(); - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_ONTOLOGY.ACTION)) { String pelletError = null; String pelletExplanation = null; @@ -199,13 +199,13 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { Map urls = new HashMap(); - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) { urls.put("ingest", UrlBuilder.getUrl("/ingest")); urls.put("rdfData", UrlBuilder.getUrl("/uploadRDFForm")); urls.put("rdfExport", UrlBuilder.getUrl("/export")); urls.put("sparqlQueryBuilder", UrlBuilder.getUrl("/admin/sparqlquerybuilder")); } - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_SPARQL_QUERY_PAGE.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_SPARQL_QUERY_PAGE.ACTION)) { urls.put("sparqlQuery", UrlBuilder.getUrl("/admin/sparqlquery")); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java index 5586b8cb3..b7ab19121 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java @@ -10,7 +10,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -20,7 +20,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Red 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.dao.ModelAccess; -import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.FactoryID; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils; @@ -33,8 +32,8 @@ public class DeletePropertyController extends FreemarkerHttpServlet { private static final Log log = LogFactory.getLog(DeletePropertyController.class); @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTIONS ; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION ; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index 1530aaeee..3c5944665 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -2,7 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; -import static javax.mail.Message.RecipientType.*; +import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.AUTHORIZED; +import static javax.mail.Message.RecipientType.TO; import java.io.IOException; import java.io.PrintWriter; @@ -27,7 +28,7 @@ import com.github.jsonldjava.utils.JSONUtils; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; @@ -43,7 +44,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory; import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage; import edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration; -import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.Tags; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.User; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.menu.MainMenu; @@ -169,7 +169,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { boolean sentEmail = false; // If the user is authorized, display the error data on the page - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { templateMap.put("adminErrorData", adminErrorData); // Else send the data to the site administrator @@ -211,8 +211,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { * REQUIRED_ACTIONS which is overridden in the subclass. * */ - protected Actions requiredActions(VitroRequest vreq) { - return Actions.AUTHORIZED; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return AUTHORIZED; } // Subclasses will override @@ -374,7 +374,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { requestUrls.put("currentPage", getCurrentPageUrl(vreq)); requestUrls.put("referringPage", getReferringPageUrl(vreq)); - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_OWN_ACCOUNT.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_OWN_ACCOUNT.ACTION)) { requestUrls.put("myAccount", UrlBuilder.getUrl("/accounts/myAccount")); } } catch (TemplateModelException e) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java index 26a3d68ca..8b385314f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java @@ -2,6 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; +import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest.UNAUTHORIZED; + import javax.servlet.ServletException; import javax.servlet.UnavailableException; import javax.servlet.http.HttpServletRequest; @@ -10,7 +12,7 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement; @@ -150,7 +152,7 @@ public class ImageUploadController extends FreemarkerHttpServlet { * The required action depends on what we are trying to do. */ @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { try { String action = vreq.getParameter(PARAMETER_ACTION); Individual entity = validateEntityUri(vreq); @@ -174,9 +176,9 @@ public class ImageUploadController extends FreemarkerHttpServlet { entity.getURI(), indMainImage, RequestedAction.SOME_URI); } - return new Actions(ra); + return ra; } catch (UserMistakeException e) { - return Actions.UNAUTHORIZED; + return UNAUTHORIZED; } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java index eb42252c3..75a728df9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java @@ -14,7 +14,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -31,8 +31,8 @@ public class ListClassGroupsController extends FreemarkerHttpServlet { private static final String TEMPLATE_NAME = "siteAdmin-classHierarchy.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.EDIT_ONTOLOGY.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.EDIT_ONTOLOGY.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java index bd0243fd3..926f99eb0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -17,10 +16,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Datatype; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -39,8 +37,8 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet { private static final String TEMPLATE_NAME = "siteAdmin-objectPropHierarchy.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.EDIT_ONTOLOGY.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.EDIT_ONTOLOGY.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java index fc9e22edd..f093ff819 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java @@ -15,7 +15,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Property; @@ -33,8 +33,8 @@ public class ListPropertyGroupsController extends FreemarkerHttpServlet { private static final String TEMPLATE_NAME = "siteAdmin-objectPropHierarchy.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.EDIT_ONTOLOGY.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.EDIT_ONTOLOGY.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java index 09f04d5f3..e8af4ea41 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java @@ -17,7 +17,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup; @@ -40,8 +40,8 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet { private static final String TEMPLATE_NAME = "siteAdmin-objectPropHierarchy.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.EDIT_ONTOLOGY.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.EDIT_ONTOLOGY.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java index 8c964ad5b..19e7d4836 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java @@ -3,7 +3,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.net.URLEncoder; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -15,7 +14,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; @@ -36,8 +35,8 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet { private static final String TEMPLATE_NAME = "siteAdmin-classHierarchy.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.EDIT_ONTOLOGY.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.EDIT_ONTOLOGY.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java index 1373614ab..33316862b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java @@ -2,15 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import java.util.HashMap; import java.util.Map; -import java.util.Enumeration; - -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -18,18 +11,14 @@ import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.datatypes.RDFDatatype ; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.Individual; 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.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; public class ManageLabelsForIndividualController extends FreemarkerHttpServlet { @@ -38,8 +27,8 @@ public class ManageLabelsForIndividualController extends FreemarkerHttpServlet { private static final String TEMPLATE_NAME = "manageLabelsForIndividual.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java index be1cb0705..a978fd05d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; @@ -19,10 +19,10 @@ public class RevisionInfoController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final String TEMPLATE_DEFAULT = "revisionInfo.ftl"; - public static final Actions REQUIRED_ACTIONS = SimplePermission.SEE_REVISION_INFO.ACTIONS; + public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.SEE_REVISION_INFO.ACTION; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { return REQUIRED_ACTIONS; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java index 66ee023fc..c6228ec78 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java @@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.net.URLEncoder; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -19,7 +18,7 @@ import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; @@ -44,8 +43,8 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet { private int previous_posn = 0; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.EDIT_ONTOLOGY.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.EDIT_ONTOLOGY.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java index 1f8b58cff..869112de9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java @@ -2,10 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; -import java.text.Collator; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -18,10 +15,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Datatype; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -50,8 +46,8 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet { private int previous_posn = 0; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.EDIT_ONTOLOGY.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.EDIT_ONTOLOGY.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java index 2a04ececa..22d14e6b2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java @@ -18,7 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup; import edu.cornell.mannlib.vitro.webapp.beans.VClass; @@ -47,8 +47,8 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet private int previous_posn = 0; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.EDIT_ONTOLOGY.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.EDIT_ONTOLOGY.ACTION; } @Override 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 47181cf4b..64625a22a 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 @@ -10,7 +10,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; @@ -26,8 +26,8 @@ public class SimpleReasonerRecomputeController extends FreemarkerHttpServlet { private static final String RECOMPUTE_INFERENCES_FTL = "recomputeInferences.ftl"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION; } protected ResponseValues processRequest(VitroRequest vreq) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java index d287f27fe..4a539f708 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java @@ -3,12 +3,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.individual; import java.io.IOException; -import java.lang.Integer; -import java.lang.String; import java.sql.SQLException; import java.util.HashMap; -import java.util.List; -import java.util.Locale; import java.util.Map; import org.apache.commons.logging.Log; @@ -29,15 +25,14 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Res import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; -import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; +import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale; import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ExecuteDataRetrieval; import edu.cornell.mannlib.vitro.webapp.web.beanswrappers.ReadOnlyBeansWrapper; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual; import edu.ucsf.vitro.opensocial.OpenSocialManager; import freemarker.ext.beans.BeansWrapper; import freemarker.template.TemplateModel; @@ -191,7 +186,7 @@ class IndividualResponseBuilder { private Map getVerbosePropertyValues() { Map map = null; - if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_VERBOSE_PROPERTY_INFORMATION.ACTIONS)) { + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_VERBOSE_PROPERTY_INFORMATION.ACTION)) { // Get current verbose property display value String verbose = vreq.getParameter("verbose"); Boolean verboseValue; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java index 3038521c6..b43874afd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java @@ -237,7 +237,7 @@ public class JenaAdminActions extends BaseEditController { @Override public void doGet(HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) { + if (!isAuthorizedToDisplayPage(req, response, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java index 877bb05c0..57e414eb2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java @@ -51,7 +51,7 @@ public class JenaCsv2RdfController extends JenaIngestController { public void doPost(HttpServletRequest rawRequest, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(rawRequest, response, - SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTIONS)) { + SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java index b034ea5d9..715fb511b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java @@ -25,7 +25,7 @@ import com.hp.hpl.jena.shared.Lock; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; @@ -39,7 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase; import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaOutputUtils; public class JenaExportController extends BaseEditController { - private static final Actions REQUIRED_ACTIONS = SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTIONS + private static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION .or(SimplePermission.EDIT_ONTOLOGY.ACTION); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java index 00dde62db..bad20b44c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java @@ -127,7 +127,7 @@ public class JenaIngestController extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTIONS)) { + SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java index 39e862325..f5127dd64 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java @@ -110,7 +110,7 @@ public class JenaXMLFileUpload extends JenaIngestController { } if (!isAuthorizedToDisplayPage(request, resp, - SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTIONS)) { + SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) { return; } @@ -162,7 +162,7 @@ public class JenaXMLFileUpload extends JenaIngestController { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTIONS)) { + SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java index bcb2eb635..cd07764bd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java @@ -68,7 +68,7 @@ public class RDFUploadController extends JenaIngestController { public void doPost(HttpServletRequest req, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(req, response, - SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTIONS)) { + SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java index 6c407c129..b8ea16f30 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java @@ -22,7 +22,7 @@ public class RDFUploadFormController extends BaseEditController { public void doPost (HttpServletRequest request, HttpServletResponse response) { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTIONS)) { + SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java index de9fe5d8e..14a4e9865 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java @@ -27,7 +27,6 @@ import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -277,7 +276,7 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen AddObjectPropertyStatement aops = new AddObjectPropertyStatement( vreq.getJenaOntModel(), individual.getURI(), SOME_PREDICATE, SOME_URI); - return PolicyHelper.isAuthorizedForActions(vreq, new Actions(adps).or(aops)); + return PolicyHelper.isAuthorizedForActions(vreq, adps.or(aops)); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java index de0900354..c06b7d758 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java @@ -13,7 +13,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; @@ -35,8 +35,8 @@ public class EditRequestAJAXController extends VitroHttpServlet { public static Log log = LogFactory.getLog(EditRequestDispatchController.class); - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java index 30ee3b8c3..28476e99c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java @@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Property; @@ -58,8 +58,8 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet { final String DEFAULT_DELETE_FORM = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultDeleteGenerator"; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java index b62254878..dff0cae1d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java @@ -9,7 +9,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; 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.UrlBuilder; @@ -32,8 +32,8 @@ public class PostEditCleanupController extends FreemarkerHttpServlet{ private static Log log = LogFactory.getLog(PostEditCleanupController.class); @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java index f02dea1b6..797c3c152 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java @@ -12,14 +12,13 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -52,8 +51,8 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{ @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java index 37f72c4dd..94eb2dffa 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java @@ -43,9 +43,9 @@ public class ModelSwitcher { */ public static boolean authorizedForSpecialModel(HttpServletRequest req) { if (isParameterPresent(req, SWITCH_TO_DISPLAY_MODEL)) { - return PolicyHelper.isAuthorizedForActions(req, SimplePermission.MANAGE_MENUS.ACTIONS); + return PolicyHelper.isAuthorizedForActions(req, SimplePermission.MANAGE_MENUS.ACTION); } else if (anyOtherSpecialProperties(req)){ - return PolicyHelper.isAuthorizedForActions(req, SimplePermission.ACCESS_SPECIAL_DATA_MODELS.ACTIONS); + return PolicyHelper.isAuthorizedForActions(req, SimplePermission.ACCESS_SPECIAL_DATA_MODELS.ACTION); } else { return true; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java index 0d5e4300f..9dcac4d41 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java @@ -21,7 +21,7 @@ import org.json.JSONObject; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine; @@ -54,8 +54,8 @@ public class AutocompleteController extends VitroAjaxController { public static final int MAX_QUERY_LENGTH = 500; @Override - protected Actions requiredActions(VitroRequest vreq) { - return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTIONS; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java index 23d7444d1..66b823b2c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java @@ -26,7 +26,7 @@ import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils; import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils.AjaxControllerException; @@ -54,9 +54,9 @@ public class DataAutocompleteController extends VitroAjaxController { public static final int MAX_QUERY_LENGTH = 500; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { //used to be basic vitro ajax permission but need to query full model - return SimplePermission.QUERY_FULL_MODEL.ACTIONS; + return SimplePermission.QUERY_FULL_MODEL.ACTION; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java index 151f1b670..0d939f982 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java @@ -18,7 +18,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; 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.UrlBuilder; @@ -82,10 +83,10 @@ public class IndexController extends FreemarkerHttpServlet { private static final String PAGE_URL = "/SearchIndex"; private static final String TEMPLATE_NAME = "searchIndex.ftl"; - public static final Actions REQUIRED_ACTIONS = SimplePermission.MANAGE_SEARCH_INDEX.ACTIONS; + public static final RequestedAction REQUIRED_ACTIONS = SimplePermission.MANAGE_SEARCH_INDEX.ACTION; @Override - protected Actions requiredActions(VitroRequest vreq) { + protected AuthorizationRequest requiredActions(VitroRequest vreq) { return REQUIRED_ACTIONS; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SearchServiceController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SearchServiceController.java index 490fff4ef..a649b8b22 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SearchServiceController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SearchServiceController.java @@ -98,7 +98,7 @@ public class SearchServiceController extends FreemarkerHttpServlet { } // For other functions, your credentials must have moxie. if (PolicyHelper.isAuthorizedForActions(vreq, email, pw, - SimplePermission.MANAGE_SEARCH_INDEX.ACTIONS)) { + SimplePermission.MANAGE_SEARCH_INDEX.ACTION)) { return; } // Otherwise, you can't do this. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java index 0c5446bca..3ccd2ce3d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java @@ -46,7 +46,7 @@ public class GetAllClasses extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_MISCELLANEOUS_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java index fd1db981e..57ee4622d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java @@ -3,7 +3,6 @@ package edu.cornell.mannlib.vitro.webapp.sparql; import java.io.IOException; import java.io.PrintWriter; -import java.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -58,7 +57,7 @@ public class GetAllPrefix extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_MISCELLANEOUS_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java index 171d9bc6b..d0b902f0e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java @@ -45,7 +45,7 @@ public class GetClazzAllProperties extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_MISCELLANEOUS_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java index 465da4db1..7917fefff 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java @@ -34,7 +34,7 @@ public class GetClazzDataProperties extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_MISCELLANEOUS_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java index 8c3ca92c9..4d697ab24 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java @@ -41,7 +41,7 @@ public class GetClazzObjectProperties extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_MISCELLANEOUS_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java index 38b8412d3..21585b65e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java @@ -50,7 +50,7 @@ public class GetObjectClasses extends BaseEditController { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!isAuthorizedToDisplayPage(request, response, - SimplePermission.USE_MISCELLANEOUS_PAGES.ACTIONS)) { + SimplePermission.USE_MISCELLANEOUS_PAGES.ACTION)) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java index 00532d084..e0352183e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java @@ -18,7 +18,6 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; @@ -53,8 +52,7 @@ public class ConfirmAuthorization extends BodyTagSupport { */ private boolean isAuthorized() { Set actionSet = getActionsFromRequestAttribute(); - return PolicyHelper.isAuthorizedForActions(getRequest(), new Actions( - actionSet)); + return PolicyHelper.isAuthorizedForActions(getRequest(), actionSet); } /** diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java index dd95e7896..0d934e559 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java @@ -19,7 +19,6 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; @@ -123,12 +122,12 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel { AddObjectPropertyStatement aops = new AddObjectPropertyStatement( vreq.getJenaOntModel(), individual.getURI(), SOME_PREDICATE, SOME_URI); - return PolicyHelper.isAuthorizedForActions(vreq, new Actions(adps).or(aops)); + return PolicyHelper.isAuthorizedForActions(vreq, adps.or(aops)); } public boolean getShowAdminPanel() { return PolicyHelper.isAuthorizedForActions(vreq, - SimplePermission.SEE_INDVIDUAL_EDITING_PANEL.ACTIONS); + SimplePermission.SEE_INDVIDUAL_EDITING_PANEL.ACTION); } /* rdfs:label needs special treatment, because it is not possible to construct a diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java index 6120a12cd..af0176614 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java @@ -11,7 +11,6 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel; -import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Property; @@ -78,7 +77,7 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel { } if (!PolicyHelper.isAuthorizedForActions(vreq, - SimplePermission.SEE_VERBOSE_PROPERTY_INFORMATION.ACTIONS)) { + SimplePermission.SEE_VERBOSE_PROPERTY_INFORMATION.ACTION)) { return; } diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_AuthorizationRequestTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_AuthorizationRequestTest.java new file mode 100644 index 000000000..e3741d7e4 --- /dev/null +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_AuthorizationRequestTest.java @@ -0,0 +1,23 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.auth.policy; + +/** + * Test the ability of the Policy Helper to authorize a variety of simple or complex AuthorizationRequests + */ +public class PolicyHelper_AuthorizationRequestTest { + +/**Test plan + * 
+ * isAuthorizedForActions with array, including empty, null, contains one or more, or contains nulls.
+ * isAuthorizedForActions with collection, including empty, null, contains one or more, or contains nulls.
+ *   All of this is tested by AuthorizationRequestTest?
+ *   
+ * isAuthorizedForActions with simple and complete AuthorizationRequests
+ *   Simple success or failure (perhaps by INCONCLUSIVE) against one or more policies.
+ *   AND satisfied by one policy or by two policies
+ *   OR satisfied by one UNAUTHORIZED and one AUTHORIZED
+ *   Complex structure of AND and OR satisfied in different ways by different policies.
+ *
+ */ +} diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/AuthorizationRequestTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/AuthorizationRequestTest.java new file mode 100644 index 000000000..98864edec --- /dev/null +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/AuthorizationRequestTest.java @@ -0,0 +1,20 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.auth.requestedAction; + +import edu.cornell.mannlib.vitro.testing.AbstractTestClass; + +/** + * Test the functions of the base class. + */ +public class AuthorizationRequestTest extends AbstractTestClass { + /** + * Test plan + * + * 
+	 * Static and methods work even if the list or array is empty or null, or contains a null.
+	 * 
+	 * Instance and and or work with nulls.
+	 *
+ */ +}