do not delete indestructible tasks (MID-6636)

Evolveum · Mar 30, 2021 · 14ac705 · 14ac705
1 parent 66968fd
commit 14ac705
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java b/model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
@@ -86,6 +86,7 @@ public interface ModelService {
     String AUTZ_NAMESPACE = AuthorizationConstants.NS_AUTHORIZATION_MODEL;
 
     String OPERATION_LOGGER_NAME = "com.evolveum.midpoint.model.api.op";
+    String CHECK_INDESTRUCTIBLE = CLASS_NAME_WITH_DOT + "checkIndestructible";
 
     /**
      * <p>

diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
@@ -676,7 +676,7 @@ private PrismObject<? extends ObjectType> executeModifyDeltaRaw(ObjectDelta<? ex
 
     private <O extends ObjectType> void checkIndestructible(PrismObject<O> existingObject, Task task, OperationResult result) throws IndestructibilityViolationException {
         if (existingObject != null && Boolean.TRUE.equals(existingObject.asObjectable().isIndestructible())) {
-            IndestructibilityViolationException e = new IndestructibilityViolationException("Attempt to delete indestructible object "+existingObject);
+            IndestructibilityViolationException e = new IndestructibilityViolationException("Attempt to delete indestructible object " + existingObject);
             ModelImplUtils.recordFatalError(result, e);
             throw e;
         }
@@ -1846,17 +1846,38 @@ public boolean suspendTaskTree(String taskOid, long waitForStop, Task operationT
     @Override
     public void suspendAndDeleteTasks(Collection<String> taskOids, long waitForStop, boolean alsoSubtasks, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
         List<PrismObject<TaskType>> resolvedTasks = preprocessTaskCollectionOperation(taskOids, ModelAuthorizationAction.DELETE, AuditEventType.DELETE_OBJECT, operationTask, parentResult);
-        taskManager.suspendAndDeleteTasks(taskOids, waitForStop, alsoSubtasks, parentResult);
+        List<String> indestructibleTaskOids = getIndestructibleTaskOids(resolvedTasks, operationTask, parentResult);
+        taskOids.removeAll(indestructibleTaskOids);
+        if (!taskOids.isEmpty()) {
+            taskManager.suspendAndDeleteTasks(taskOids, waitForStop, alsoSubtasks, parentResult);
+        }
         postprocessTaskCollectionOperation(resolvedTasks, AuditEventType.DELETE_OBJECT, operationTask, parentResult);
     }
 
     @Override
     public void suspendAndDeleteTask(String taskOid, long waitForStop, boolean alsoSubtasks, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
         List<PrismObject<TaskType>> resolvedTasks = preprocessTaskOperation(taskOid, ModelAuthorizationAction.DELETE, AuditEventType.DELETE_OBJECT, operationTask, parentResult);
-        taskManager.suspendAndDeleteTask(taskOid, waitForStop, alsoSubtasks, parentResult);
+        List<String> indestructibleTaskOids = getIndestructibleTaskOids(resolvedTasks, operationTask, parentResult);
+        if (indestructibleTaskOids.isEmpty() || !indestructibleTaskOids.contains(taskOid)) {
+            taskManager.suspendAndDeleteTask(taskOid, waitForStop, alsoSubtasks, parentResult);
+        }
         postprocessTaskCollectionOperation(resolvedTasks, AuditEventType.DELETE_OBJECT, operationTask, parentResult);
     }
 
+    private List<String> getIndestructibleTaskOids(List<PrismObject<TaskType>> allTasks, Task operationTask, OperationResult parentResult) {
+        List<String> indestructible = new ArrayList<>();
+        for (PrismObject<TaskType> taskType : allTasks) {
+            OperationResult result = parentResult.createMinorSubresult(CHECK_INDESTRUCTIBLE);
+            try {
+                checkIndestructible(taskType, operationTask, result);
+                result.recordSuccessIfUnknown();
+            } catch (IndestructibilityViolationException e) {
+                indestructible.add(taskType.getOid());
+            }
+        }
+        return indestructible;
+    }
+
     @Override
     public void resumeTasks(Collection<String> taskOids, Task operationTask, OperationResult parentResult) throws SecurityViolationException, ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
         List<PrismObject<TaskType>> resolvedTasks = preprocessTaskCollectionOperation(taskOids, ModelAuthorizationAction.RESUME_TASK, AuditEventType.RESUME_TASK, operationTask, parentResult);