[SYNCOPE-1998] Fixing PropagationTaskCallable generation

Author: ilgrosso

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/implementations/MyPropagationActions.groovy

@@ -22,7 +22,7 @@ import org.apache.syncope.common.lib.to.OrgUnit
 import org.apache.syncope.common.lib.to.Provision
 import org.apache.syncope.core.persistence.api.entity.task.TaskExec
 import org.apache.syncope.core.provisioning.api.propagation.PropagationActions
-import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskInfo;
+import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskInfo
 import org.identityconnectors.framework.common.objects.ConnectorObject
 
 class MyPropagationActions implements PropagationActions {

core/idm/logic/src/test/java/org/apache/syncope/core/logic/IdMLogicTestContext.java

@@ -36,6 +36,7 @@
 import org.apache.syncope.core.persistence.jpa.StartupDomainLoader;
 import org.apache.syncope.core.provisioning.api.ImplementationLookup;
 import org.apache.syncope.core.provisioning.java.ProvisioningContext;
+import org.apache.syncope.core.spring.security.AuthDataAccessor;
 import org.apache.syncope.core.spring.security.SecurityContext;
 import org.apache.syncope.core.workflow.java.WorkflowContext;
 import org.springframework.boot.logging.LoggingSystem;
@@ -105,4 +106,9 @@ public ServiceOps serviceOps() {
     public CacheManager cacheManager() {
         return Caching.getCachingProvider().getCacheManager();
     }
+
+    @Bean
+    public AuthDataAccessor authDataAccessor() {
+        return mock(AuthDataAccessor.class);
+    }
 }

core/idrepo/logic/src/test/java/org/apache/syncope/core/logic/IdRepoLogicTestContext.java

@@ -36,6 +36,7 @@
 import org.apache.syncope.core.persistence.jpa.StartupDomainLoader;
 import org.apache.syncope.core.provisioning.api.ImplementationLookup;
 import org.apache.syncope.core.provisioning.java.ProvisioningContext;
+import org.apache.syncope.core.spring.security.AuthDataAccessor;
 import org.apache.syncope.core.spring.security.SecurityContext;
 import org.apache.syncope.core.workflow.java.WorkflowContext;
 import org.springframework.boot.logging.LoggingSystem;
@@ -104,4 +105,9 @@ public ServiceOps serviceOps() {
     public CacheManager cacheManager() {
         return Caching.getCachingProvider().getCacheManager();
     }
+
+    @Bean
+    public AuthDataAccessor authDataAccessor() {
+        return mock(AuthDataAccessor.class);
+    }
 }

core/metrics-starter/src/main/java/org/apache/syncope/core/provisioning/java/propagation/InstrumentedPriorityPropagationTaskExecutor.java

@@ -35,6 +35,7 @@
 import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskInfo;
 import org.apache.syncope.core.provisioning.java.pushpull.OutboundMatcher;
 import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
+import org.apache.syncope.core.spring.security.AuthDataAccessor;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.core.task.AsyncTaskExecutor;
 
@@ -56,12 +57,13 @@ public InstrumentedPriorityPropagationTaskExecutor(
             final OutboundMatcher outboundMatcher,
             final PlainAttrValidationManager validator,
             final ApplicationEventPublisher publisher,
+            final AuthDataAccessor authDataAccessor,
             final AsyncTaskExecutor taskExecutor,
             final MeterRegistry meterRegistry) {
 
         super(connectorManager, connObjectUtils, taskDAO, resourceDAO, plainSchemaDAO, notificationManager,
                 auditManager, taskDataBinder, anyUtilsFactory, taskUtilsFactory, outboundMatcher, validator, publisher,
-                taskExecutor);
+                authDataAccessor, taskExecutor);
         this.meterRegistry = meterRegistry;
     }
 

core/metrics-starter/src/main/java/org/apache/syncope/core/starter/MetricsContext.java

@@ -138,6 +138,7 @@ public PropagationTaskExecutor propagationTaskExecutor(
             final OutboundMatcher outboundMatcher,
             final PlainAttrValidationManager validator,
             final ApplicationEventPublisher publisher,
+            final AuthDataAccessor authDataAccessor,            
             final MeterRegistry meterRegistry) {
 
         return new InstrumentedPriorityPropagationTaskExecutor(
@@ -154,6 +155,7 @@ public PropagationTaskExecutor propagationTaskExecutor(
                 outboundMatcher,
                 validator,
                 publisher,
+                authDataAccessor,
                 propagationTaskExecutorAsyncExecutor,
                 meterRegistry);
     }

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java

@@ -115,7 +115,7 @@ public ProvisioningResult<UserUR> update(
                 AnyTypeKind.USER,
                 userUR.getKey(),
                 Optional.ofNullable(userUR.getPassword()).map(PasswordPatch::getValue).orElse(null),
-                userUR.getPassword() == null ? List.of() : userUR.getPassword().getResources(),
+                Optional.ofNullable(userUR.getPassword()).map(PasswordPatch::getResources).orElseGet(() -> List.of()),
                 null,
                 Set.of());
 
@@ -155,7 +155,7 @@ public ProvisioningResult<UserUR> update(
                 AnyTypeKind.USER,
                 userUR.getKey(),
                 Optional.ofNullable(userUR.getPassword()).map(PasswordPatch::getValue).orElse(null),
-                userUR.getPassword() == null ? List.of() : userUR.getPassword().getResources(),
+                Optional.ofNullable(userUR.getPassword()).map(PasswordPatch::getResources).orElseGet(() -> List.of()),
                 enabled,
                 excludedResources);
 
@@ -364,8 +364,8 @@ public List<PropagationStatus> deprovision(
         userDAO.findLinkedAccounts(key).stream().
                 filter(account -> resources.contains(account.getResource().getKey())).
                 forEach(account -> propByLinkedAccount.add(
-                ResourceOperation.DELETE,
-                Pair.of(account.getResource().getKey(), account.getConnObjectKeyValue())));
+                        ResourceOperation.DELETE,
+                        Pair.of(account.getResource().getKey(), account.getConnObjectKeyValue())));
 
         List<PropagationTaskInfo> taskInfos = propagationManager.getDeleteTasks(
                 AnyTypeKind.USER,

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java

@@ -161,6 +161,7 @@
 import org.apache.syncope.core.provisioning.java.pushpull.LiveSyncTaskSaver;
 import org.apache.syncope.core.provisioning.java.pushpull.OutboundMatcher;
 import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
+import org.apache.syncope.core.spring.security.AuthDataAccessor;
 import org.apache.syncope.core.spring.security.DefaultCredentialChecker;
 import org.apache.syncope.core.spring.security.PasswordGenerator;
 import org.apache.syncope.core.spring.security.SecurityProperties;
@@ -497,6 +498,7 @@ public PropagationTaskExecutor propagationTaskExecutor(
             final TaskDataBinder taskDataBinder,
             final OutboundMatcher outboundMatcher,
             final PlainAttrValidationManager validator,
+            final AuthDataAccessor authDataAccessor,
             final ApplicationEventPublisher publisher) {
 
         return new PriorityPropagationTaskExecutor(
@@ -513,6 +515,7 @@ public PropagationTaskExecutor propagationTaskExecutor(
                 outboundMatcher,
                 validator,
                 publisher,
+                authDataAccessor,
                 propagationTaskExecutorAsyncExecutor);
     }
 

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java

@@ -23,6 +23,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletionService;
 import java.util.concurrent.ExecutorCompletionService;
@@ -47,6 +48,8 @@
 import org.apache.syncope.core.provisioning.java.pushpull.OutboundMatcher;
 import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
 import org.apache.syncope.core.spring.security.AuthContextUtils;
+import org.apache.syncope.core.spring.security.AuthDataAccessor;
+import org.apache.syncope.core.spring.security.SyncopeGrantedAuthority;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.core.task.AsyncTaskExecutor;
 
@@ -59,6 +62,8 @@
  */
 public class PriorityPropagationTaskExecutor extends AbstractPropagationTaskExecutor {
 
+    protected final AuthDataAccessor authDataAccessor;
+
     protected final AsyncTaskExecutor taskExecutor;
 
     public PriorityPropagationTaskExecutor(
@@ -75,6 +80,7 @@ public PriorityPropagationTaskExecutor(
             final OutboundMatcher outboundMatcher,
             final PlainAttrValidationManager validator,
             final ApplicationEventPublisher publisher,
+            final AuthDataAccessor authDataAccessor,
             final AsyncTaskExecutor taskExecutor) {
 
         super(connectorManager,
@@ -90,33 +96,56 @@ public PriorityPropagationTaskExecutor(
                 outboundMatcher,
                 validator,
                 publisher);
+        this.authDataAccessor = authDataAccessor;
         this.taskExecutor = taskExecutor;
     }
 
     /**
-     * Creates new instances of {@link Callable} for usage with{@link java.util.concurrent.CompletionService}.
+     * Creates new instances of {@link Callable} for synchronous invocation.
      *
      * @param taskInfo to be executed
      * @param reporter to report propagation execution status
      * @param executor user that triggered the propagation execution
-     * @return new {@link Callable} instance for usage with {@link java.util.concurrent.CompletionService}
+     * @return new {@link Callable} instance for synchronous invocation
      */
     protected Callable<TaskExec<PropagationTask>> newPropagationTaskCallable(
-            final PropagationTaskInfo taskInfo, final PropagationReporter reporter, final String executor) {
+            final PropagationTaskInfo taskInfo,
+            final PropagationReporter reporter,
+            final String executor) {
 
-        return () -> AuthContextUtils.callAs(
-                AuthContextUtils.getDomain(),
-                executor,
-                AuthContextUtils.getAuthorities(),
-                () -> {
-                    LOG.debug("Execution started for {}", taskInfo);
+        return () -> {
+            LOG.debug("Execution started for {}", taskInfo);
 
-                    TaskExec<PropagationTask> execution = this.execute(taskInfo, reporter, executor);
+            TaskExec<PropagationTask> execution = this.execute(taskInfo, reporter, executor);
 
-                    LOG.debug("Execution completed for {} with results {}", taskInfo, execution);
+            LOG.debug("Execution completed for {} with results {}", taskInfo, execution);
 
-                    return execution;
-                });
+            return execution;
+        };
+    }
+
+    /**
+     * Creates new instances of {@link Callable} for usage with{@link CompletionService}.
+     *
+     * @param taskInfo to be executed
+     * @param reporter to report propagation execution status
+     * @param domain executor's domain
+     * @param executor user that triggered the propagation execution
+     * @param authorities executor's authorities
+     * @return new {@link Callable} instance for usage with {@link CompletionService}
+     */
+    protected Callable<TaskExec<PropagationTask>> newPropagationTaskCallable(
+            final PropagationTaskInfo taskInfo,
+            final PropagationReporter reporter,
+            final String domain,
+            final String executor,
+            final Set<SyncopeGrantedAuthority> authorities) {
+
+        return () -> AuthContextUtils.callAs(
+                domain,
+                executor,
+                authorities,
+                newPropagationTaskCallable(taskInfo, reporter, executor));
     }
 
     protected boolean failed(
@@ -173,8 +202,12 @@ public PropagationReporter execute(
                 List<Future<TaskExec<PropagationTask>>> futures = new ArrayList<>();
 
                 concurrentTasks.forEach(taskInfo -> {
+                    String domain = AuthContextUtils.getDomain();
+                    Set<SyncopeGrantedAuthority> authorities = authDataAccessor.getAuthorities(executor, null);
+
                     try {
-                        futures.add(completionService.submit(newPropagationTaskCallable(taskInfo, reporter, executor)));
+                        futures.add(completionService.submit(
+                                newPropagationTaskCallable(taskInfo, reporter, domain, executor, authorities)));
 
                         if (nullPriorityAsync) {
                             reporter.onSuccessOrNonPriorityResourceFailures(

core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/ProvisioningTestContext.java

@@ -34,6 +34,7 @@
 import org.apache.syncope.core.persistence.jpa.PersistenceContext;
 import org.apache.syncope.core.persistence.jpa.StartupDomainLoader;
 import org.apache.syncope.core.provisioning.api.ImplementationLookup;
+import org.apache.syncope.core.spring.security.AuthDataAccessor;
 import org.apache.syncope.core.spring.security.SecurityContext;
 import org.apache.syncope.core.workflow.java.WorkflowContext;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -90,4 +91,9 @@ public ConfParamOps confParamOps() {
     public DomainOps domainOps(final DomainRegistry<JPADomain> domainRegistry) {
         return new DummyDomainOps(domainRegistry);
     }
+
+    @Bean
+    public AuthDataAccessor authDataAccessor() {
+        return mock(AuthDataAccessor.class);
+    }
 }

src/main/asciidoc/getting-started/systemRequirements.adoc

@@ -38,7 +38,7 @@ Apache Syncope {docVersion} is verified with the following Jakarta EE containers
 
  . https://tomcat.apache.org/download-10.cgi[Apache Tomcat 10^]
  . https://www.payara.fish/[Payara Server 6^]
- . https://www.wildfly.org/[Wildfly 40^]
+ . https://www.wildfly.org/[Wildfly 41^]
 
 === Internal Storage