Skip to content

Commit

Permalink
Provide user id in graph modification requests
Browse files Browse the repository at this point in the history
  • Loading branch information
@litvinovg
litvinovg committed Feb 18, 2025
1 parent 1f9af87 commit 22b40e2
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 52 deletions.
54 changes: 28 additions & 26 deletions api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import edu.cornell.mannlib.vedit.util.FormUtils;
import edu.cornell.mannlib.vitro.webapp.auth.attributes.AccessObjectType;
import edu.cornell.mannlib.vitro.webapp.auth.attributes.AccessOperation;
import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSets;
import edu.cornell.mannlib.vitro.webapp.auth.policy.EntityPolicyController;
import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
Expand Down Expand Up @@ -226,36 +227,37 @@ public String getDefaultLandingPage(HttpServletRequest request) {
}

protected static void addAccessAttributes(HttpServletRequest req, String entityURI, AccessObjectType aot) {
// Add the permissionsEntityURI (if we are creating a new property, this will be empty)
req.setAttribute(ENTITY_URI_ATTRIBUTE_NAME, entityURI);
String[] namedKeys = new String[0];
// Get the available permission sets
List<PermissionSet> permissionSets = buildListOfSelectableRoles(ModelAccess.on(req).getWebappDaoFactory());
List<RoleInfo> roles = new ArrayList<>();

for (PermissionSet permissionSet : permissionSets) {
roles.add(new RoleInfo(permissionSet));
}
List<AccessOperation> accessOperations = AccessOperation.getOperations(aot);
// Operation, list of roles>
Map<String, List<RoleInfo>> operationsToRoles = new LinkedHashMap<>();
for (AccessOperation operation : accessOperations) {
List<RoleInfo> roleInfos = new LinkedList<>();
String operationName = StringUtils.capitalize(operation.toString().toLowerCase());
operationsToRoles.put(operationName, roleInfos);
for (RoleInfo role : roles) {
RoleInfo roleCopy = role.clone();
roleInfos.add(roleCopy);
if (isPublicForbiddenOperation(operation)) {
if (roleCopy.isPublic) {
roleCopy.setEnabled(false);
roleCopy.setGranted(false);
try (UserOnThread uot = new UserOnThread(req)) {
// Add the permissionsEntityURI (if we are creating a new property, this will be empty)
req.setAttribute(ENTITY_URI_ATTRIBUTE_NAME, entityURI);
String[] namedKeys = new String[0];
// Get the available permission sets
List<PermissionSet> permissionSets = buildListOfSelectableRoles(ModelAccess.on(req).getWebappDaoFactory());
List<RoleInfo> roles = new ArrayList<>();
for (PermissionSet permissionSet : permissionSets) {
roles.add(new RoleInfo(permissionSet));
}
List<AccessOperation> accessOperations = AccessOperation.getOperations(aot);
// Operation, list of roles>
Map<String, List<RoleInfo>> operationsToRoles = new LinkedHashMap<>();
for (AccessOperation operation : accessOperations) {
List<RoleInfo> roleInfos = new LinkedList<>();
String operationName = StringUtils.capitalize(operation.toString().toLowerCase());
operationsToRoles.put(operationName, roleInfos);
for (RoleInfo role : roles) {
RoleInfo roleCopy = role.clone();
roleInfos.add(roleCopy);
if (isPublicForbiddenOperation(operation)) {
if (roleCopy.isPublic) {
roleCopy.setEnabled(false);
roleCopy.setGranted(false);
}
}
}
getRolePolicyInformation(entityURI, aot, namedKeys, operation, roleInfos);
}
getRolePolicyInformation(entityURI, aot, namedKeys, operation, roleInfos);
req.setAttribute(OPERATIONS_TO_ROLES, operationsToRoles);
}
req.setAttribute(OPERATIONS_TO_ROLES, operationsToRoles);
}

private static void getRolePolicyInformation(String entityURI, AccessObjectType aot, String[] namedKeys,
Expand Down
26 changes: 16 additions & 10 deletions api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import edu.cornell.mannlib.vedit.validator.Validator;
import edu.cornell.mannlib.vitro.webapp.auth.attributes.AccessObjectType;
import edu.cornell.mannlib.vitro.webapp.auth.attributes.AccessOperation;
import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
import edu.cornell.mannlib.vitro.webapp.auth.policy.EntityPolicyController;
import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
Expand Down Expand Up @@ -132,11 +133,12 @@ public void doPost (HttpServletRequest request, HttpServletResponse response) {
}

String action = getAction(request);

boolean status = performEdit(epo, newObj, action);
if (status == FAILURE) {
retry(request, response, epo);
return;
try( UserOnThread uot = new UserOnThread(request)) {
boolean status = performEdit(epo, newObj, action);
if (status == FAILURE) {
retry(request, response, epo);
return;
}
}

// If contains restrictions
Expand Down Expand Up @@ -214,7 +216,9 @@ private void updateUriSuppressions(HttpServletRequest request) {
if (aot == null) {
return;
}
updateUriSuppressions(request, aot, entityUri);
try (UserOnThread uot = new UserOnThread(request)) {
updateUriSuppressions(request, aot, entityUri);
}
}

private void updatePermissions(HttpServletRequest request) {
Expand All @@ -231,10 +235,12 @@ private void updatePermissions(HttpServletRequest request) {
if (aot == null) {
return;
}
updateEntityPermissions(request, entityUri, aot);
updateTypeSuppressions(request, aot, entityUri);
updateNotRelatedTypeSuppressions(request, aot, entityUri);
updateNotRelatedPropertySuppressions(request, aot, entityUri);
try (UserOnThread uot = new UserOnThread(request)) {
updateEntityPermissions(request, entityUri, aot);
updateTypeSuppressions(request, aot, entityUri);
updateNotRelatedTypeSuppressions(request, aot, entityUri);
updateNotRelatedPropertySuppressions(request, aot, entityUri);
}
}

private void updateEntityPermissions(HttpServletRequest request, String entityUri, AccessObjectType aot) {
Expand Down
6 changes: 4 additions & 2 deletions ...rnell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.AbstractPageHandler.Message;
Expand Down Expand Up @@ -69,7 +69,9 @@ private ResponseValues handleEditRequest(VitroRequest vreq) {
ManageProxiesEditPage page = new ManageProxiesEditPage(vreq);

if (page.isValid()) {
page.applyEdits();
try (UserOnThread uot = new UserOnThread(vreq)) {
page.applyEdits();
}
Message.setMessage(vreq, new SuccessMessage());
} else {
Message.setMessage(vreq, new FailureMessage());
Expand Down
3 changes: 2 additions & 1 deletion .../main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.jena.sparql.modify.UsingList;

import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils;
import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
Expand Down Expand Up @@ -129,7 +130,7 @@ private void executeUpdate(HttpServletRequest req, UpdateRequest parsed) {
SearchIndexer indexer = ApplicationUtils.instance().getSearchIndexer();
Dataset ds = new RDFServiceDataset(vreq.getUnfilteredRDFService());
GraphStore graphStore = GraphStoreFactory.create(ds);
try {
try (UserOnThread uot = new UserOnThread(req)) {
if(indexer != null) {
indexer.pause();
}
Expand Down
4 changes: 2 additions & 2 deletions .../cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.StringUtils;

import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
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.AuthorizationRequest;
Expand Down Expand Up @@ -88,7 +88,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
resp.sendError(HttpServletResponse.SC_FORBIDDEN);
}

try {
try (UserOnThread uot = new UserOnThread(req)) {
if (ACTION_RESTORE.equals(req.getPathInfo())) {
long tripleCount = new RestoreModelsAction(req, resp)
.restoreModels();
Expand Down
8 changes: 4 additions & 4 deletions api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.rdf.model.ResourceFactory;
import org.apache.jena.shared.Lock;

import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
Expand All @@ -51,15 +51,15 @@ protected void doPost(HttpServletRequest rawRequest, HttpServletResponse resp)

String command = getCommand(vreq);
if(command != null) {
processCommand(command, vreq, resp);
try( UserOnThread uot = new UserOnThread(vreq)) {
processCommand(command, vreq, resp);
}
} else {
log.error("Command is null");
}
//Need to redirect correctly
if(!isReorder(command)){
resp.sendRedirect(rawRequest.getContextPath() + REDIRECT_URL);
} else {

}
}

Expand Down
5 changes: 3 additions & 2 deletions api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.jena.shared.Lock;

import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
Expand Down Expand Up @@ -434,7 +435,7 @@ private void readIntoModel(InputStream in, String language,
ChangeSet cs = makeChangeSet(rdfService);
cs.addAddition(in, RDFServiceUtils.getSerializationFormatFromJenaString(
language), modelName, userId);
try {
try (UserOnThread uot = new UserOnThread(userId)) {
rdfService.changeSetUpdate(cs);
} catch (RDFServiceException e) {
throw new RuntimeException(e);
Expand All @@ -446,7 +447,7 @@ private void removeFromModel(InputStream in, String language,
ChangeSet cs = makeChangeSet(rdfService);
cs.addRemoval(in, RDFServiceUtils.getSerializationFormatFromJenaString(
language), modelName, userId);
try {
try (UserOnThread uot = new UserOnThread(userId)) {
rdfService.changeSetUpdate(cs);
} catch (RDFServiceException e) {
throw new RuntimeException(e);
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.jena.rdf.model.ResourceFactory;
import org.apache.jena.rdf.model.Statement;
import org.apache.jena.vocabulary.RDF;

import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
import edu.cornell.mannlib.vitro.webapp.dao.jena.DependentResourceDeleteJena;
Expand Down Expand Up @@ -303,7 +303,7 @@ public static void applyChangesToWriteModel(AdditionsAndRetractions changes,
cs.addRemoval(retractionsInputStream,
RDFServiceUtils.getSerializationFormatFromJenaString("N3"), graphUri, editorUri);

try {
try (UserOnThread uot = new UserOnThread(editorUri)) {
rdfService.changeSetUpdate(cs);
} catch (RDFServiceException e) {
log.error(e, e);
Expand Down
2 changes: 0 additions & 2 deletions api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeSet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public interface ChangeSet {
* @param serializationFormat - format of the serialized RDF model
* @param graphURI - URI of the graph to which the RDF model should be added
*/
@Deprecated
public void addAddition(InputStream model,
RDFService.ModelSerializationFormat serializationFormat,
String graphURI);
Expand All @@ -58,7 +57,6 @@ public void addAddition(InputStream model,
* @param serializationFormat - format of the serialized RDF model
* @param graphURI - URI of the graph from which the RDF model should be removed
*/
@Deprecated
public void addRemoval(InputStream model,
RDFService.ModelSerializationFormat serializationFormat,
String graphURI);
Expand Down
1 change: 0 additions & 1 deletion ...ain/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model;

import java.io.ByteArrayInputStream;
import java.util.Iterator;

import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
Expand Down

0 comments on commit 22b40e2

Please sign in to comment.