Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,10 @@ private String assignStrategy(UserTaskInstance userTaskInstance, IdentityProvide
}

private void checkPermission(UserTaskInstance userTaskInstance, IdentityProvider identityProvider) {
String user = identityProvider.getName();
Collection<String> roles = identityProvider.getRoles();
this.checkPermission(userTaskInstance, identityProvider.getName(), identityProvider.getRoles());
}

private void checkPermission(UserTaskInstance userTaskInstance, String user, Collection<String> roles) {

if (WORKFLOW_ENGINE_USER.equals(user)) {
return;
Expand All @@ -245,11 +247,18 @@ private void checkPermission(UserTaskInstance userTaskInstance, IdentityProvider
return;
}

Set<String> excludedUsers = userTaskInstance.getExcludedUsers();
if (excludedUsers != null && excludedUsers.contains(user)) {
String message = String.format("User '%s' is not authorized to perform an operation on user task '%s'",
user, userTaskInstance.getId());
throw new UserTaskInstanceNotAuthorizedException(message);
}

if (List.of(INACTIVE, ACTIVE).contains(userTaskInstance.getStatus())) {
// there is no user
Set<String> users = new HashSet<>(userTaskInstance.getPotentialUsers());
users.removeAll(userTaskInstance.getExcludedUsers());
if (users.contains(identityProvider.getName())) {
if (users.contains(user)) {
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import static java.util.Collections.singletonMap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.kie.kogito.usertask.impl.lifecycle.DefaultUserTaskLifeCycle.CLAIM;
import static org.kie.kogito.usertask.impl.lifecycle.DefaultUserTaskLifeCycle.COMPLETE;
Expand Down Expand Up @@ -514,6 +515,11 @@ public void testApprovalWithExcludedOwnerViaPhases() throws Exception {
userTaskInstances = userTasks.instances().findByIdentity(IdentityProviders.of("admin", singletonList("managers")));
assertThat(userTaskInstances).isNotNull().hasSize(1);
UserTaskInstance ut_2 = userTaskInstances.get(0);
// attempt to claim task with excluded user (manager)
assertThrows(UserTaskInstanceNotAuthorizedException.class, () -> {
ut_2.transition(CLAIM, emptyMap(), IdentityProviders.of("manager", singletonList("managers")));
});
// claim and complete task with different user (admin)
ut_2.transition(CLAIM, emptyMap(), IdentityProviders.of("admin", singletonList("managers")));
ut_2.transition(COMPLETE, emptyMap(), IdentityProviders.of("admin", singletonList("managers")));

Expand Down