inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added task update protection to the task form processor and changed the check in TaskInstancePut to use the new isTaskEditable method on the WorkflowService.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-08-23 07:24:12 +00:00
parent b47e03a455
commit eae37b616f
1 changed files with 2 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
source/java/org/alfresco/repo/web/scripts/workflow/TaskInstancePut.java
View File

@@ -21,21 +21,15 @@ package org.alfresco.repo.web.scripts.workflow;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.workflow.WorkflowModel;
import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.cmr.workflow.WorkflowTask;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.json.JSONArray; import org.json.JSONArray;
@@ -67,16 +61,10 @@ public class TaskInstancePut extends AbstractWorkflowWebscript
try try
{ {
WorkflowTask workflowTask = workflowService.getTaskById(taskId); WorkflowTask workflowTask = workflowService.getTaskById(taskId);
String currentUser = authenticationService.getCurrentUserName(); String currentUser = authenticationService.getCurrentUserName();
Serializable owner = workflowTask.getProperties().get(ContentModel.PROP_OWNER);
Serializable initiator = getWorkflowInitiator(workflowTask);
// if the the current user is the owner of the task, the initiator of the workflow // if the the current user is able to edit, updating the task is allowed
// or a member of the assigned pooled actors group, updating the task is allowed if (this.workflowService.isTaskEditable(workflowTask, currentUser))
if ((owner != null && currentUser.equals(owner)) ||
(initiator != null && currentUser.equals(initiator)) ||
isUserInPooledActors(workflowTask, currentUser))
{ {
// read request json // read request json
json = new JSONObject(new JSONTokener(req.getContent().getContent())); json = new JSONObject(new JSONTokener(req.getContent().getContent()));
@@ -169,54 +157,4 @@ public class TaskInstancePut extends AbstractWorkflowWebscript
} }
return props; return props;
} }
/**
* Retrieves the workflow initiator for the given workflow task.
*
* @param workflowTask The task to get the initiator for
* @return The user name of the initiator or null if there isn't one
*/
private Serializable getWorkflowInitiator(WorkflowTask workflowTask)
{
Serializable initiatorUserName = null;
NodeRef initiator = workflowTask.getPath().getInstance().getInitiator();
if (initiator != null)
{
initiatorUserName = this.nodeService.getProperty(initiator, ContentModel.PROP_USERNAME);
}
return initiatorUserName;
}
private boolean isUserInPooledActors(WorkflowTask task, String currentUser)
{
boolean result = false;
// get groups that the current user has to belong (at least one of them)
final Collection<?> actors = (Collection<?>)task.getProperties().get(WorkflowModel.ASSOC_POOLED_ACTORS);
if (actors != null && !actors.isEmpty())
{
for (Object actor : actors)
{
// retrieve the name of the group
Map<QName, Serializable> props = nodeService.getProperties((NodeRef)actor);
String name = (String)props.get(ContentModel.PROP_AUTHORITY_NAME);
// retrieve the users of the group
Set<String> users = authorityService.getContainedAuthorities(AuthorityType.USER, name, true);
// see if the user is one of the users in the group
if (users != null && !users.isEmpty() && users.contains(currentUser))
{
// they are a member of the group so stop looking!
result = true;
break;
}
}
}
return result;
}
} }