Merge pull request #16959 from ropalka/WFLY-18158

[WFLY-18158] Oracle JDBC Driver provided as deployment needs jdk.security.jgss module dependency to be configured

connector/src/main/java/org/jboss/as/connector/deployers/ds/DsDeploymentActivator.java

@@ -26,6 +26,7 @@
 import org.jboss.as.connector.deployers.datasource.DataSourceDefinitionDescriptorProcessor;
 import org.jboss.as.connector.deployers.ds.processors.DsXmlDeploymentInstallProcessor;
 import org.jboss.as.connector.deployers.ds.processors.DsXmlDeploymentParsingProcessor;
+import org.jboss.as.connector.deployers.ds.processors.JdbcDriverDeploymentProcessor;
 import org.jboss.as.connector.subsystems.datasources.DataSourcesExtension;
 import org.jboss.as.server.DeploymentProcessorTarget;
 import org.jboss.as.server.deployment.Phase;
@@ -41,7 +42,10 @@ public class DsDeploymentActivator {
     public void activateProcessors(final DeploymentProcessorTarget updateContext) {
         updateContext.addDeploymentProcessor(DataSourcesExtension.SUBSYSTEM_NAME, Phase.PARSE, Phase.PARSE_DSXML_DEPLOYMENT, new DsXmlDeploymentParsingProcessor());
         updateContext.addDeploymentProcessor(DataSourcesExtension.SUBSYSTEM_NAME, Phase.PARSE, Phase.PARSE_RESOURCE_DEF_ANNOTATION_DATA_SOURCE, new DataSourceDefinitionAnnotationProcessor());
+        // TODO: Replace below 'DEPENDENCIES_RAR_CONFIG + 1' with 'DEPENDENCIES_JDBC_DRIVER' once WFCORE-6408 fix is available via WildFly Core upgrade
+        updateContext.addDeploymentProcessor(DataSourcesExtension.SUBSYSTEM_NAME, Phase.DEPENDENCIES, Phase.DEPENDENCIES_RAR_CONFIG + 1, new JdbcDriverDeploymentProcessor());
         updateContext.addDeploymentProcessor(DataSourcesExtension.SUBSYSTEM_NAME, Phase.POST_MODULE, Phase.POST_MODULE_RESOURCE_DEF_XML_DATA_SOURCE, new DataSourceDefinitionDescriptorProcessor());
         updateContext.addDeploymentProcessor(DataSourcesExtension.SUBSYSTEM_NAME, Phase.FIRST_MODULE_USE, Phase.FIRST_MODULE_USE_DSXML_DEPLOYMENT, new DsXmlDeploymentInstallProcessor());
     }
+
 }

connector/src/main/java/org/jboss/as/connector/deployers/ds/processors/JdbcDriverDeploymentProcessor.java

@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2023, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.as.connector.deployers.ds.processors;
+
+import java.util.List;
+import java.util.Locale;
+
+import org.jboss.as.server.deployment.Attachments;
+import org.jboss.as.server.deployment.DeploymentPhaseContext;
+import org.jboss.as.server.deployment.DeploymentUnit;
+import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
+import org.jboss.as.server.deployment.DeploymentUnitProcessor;
+import org.jboss.as.server.deployment.DeploymentUtils;
+import org.jboss.as.server.deployment.module.ModuleDependency;
+import org.jboss.as.server.deployment.module.ModuleSpecification;
+import org.jboss.as.server.deployment.module.ResourceRoot;
+import org.jboss.modules.Module;
+import org.jboss.modules.ModuleLoader;
+import org.jboss.vfs.VirtualFile;
+
+/**
+ * Configures dependencies for JDBC driver deployments.
+ */
+public final class JdbcDriverDeploymentProcessor implements DeploymentUnitProcessor {
+
+    private static final String JAR_SUFFIX = ".jar";
+    private static final String JDBC_DRIVER_CONFIG_FILE = "META-INF/services/java.sql.Driver";
+    private static final String JDK_SECURITY_JGSS_ID = "jdk.security.jgss";
+
+    public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException {
+        final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
+        final String deploymentName = deploymentUnit.getName().toLowerCase(Locale.ENGLISH);
+        if (!deploymentName.endsWith(JAR_SUFFIX)) {
+            return;
+        }
+
+        final ModuleLoader moduleLoader = Module.getBootModuleLoader();
+        final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION);
+
+        boolean javaSqlDriverDetected = false;
+        final List<ResourceRoot> resourceRoots = DeploymentUtils.allResourceRoots(deploymentUnit);
+        for (ResourceRoot resourceRoot : resourceRoots) {
+            final VirtualFile deploymentRoot = resourceRoot.getRoot();
+            if (deploymentRoot.getChild(JDBC_DRIVER_CONFIG_FILE).exists())  {
+                javaSqlDriverDetected = true;
+                break;
+            }
+        }
+
+        if (javaSqlDriverDetected) {
+            moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, JDK_SECURITY_JGSS_ID, false, false, false, false));
+        }
+    }
+
+}