You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/12/01 13:54:08 UTC
[4/5] syncope git commit: More rationale usage of EntitlementUtil
More rationale usage of EntitlementUtil
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2c04c8ee
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2c04c8ee
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2c04c8ee
Branch: refs/heads/1_2_X
Commit: 2c04c8ee0693b5869286a3e65afefde16488262d
Parents: 96c857d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Dec 1 13:53:24 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Dec 1 13:53:24 2014 +0100
----------------------------------------------------------------------
.../core/rest/controller/RoleController.java | 3 +-
.../rest/controller/UserWorkflowController.java | 6 ++--
.../syncope/core/rest/data/UserDataBinder.java | 3 +-
.../syncope/core/workflow/WorkflowAdapter.java | 6 ++--
.../workflow/role/NoOpRoleWorkflowAdapter.java | 4 +--
.../workflow/user/NoOpUserWorkflowAdapter.java | 4 +--
.../activiti/ActivitiUserWorkflowAdapter.java | 35 ++++++++++----------
7 files changed, 28 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2c04c8ee/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
index 71723b4..22001e5 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
@@ -57,7 +57,6 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.apache.syncope.core.workflow.role.RoleWorkflowAdapter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionInterceptor;
@@ -128,7 +127,7 @@ public class RoleController extends AbstractSubjectController<RoleTO, RoleMod> {
}
Set<Long> ownedRoleIds;
- SyncopeUser authUser = userDAO.find(SecurityContextHolder.getContext().getAuthentication().getName());
+ SyncopeUser authUser = userDAO.find(EntitlementUtil.getAuthenticatedUsername());
if (authUser == null) {
ownedRoleIds = Collections.<Long>emptySet();
} else {
http://git-wip-us.apache.org/repos/asf/syncope/blob/2c04c8ee/core/src/main/java/org/apache/syncope/core/rest/controller/UserWorkflowController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/UserWorkflowController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/UserWorkflowController.java
index 87a53a3..933d6a5 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/UserWorkflowController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/UserWorkflowController.java
@@ -35,7 +35,6 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +56,7 @@ public class UserWorkflowController extends AbstractTransactionalController<Work
@PreAuthorize("hasRole('WORKFLOW_FORM_CLAIM')")
@Transactional(rollbackFor = { Throwable.class })
public WorkflowFormTO claimForm(final String taskId) {
- return uwfAdapter.claimForm(taskId, SecurityContextHolder.getContext().getAuthentication().getName());
+ return uwfAdapter.claimForm(taskId);
}
@PreAuthorize("hasRole('USER_UPDATE')")
@@ -100,8 +99,7 @@ public class UserWorkflowController extends AbstractTransactionalController<Work
@PreAuthorize("hasRole('WORKFLOW_FORM_SUBMIT')")
@Transactional(rollbackFor = { Throwable.class })
public UserTO submitForm(final WorkflowFormTO form) {
- WorkflowResult<? extends AbstractAttributableMod> updated =
- uwfAdapter.submitForm(form, SecurityContextHolder.getContext().getAuthentication().getName());
+ WorkflowResult<? extends AbstractAttributableMod> updated = uwfAdapter.submitForm(form);
// propByRes can be made empty by the workflow definition if no propagation should occur
// (for example, with rejected users)
http://git-wip-us.apache.org/repos/asf/syncope/blob/2c04c8ee/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java b/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
index f975e48..a37aacb 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
@@ -58,7 +58,6 @@ import org.apache.syncope.core.util.AttributableUtil;
import org.apache.syncope.core.util.EntitlementUtil;
import org.apache.syncope.core.util.Encryptor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -154,7 +153,7 @@ public class UserDataBinder extends AbstractAttributableDataBinder {
public UserTO getAuthenticatedUserTO() {
final UserTO authUserTO;
- final String authUsername = SecurityContextHolder.getContext().getAuthentication().getName();
+ final String authUsername = EntitlementUtil.getAuthenticatedUsername();
if (anonymousUser.equals(authUsername)) {
authUserTO = new UserTO();
authUserTO.setId(-2);
http://git-wip-us.apache.org/repos/asf/syncope/blob/2c04c8ee/core/src/main/java/org/apache/syncope/core/workflow/WorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/WorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/WorkflowAdapter.java
index 39ce722..b5cf7d1 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/WorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/WorkflowAdapter.java
@@ -91,22 +91,20 @@ public interface WorkflowAdapter {
* Claim a form for a given user.
*
* @param taskId Workflow task to which the form is associated
- * @param username claiming username
* @return updated form
* @throws NotFoundException not found exception
* @throws WorkflowException workflow exception
*/
- WorkflowFormTO claimForm(String taskId, String username) throws NotFoundException, WorkflowException;
+ WorkflowFormTO claimForm(String taskId) throws NotFoundException, WorkflowException;
/**
* Submit a form.
*
* @param form to be submitted
- * @param username submitting username
* @return user updated by this form submit
* @throws NotFoundException not found exception
* @throws WorkflowException workflow exception
*/
- WorkflowResult<? extends AbstractAttributableMod> submitForm(WorkflowFormTO form, String username)
+ WorkflowResult<? extends AbstractAttributableMod> submitForm(WorkflowFormTO form)
throws NotFoundException, WorkflowException;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/2c04c8ee/core/src/main/java/org/apache/syncope/core/workflow/role/NoOpRoleWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/role/NoOpRoleWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/role/NoOpRoleWorkflowAdapter.java
index 452f722..fa648ba 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/role/NoOpRoleWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/role/NoOpRoleWorkflowAdapter.java
@@ -117,14 +117,14 @@ public class NoOpRoleWorkflowAdapter extends AbstractRoleWorkflowAdapter {
}
@Override
- public WorkflowFormTO claimForm(final String taskId, final String username)
+ public WorkflowFormTO claimForm(final String taskId)
throws NotFoundException, WorkflowException {
throw new WorkflowException(new UnsupportedOperationException("Not supported."));
}
@Override
- public WorkflowResult<RoleMod> submitForm(final WorkflowFormTO form, final String username)
+ public WorkflowResult<RoleMod> submitForm(final WorkflowFormTO form)
throws NotFoundException, WorkflowException {
throw new WorkflowException(new UnsupportedOperationException("Not supported."));
http://git-wip-us.apache.org/repos/asf/syncope/blob/2c04c8ee/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
index 8dc2608..1ffc4c7 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
@@ -216,14 +216,14 @@ public class NoOpUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
}
@Override
- public WorkflowFormTO claimForm(final String taskId, final String username)
+ public WorkflowFormTO claimForm(final String taskId)
throws NotFoundException, WorkflowException {
throw new WorkflowException(new UnsupportedOperationException("Not supported."));
}
@Override
- public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form, final String username)
+ public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form)
throws NotFoundException, WorkflowException {
throw new WorkflowException(new UnsupportedOperationException("Not supported."));
http://git-wip-us.apache.org/repos/asf/syncope/blob/2c04c8ee/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
index 78968ab..f6cc322 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
@@ -687,7 +687,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
public List<WorkflowFormTO> getForms() {
List<WorkflowFormTO> forms = new ArrayList<WorkflowFormTO>();
- String authUser = EntitlementUtil.getAuthenticatedUsername();
+ final String authUser = EntitlementUtil.getAuthenticatedUsername();
if (adminUser.equals(authUser)) {
forms.addAll(getForms(taskService.createTaskQuery().
taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE)));
@@ -775,7 +775,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
return result;
}
- private Map.Entry<Task, TaskFormData> checkTask(final String taskId, final String username) {
+ private Map.Entry<Task, TaskFormData> checkTask(final String taskId, final String authUser) {
Task task;
try {
task = taskService.createTaskQuery().taskId(taskId).singleResult();
@@ -790,10 +790,10 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
throw new NotFoundException("Form for Activiti Task " + taskId, e);
}
- if (!adminUser.equals(username)) {
- SyncopeUser user = userDAO.find(username);
+ if (!adminUser.equals(authUser)) {
+ SyncopeUser user = userDAO.find(authUser);
if (user == null) {
- throw new NotFoundException("Syncope User " + username);
+ throw new NotFoundException("Syncope User " + authUser);
}
}
@@ -802,22 +802,23 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
@Transactional
@Override
- public WorkflowFormTO claimForm(final String taskId, final String username)
+ public WorkflowFormTO claimForm(final String taskId)
throws WorkflowException {
- Map.Entry<Task, TaskFormData> checked = checkTask(taskId, username);
+ final String authUser = EntitlementUtil.getAuthenticatedUsername();
+ Map.Entry<Task, TaskFormData> checked = checkTask(taskId, authUser);
- if (!adminUser.equals(username)) {
- List<Task> tasksForUser = taskService.createTaskQuery().taskId(taskId).taskCandidateUser(username).list();
+ if (!adminUser.equals(authUser)) {
+ List<Task> tasksForUser = taskService.createTaskQuery().taskId(taskId).taskCandidateUser(authUser).list();
if (tasksForUser.isEmpty()) {
throw new WorkflowException(
- new IllegalArgumentException(username + " is not candidate for task " + taskId));
+ new IllegalArgumentException(authUser + " is not candidate for task " + taskId));
}
}
Task task;
try {
- taskService.setOwner(taskId, username);
+ taskService.setOwner(taskId, authUser);
task = taskService.createTaskQuery().taskId(taskId).singleResult();
} catch (ActivitiException e) {
throw new WorkflowException("While reading task " + taskId, e);
@@ -828,14 +829,15 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
@Transactional
@Override
- public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form, final String username)
+ public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form)
throws WorkflowException {
- Map.Entry<Task, TaskFormData> checked = checkTask(form.getTaskId(), username);
+ final String authUser = EntitlementUtil.getAuthenticatedUsername();
+ Map.Entry<Task, TaskFormData> checked = checkTask(form.getTaskId(), authUser);
- if (!checked.getKey().getOwner().equals(username)) {
+ if (!checked.getKey().getOwner().equals(authUser)) {
throw new WorkflowException(new IllegalArgumentException("Task " + form.getTaskId() + " assigned to "
- + checked.getKey().getOwner() + " but submitted by " + username));
+ + checked.getKey().getOwner() + " but submitted by " + authUser));
}
SyncopeUser user = userDAO.findByWorkflowId(checked.getKey().getProcessInstanceId());
@@ -846,8 +848,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
Set<String> preTasks = getPerformedTasks(user);
try {
formService.submitTaskFormData(form.getTaskId(), form.getPropertiesForSubmit());
- runtimeService.setVariable(
- user.getWorkflowId(), FORM_SUBMITTER, EntitlementUtil.getAuthenticatedUsername());
+ runtimeService.setVariable(user.getWorkflowId(), FORM_SUBMITTER, authUser);
} catch (ActivitiException e) {
throwException(e, "While submitting form for task " + form.getTaskId());
}