[WFCORE-7076] Check required installation metadata is present before …

…registering installation-manager subsystem
wildfly · Nov 29, 2024 · 857f3a3 · 857f3a3
1 parent 04627bd
commit 857f3a3
Show file tree

Hide file tree

Showing 21 changed files with 304 additions and 80 deletions.
diff --git a/controller/src/main/java/org/jboss/as/controller/AbstractControllerService.java b/controller/src/main/java/org/jboss/as/controller/AbstractControllerService.java
@@ -177,6 +177,7 @@ private static int getBootStackSize() {
     private final CapabilityRegistry capabilityRegistry;
     private final ConfigurationExtension configExtension;
     private volatile ModelControllerClientFactory clientFactory;
+    protected final Supplier<PathManager> pathManagerSupplier;
 
     /**
      * Construct a new instance.
@@ -200,7 +201,7 @@ protected AbstractControllerService(final ProcessType processType, final Running
                                         final ManagedAuditLogger auditLogger, final DelegatingConfigurableAuthorizer authorizer,
                                         final ManagementSecurityIdentitySupplier securityIdentitySupplier, final CapabilityRegistry capabilityRegistry) {
         this(null, null, processType, Stability.DEFAULT, runningModeControl, configurationPersister, processState, rootResourceDefinition, null,
-                prepareStep, expressionResolver, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, null);
+                prepareStep, expressionResolver, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, null, null);
     }
 
     /**
@@ -229,7 +230,7 @@ protected AbstractControllerService(final Supplier<ExecutorService> executorServ
                                         final ManagementSecurityIdentitySupplier securityIdentitySupplier,
                                         final CapabilityRegistry capabilityRegistry, final ConfigurationExtension configExtension) {
         this(executorService, instabilityListener, processType, Stability.DEFAULT, runningModeControl, configurationPersister, processState, rootResourceDefinition, null,
-                prepareStep, expressionResolver, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, configExtension);
+                prepareStep, expressionResolver, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, configExtension, null);
     }
 
     /**
@@ -247,6 +248,7 @@ protected AbstractControllerService(final Supplier<ExecutorService> executorServ
      * @param authorizer              handles authorization
      * @param capabilityRegistry      the capability registry
      */
+    @Deprecated
     protected AbstractControllerService(final Supplier<ExecutorService> executorService,
                                         final Supplier<ControllerInstabilityListener> instabilityListener,
                                         final ProcessType processType, Stability stability, final RunningModeControl runningModeControl,
@@ -257,7 +259,36 @@ protected AbstractControllerService(final Supplier<ExecutorService> executorServ
                                         final ManagementSecurityIdentitySupplier securityIdentitySupplier,
                                         final CapabilityRegistry capabilityRegistry, final ConfigurationExtension configExtension) {
         this(executorService, instabilityListener, processType, stability, runningModeControl, configurationPersister, processState, rootResourceDefinition, null,
-                prepareStep, expressionResolver, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, configExtension);
+                prepareStep, expressionResolver, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, configExtension, null);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param processType             the type of process being controlled
+     * @param stability               the stability level of the controlled process
+     * @param runningModeControl      the controller of the process' running mode
+     * @param configurationPersister  the configuration persister
+     * @param processState            the controlled process state
+     * @param rootResourceDefinition  the root resource definition
+     * @param prepareStep             the prepare step to prepend to operation execution
+     * @param expressionResolver      the expression resolver
+     * @param auditLogger             the audit logger
+     * @param authorizer              handles authorization
+     * @param capabilityRegistry      the capability registry
+     */
+    protected AbstractControllerService(final Supplier<ExecutorService> executorService,
+                                        final Supplier<ControllerInstabilityListener> instabilityListener,
+                                        final ProcessType processType, Stability stability, final RunningModeControl runningModeControl,
+                                        final ConfigurationPersister configurationPersister,
+                                        final ControlledProcessState processState, final ResourceDefinition rootResourceDefinition,
+                                        final OperationStepHandler prepareStep, final ExpressionResolver expressionResolver,
+                                        final ManagedAuditLogger auditLogger, final DelegatingConfigurableAuthorizer authorizer,
+                                        final ManagementSecurityIdentitySupplier securityIdentitySupplier,
+                                        final CapabilityRegistry capabilityRegistry, final ConfigurationExtension configExtension,
+                                        final Supplier<PathManager> pathManagerSupplier) {
+        this(executorService, instabilityListener, processType, stability, runningModeControl, configurationPersister, processState, rootResourceDefinition, null,
+                prepareStep, expressionResolver, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, configExtension, pathManagerSupplier);
     }
 
     private AbstractControllerService(final Supplier<ExecutorService> executorService,
@@ -267,7 +298,8 @@ private AbstractControllerService(final Supplier<ExecutorService> executorServic
                                       final ResourceDefinition rootResourceDefinition, final DescriptionProvider rootDescriptionProvider,
                                       final OperationStepHandler prepareStep, final ExpressionResolver expressionResolver, final ManagedAuditLogger auditLogger,
                                       final DelegatingConfigurableAuthorizer authorizer, final ManagementSecurityIdentitySupplier securityIdentitySupplier,
-                                      final CapabilityRegistry capabilityRegistry, final ConfigurationExtension configExtension) {
+                                      final CapabilityRegistry capabilityRegistry, final ConfigurationExtension configExtension,
+                                      final Supplier<PathManager> pathManagerSupplier) {
         assert rootDescriptionProvider == null : "description provider cannot be used anymore";
         assert rootResourceDefinition != null : "Null root resource definition";
         assert expressionResolver != null : "Null expressionResolver";
@@ -276,6 +308,7 @@ private AbstractControllerService(final Supplier<ExecutorService> executorServic
         assert securityIdentitySupplier != null : "Null securityIdentitySupplier";
         assert capabilityRegistry != null : "Null capabilityRegistry";
         assert stability != null : "Null stability";
+        assert pathManagerSupplier != null;
         this.executorService = executorService;
         this.instabilityListener = instabilityListener;
         this.processType = processType;
@@ -292,6 +325,7 @@ private AbstractControllerService(final Supplier<ExecutorService> executorServic
         this.bootErrorCollector = new BootErrorCollector();
         this.capabilityRegistry = capabilityRegistry.createShadowCopy(); //create shadow copy of proper registry so changes can only be visible by .publish()
         this.configExtension = configExtension;
+        this.pathManagerSupplier = pathManagerSupplier;
     }
 
     @Override
@@ -698,10 +732,10 @@ public void execute(OperationContext context, ModelNode operation) throws Operat
                     assert !processType.isHostController() || hostName != null;
                     for (ModelControllerServiceInitialization init : sl) {
                         if (processType.isHostController()) {
-                            init.initializeHost(context.getServiceTarget(), managementModel, hostName, processType);
+                            init.initializeHost(context.getServiceTarget(), managementModel, hostName, processType, pathManagerSupplier.get());
                             init.initializeDomain(context.getServiceTarget(), managementModel);
                         } else {
-                            init.initializeStandalone(context.getServiceTarget(), managementModel, processType);
+                            init.initializeStandalone(context.getServiceTarget(), managementModel, processType, pathManagerSupplier.get());
 
                         }
                     }

diff --git a/controller/src/main/java/org/jboss/as/controller/ModelControllerServiceInitialization.java b/controller/src/main/java/org/jboss/as/controller/ModelControllerServiceInitialization.java
@@ -5,6 +5,7 @@
 
 package org.jboss.as.controller;
 
+import org.jboss.as.controller.services.path.PathManager;
 import org.jboss.msc.service.ServiceTarget;
 
 /**
@@ -20,8 +21,9 @@ public interface ModelControllerServiceInitialization {
      * @param target the service target
      * @param managementModel the management model
      * @param processType The ProcessType used to identify what type of server we are running in.
+     * @param pathManager The PathManager for the running server
      */
-    void initializeStandalone(ServiceTarget target, ManagementModel managementModel, ProcessType processType);
+    void initializeStandalone(ServiceTarget target, ManagementModel managementModel, ProcessType processType, PathManager pathManager);
 
     /**
      * Initialize the domain controller.
@@ -37,7 +39,8 @@ public interface ModelControllerServiceInitialization {
      * @param managementModel the management model
      * @param hostName the name of the host
      * @param processType The ProcessType that to identify what type of server we are running in.
+     * @param pathManager The PathManager for the running server
      */
-    void initializeHost(ServiceTarget target, ManagementModel managementModel, String hostName, ProcessType processType);
+    void initializeHost(ServiceTarget target, ManagementModel managementModel, String hostName, ProcessType processType, PathManager pathManager);
 
 }
diff --git a/controller/src/test/java/org/jboss/as/controller/TestModelControllerService.java b/controller/src/test/java/org/jboss/as/controller/TestModelControllerService.java
@@ -20,6 +20,8 @@
 import org.jboss.as.controller.persistence.ConfigurationExtension;
 import org.jboss.as.controller.persistence.ConfigurationPersister;
 import org.jboss.as.controller.persistence.NullConfigurationPersister;
+import org.jboss.as.controller.services.path.PathManager;
+import org.jboss.as.controller.services.path.PathManagerService;
 import org.jboss.as.version.Stability;
 import org.jboss.msc.service.StartContext;
 import org.jboss.msc.service.StartException;
@@ -31,6 +33,8 @@
  */
 public abstract class TestModelControllerService extends AbstractControllerService {
 
+    protected static final Supplier<PathManager> DEFAULT_PATH_MANAGER = () -> new PathManagerService() {
+    };
     private final ControlledProcessState processState;
     final AtomicBoolean state = new AtomicBoolean(true);
     private final CountDownLatch latch = new CountDownLatch(2);
@@ -74,7 +78,7 @@ protected TestModelControllerService(final ProcessType processType, final Runnin
                                          final ConfigurationPersister configurationPersister, final ControlledProcessState processState,
                                          final ResourceDefinition rootResourceDefinition, final CapabilityRegistry capabilityRegistry, final ConfigurationExtension configExtension) {
         super(executorService, null, processType, Stability.DEFAULT, runningModeControl, configurationPersister, processState, rootResourceDefinition, null, ExpressionResolver.TEST_RESOLVER,
-                AuditLogger.NO_OP_LOGGER, new DelegatingConfigurableAuthorizer(), new ManagementSecurityIdentitySupplier(), capabilityRegistry, configExtension);
+                AuditLogger.NO_OP_LOGGER, new DelegatingConfigurableAuthorizer(), new ManagementSecurityIdentitySupplier(), capabilityRegistry, configExtension, DEFAULT_PATH_MANAGER);
         this.processState = processState;
         this.capabilityRegistry = capabilityRegistry;
     }

diff --git a/...p/interface/src/test/java/org/jboss/as/domain/http/server/TestModelControllerService.java b/...p/interface/src/test/java/org/jboss/as/domain/http/server/TestModelControllerService.java
@@ -25,6 +25,8 @@
 import org.jboss.as.controller.audit.AuditLogger;
 import org.jboss.as.controller.descriptions.NonResolvingResourceDescriptionResolver;
 import org.jboss.as.controller.persistence.ConfigurationPersister;
+import org.jboss.as.controller.services.path.PathManager;
+import org.jboss.as.controller.services.path.PathManagerService;
 import org.jboss.as.version.Stability;
 import org.jboss.msc.service.StartContext;
 import org.jboss.msc.service.StartException;
@@ -35,6 +37,8 @@
  * @author <a href="mailto:[email protected]">Yeray Borges</a>
  */
 public abstract class TestModelControllerService extends AbstractControllerService {
+    protected static final Supplier<PathManager> DEFAULT_PATH_MANAGER = () -> new PathManagerService() {
+    };
     private final CountDownLatch latch = new CountDownLatch(2);
     private final CapabilityRegistry capabilityRegistry;
 
@@ -56,7 +60,7 @@ protected TestModelControllerService(final ProcessType processType, Stability st
                                          final ConfigurationPersister configurationPersister, final ControlledProcessState processState,
                                          final ResourceDefinition rootResourceDefinition, final CapabilityRegistry capabilityRegistry) {
         super(executorService, null, processType, stability, runningModeControl, configurationPersister, processState, rootResourceDefinition, null, ExpressionResolver.TEST_RESOLVER,
-                AuditLogger.NO_OP_LOGGER, new DelegatingConfigurableAuthorizer(), new ManagementSecurityIdentitySupplier(), capabilityRegistry, null);
+                AuditLogger.NO_OP_LOGGER, new DelegatingConfigurableAuthorizer(), new ManagementSecurityIdentitySupplier(), capabilityRegistry, null, DEFAULT_PATH_MANAGER);
         this.capabilityRegistry = capabilityRegistry;
     }
 

diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/DomainModelControllerService.java b/host-controller/src/main/java/org/jboss/as/host/controller/DomainModelControllerService.java
@@ -118,6 +118,7 @@
 import org.jboss.as.controller.registry.ResourceProvider;
 import org.jboss.as.controller.remote.AbstractModelControllerOperationHandlerFactoryService;
 import org.jboss.as.controller.remote.ModelControllerOperationHandlerFactory;
+import org.jboss.as.controller.services.path.PathManager;
 import org.jboss.as.controller.services.path.PathManagerService;
 import org.jboss.as.controller.transform.Transformers;
 import org.jboss.as.domain.controller.DomainController;
@@ -287,13 +288,14 @@ static void addService(final ServiceTarget serviceTarget,
 
         final ServiceBuilder<?> sb = serviceTarget.addService(SERVICE_NAME);
         final Supplier<ExecutorService> esSupplier = sb.requires(HC_EXECUTOR_SERVICE_NAME);
+        final Supplier<PathManager> pathManagerSupplier = sb.requires(PATH_MANAGER_CAPABILITY.getCapabilityServiceName());
         final DomainModelControllerService service = new DomainModelControllerService(esSupplier, environment, runningModeControl, processState,
                 hostControllerInfo, contentRepository, hostProxies, serverProxies, prepareStepHandler,
                 ignoredRegistry, bootstrapListener, pathManager, expressionResolver, new DomainDelegatingResourceDefinition(),
-                hostExtensionRegistry, extensionRegistry, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, domainHostExcludeRegistry);
+                hostExtensionRegistry, extensionRegistry, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, domainHostExcludeRegistry,
+                pathManagerSupplier);
         sb.setInstance(service);
         sb.addDependency(ProcessControllerConnectionService.SERVICE_NAME, ProcessControllerConnectionService.class, service.injectedProcessControllerConnection);
-        sb.requires(PATH_MANAGER_CAPABILITY.getCapabilityServiceName()); // ensure this is up
         service.consoleAvailabilitySupplier = sb.requires(CONSOLE_AVAILABILITY_CAPABILITY.getCapabilityServiceName());
         sb.install();
 
@@ -321,9 +323,10 @@ private DomainModelControllerService(final Supplier<ExecutorService> executorSer
                                          final DelegatingConfigurableAuthorizer authorizer,
                                          final ManagementSecurityIdentitySupplier securityIdentitySupplier,
                                          final CapabilityRegistry capabilityRegistry,
-                                         final DomainHostExcludeRegistry domainHostExcludeRegistry) {
+                                         final DomainHostExcludeRegistry domainHostExcludeRegistry,
+                                         final Supplier<PathManager> pathManagerSupplier) {
         super(executorService, null, environment.getProcessType(), environment.getStability(), runningModeControl, null, processState,
-                rootResourceDefinition, prepareStepHandler, expressionResolver, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, null);
+                rootResourceDefinition, prepareStepHandler, expressionResolver, auditLogger, authorizer, securityIdentitySupplier, capabilityRegistry, null, pathManagerSupplier);
         this.environment = environment;
         this.runningModeControl = runningModeControl;
         this.processState = processState;

diff --git a/...ontroller/src/test/java/org/jboss/as/host/controller/util/TestModelControllerService.java b/...ontroller/src/test/java/org/jboss/as/host/controller/util/TestModelControllerService.java
@@ -31,8 +31,10 @@
 import org.jboss.as.controller.persistence.ConfigurationPersister;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
 import org.jboss.as.controller.registry.Resource;
+import org.jboss.as.controller.services.path.PathManagerService;
 import org.jboss.as.domain.controller.operations.ApplyExtensionsHandler;
 import org.jboss.as.host.controller.mgmt.HostControllerRegistrationHandler;
+import org.jboss.as.version.Stability;
 import org.jboss.dmr.ModelNode;
 import org.jboss.msc.service.StartContext;
 import org.jboss.msc.service.StartException;
@@ -55,8 +57,10 @@ protected TestModelControllerService(final ProcessType processType, final Config
                                          final ResourceDefinition rootResourceDefinition, final ManagedAuditLogger auditLogger,
                                          final AbstractControllerTestBase.DelegatingResourceDefinitionInitializer initializer,
                                          final CapabilityRegistry capabilityRegistry) {
-        super(processType, new RunningModeControl(RunningMode.NORMAL), configurationPersister, processState, rootResourceDefinition,
-                null, ExpressionResolver.TEST_RESOLVER, auditLogger, new DelegatingConfigurableAuthorizer(), new ManagementSecurityIdentitySupplier(), capabilityRegistry);
+        super(null, null, processType, Stability.DEFAULT, new RunningModeControl(RunningMode.NORMAL),
+                configurationPersister, processState, rootResourceDefinition, null, ExpressionResolver.TEST_RESOLVER,
+                auditLogger, new DelegatingConfigurableAuthorizer(), new ManagementSecurityIdentitySupplier(),
+                capabilityRegistry, null, ()->new PathManagerService() {});
         this.processState = processState;
         internalExecutor = new InternalExecutor();
         this.initializer = initializer;