Merge pull request #489 from litvinovg/userOnThread

Provide user information into model change
vivo-project · Mar 3, 2025 · f9935f5 · f9935f5
2 parents 531832f + 620b8ef
commit f9935f5
Show file tree

Hide file tree

Showing 16 changed files with 116 additions and 32 deletions.
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
@@ -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;
@@ -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
@@ -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) {
@@ -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) {

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/checks/UserOnThread.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/checks/UserOnThread.java
@@ -0,0 +1,30 @@
+/* $This file is distributed under the terms of the license in LICENSE$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.checks;
+
+import javax.servlet.http.HttpServletRequest;
+
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+
+public class UserOnThread implements AutoCloseable {
+
+    private static ThreadLocal<String> threadLocal = new ThreadLocal<>();
+
+    public UserOnThread(String userId) {
+        threadLocal.set(userId);
+    }
+
+    public UserOnThread(HttpServletRequest vreq) {
+        threadLocal.set(PolicyHelper.getUserAccount(vreq).getUri());
+    }
+
+    @Override
+    public void close() {
+        threadLocal.remove();
+    }
+
+    public static String get() {
+        return threadLocal.get();
+    }
+
+}
diff --git a/...u/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java b/...u/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java
@@ -6,8 +6,9 @@
 
 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.policy.PolicyHelper;
 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;
@@ -73,7 +74,9 @@ private ResponseValues handleEditRequest(VitroRequest vreq) {
 		if (page.isBogus()) {
 			return showHomePage(vreq, page.getBogusMessage());
 		} else if (page.isSubmit() && page.isValid()) {
-			page.updateAccount();
+		    try (UserOnThread uot = new UserOnThread(vreq)) {
+		        page.updateAccount();
+		    }
 
 			UserAccountsListPage.Message.showUpdatedAccount(vreq,
 					page.getUpdatedAccount(), page.wasPasswordEmailSent());

diff --git a/...rnell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java b/...rnell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java
@@ -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;
@@ -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());

diff --git a/.../main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java b/.../main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java
@@ -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;
@@ -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();
 	        }

diff --git a/.../cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java b/.../cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java
@@ -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;
@@ -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();

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
@@ -30,6 +30,7 @@
 
 import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
+import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
 import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
@@ -468,8 +469,10 @@ private void transitionToForcedPasswordChange(HttpServletRequest request) {
 	private void transitionToLoggedIn(HttpServletRequest request,
 			UserAccount user) throws LoginNotPermitted {
 		log.debug("Completed login: " + user.getEmailAddress());
-		getAuthenticator(request).recordLoginAgainstUserAccount(user,
+		try (UserOnThread uot = new UserOnThread(user.getUri())) {
+			getAuthenticator(request).recordLoginAgainstUserAccount(user,
 				AuthenticationSource.INTERNAL);
+		}
 	}
 
 	/**

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
@@ -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;
@@ -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 {
-
     	}
     }
 

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
@@ -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;
@@ -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);
@@ -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);

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/PropertyDWR.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/PropertyDWR.java
@@ -11,7 +11,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.directwebremoting.WebContext;
 import org.directwebremoting.WebContextFactory;
-
+import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
@@ -86,14 +86,19 @@ public int insertProp( PropertyInstance prop) {
         WebContext ctx = WebContextFactory.get();
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
-        return vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao().insertProp(prop);
+        try (UserOnThread uot = new UserOnThread(vreq)) {
+            return vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao().insertProp(prop);
+        }
     }
 
     public int deleteProp(String subjectUri, String predicateUri, String objectUri){
         WebContext ctx = WebContextFactory.get();
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
-        vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao().deleteObjectPropertyStatement(subjectUri, predicateUri, objectUri);
+        try (UserOnThread uot = new UserOnThread(vreq)) {
+            vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao().deleteObjectPropertyStatement(subjectUri,
+                    predicateUri, objectUri);
+        }
         return 0;
     }
 

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java
@@ -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;
@@ -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);

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeSet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeSet.java
@@ -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);
@@ -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);
@@ -159,6 +157,7 @@ public ModelChange manufactureModelChange(InputStream serializedModel, ModelSeri
      */
     public List<Object> getPostChangeEvents();
 
+    public void setUserFromThread();
 
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ChangeSetImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ChangeSetImpl.java
@@ -6,10 +6,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.ModelChange;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.ModelChange.Operation;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import org.apache.commons.lang3.StringUtils;
 
 public class ChangeSetImpl implements ChangeSet {
 
@@ -120,4 +123,14 @@ public String toString() {
 				+ ", preChangeEvents=" + preChangeEvents
 				+ ", postChangeEvents=" + postChangeEvents + "]";
 	}
+
+    @Override
+    public void setUserFromThread() {
+        String userId = UserOnThread.get();
+        if (StringUtils.isNotBlank(userId)) {
+            for (ModelChange modelChange : modelChanges) {
+                modelChange.setUserId(userId);
+            }
+        }
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
@@ -150,6 +150,7 @@ protected void notifyListenersOfChanges(ChangeSet changeSet) throws IOException
         if (registeredListeners.isEmpty() && registeredJenaListeners.isEmpty()) {
             return;
         }
+        changeSet.setUserFromThread();
         for (ModelChange modelChange : changeSet.getModelChanges()) {
             notifyListeners(modelChange);
         }

diff --git a/...ain/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java b/...ain/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java
@@ -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;

diff --git a/...src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceNotificationTest.java b/...src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceNotificationTest.java
@@ -6,17 +6,22 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
+import edu.cornell.mannlib.vitro.webapp.auth.checks.UserOnThread;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.event.BulkUpdateEvent;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.VitroModelFactory;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel;
 import org.apache.commons.io.IOUtils;
 import org.apache.jena.ontology.OntModel;
 import org.apache.jena.ontology.OntModelSpec;
 import org.apache.jena.rdf.listeners.StatementListener;
+import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelChangedListener;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.junit.Before;
@@ -83,6 +88,22 @@ public void testMultipleNotificationsReceived() throws RDFServiceException {
         rdfServiceModel.changeSetUpdate(cs);
     }
 
+    @Test
+    public void testModelNotification() throws RDFServiceException {
+        OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+        RDFServiceModel rdfService = new RDFServiceModel(model);
+        String editorUri = "test:user-id";
+        rdfService.registerListener(new TestListener());
+        RDFServiceGraph graph = new RDFServiceGraph(rdfService);
+        Model rdfServiceModel = VitroModelFactory.createModelForGraph(graph);
+        try (UserOnThread userInfo = new UserOnThread(editorUri)) {
+            rdfServiceModel.read(new StringReader(TEST_TRIPLE), null, "n3");
+        }
+        assertTrue(modelChanges.size() > 0);
+        assertTrue(editorUri.equals(modelChanges.get(0).getUserId()));
+        assertEquals(null, UserOnThread.get());
+    }
+
     private ChangeSet createChangeSet(RDFServiceModel rdfServiceModel, String editorUri, String additions,
             String retractions) {
         ChangeSet cs = rdfServiceModel.manufactureChangeSet();