Merge remote-tracking branch 'DSpace_github/main' into w2p-108055_isC…

…losed-config-ignored-fix
atmire · Nov 9, 2023 · 2b08640 · 2b08640
2 parents d800d80 + 2298701
commit 2b08640
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 47 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
@@ -494,6 +494,8 @@ protected String getDNOfUser(String adminUser, String adminPassword, Context con
                 try {
                     SearchControls ctrls = new SearchControls();
                     ctrls.setSearchScope(ldap_search_scope_value);
+                    // Fetch both user attributes '*' (eg. uid, cn) and operational attributes '+' (eg. memberOf)
+                    ctrls.setReturningAttributes(new String[] {"*", "+"});
 
                     String searchName;
                     if (useTLS) {
@@ -700,13 +702,13 @@ public String getName() {
     /*
      * Add authenticated users to the group defined in dspace.cfg by
      * the authentication-ldap.login.groupmap.* key.
-     * 
+     *
      * @param dn
      *  The string containing distinguished name of the user
-     * 
+     *
      * @param group
      *  List of strings with LDAP dn of groups
-     * 
+     *
      * @param context
      *  DSpace context
      */

diff --git a/dspace-api/src/main/java/org/dspace/curate/Curation.java b/dspace-api/src/main/java/org/dspace/curate/Curation.java
@@ -152,17 +152,10 @@ private long runQueue(TaskQueue queue, Curator curator) throws SQLException, Aut
                 super.handler.logInfo("Curating id: " + entry.getObjectId());
             }
             curator.clear();
-            // does entry relate to a DSO or workflow object?
-            if (entry.getObjectId().indexOf('/') > 0) {
-                for (String taskName : entry.getTaskNames()) {
-                    curator.addTask(taskName);
-                }
-                curator.curate(context, entry.getObjectId());
-            } else {
-                // TODO: Remove this exception once curation tasks are supported by configurable workflow
-                // e.g. see https://github.com/DSpace/DSpace/pull/3157
-                throw new IllegalArgumentException("curation for workflow items is no longer supported");
+            for (String taskName : entry.getTaskNames()) {
+                curator.addTask(taskName);
             }
+            curator.curate(context, entry.getObjectId());
         }
         queue.release(this.queue, ticket, true);
         return ticket;

diff --git a/dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java b/dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java
@@ -13,6 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
@@ -139,40 +140,47 @@ public boolean curate(Curator curator, Context c, XmlWorkflowItem wfi)
             item.setOwningCollection(wfi.getCollection());
             for (Task task : step.tasks) {
                 curator.addTask(task.name);
-                curator.curate(c, item);
-                int status = curator.getStatus(task.name);
-                String result = curator.getResult(task.name);
-                String action = "none";
-                switch (status) {
-                    case Curator.CURATE_FAIL:
-                        // task failed - notify any contacts the task has assigned
-                        if (task.powers.contains("reject")) {
-                            action = "reject";
-                        }
-                        notifyContacts(c, wfi, task, "fail", action, result);
-                        // if task so empowered, reject submission and terminate
-                        if ("reject".equals(action)) {
-                            workflowService.sendWorkflowItemBackSubmission(c, wfi,
-                                    c.getCurrentUser(), null,
-                                    task.name + ": " + result);
-                            return false;
-                        }
-                        break;
-                    case Curator.CURATE_SUCCESS:
-                        if (task.powers.contains("approve")) {
-                            action = "approve";
-                        }
-                        notifyContacts(c, wfi, task, "success", action, result);
-                        if ("approve".equals(action)) {
-                            // cease further task processing and advance submission
-                            return true;
-                        }
-                        break;
-                    case Curator.CURATE_ERROR:
-                        notifyContacts(c, wfi, task, "error", action, result);
-                        break;
-                    default:
-                        break;
+                // Check whether the task is configured to be queued rather than automatically run
+                if (StringUtils.isNotEmpty(step.queue)) {
+                    // queue attribute has been set in the FlowStep configuration: add task to configured queue
+                    curator.queue(c, item.getID().toString(), step.queue);
+                } else {
+                    // Task is configured to be run automatically
+                    curator.curate(c, item);
+                    int status = curator.getStatus(task.name);
+                    String result = curator.getResult(task.name);
+                    String action = "none";
+                    switch (status) {
+                        case Curator.CURATE_FAIL:
+                            // task failed - notify any contacts the task has assigned
+                            if (task.powers.contains("reject")) {
+                                action = "reject";
+                            }
+                            notifyContacts(c, wfi, task, "fail", action, result);
+                            // if task so empowered, reject submission and terminate
+                            if ("reject".equals(action)) {
+                                workflowService.sendWorkflowItemBackSubmission(c, wfi,
+                                        c.getCurrentUser(), null,
+                                        task.name + ": " + result);
+                                return false;
+                            }
+                            break;
+                        case Curator.CURATE_SUCCESS:
+                            if (task.powers.contains("approve")) {
+                                action = "approve";
+                            }
+                            notifyContacts(c, wfi, task, "success", action, result);
+                            if ("approve".equals(action)) {
+                                // cease further task processing and advance submission
+                                return true;
+                            }
+                            break;
+                        case Curator.CURATE_ERROR:
+                            notifyContacts(c, wfi, task, "error", action, result);
+                            break;
+                        default:
+                            break;
+                    }
                 }
                 curator.clear();
             }