[WFLY-10282] In addition to the presence of the security subsystem ta…

…ke into account if the security domain is mapped to an Elytron capability.
wildfly · Apr 23, 2018 · 31ad4dd · 31ad4dd
1 parent 094d875
commit 31ad4dd
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/.../src/main/java/org/wildfly/extension/undertow/deployment/UndertowDeploymentProcessor.java b/.../src/main/java/org/wildfly/extension/undertow/deployment/UndertowDeploymentProcessor.java
@@ -261,21 +261,14 @@ private void processDeployment(final WarMetaData warMetaData, final DeploymentUn
 
         boolean securityEnabled = deploymentUnit.hasAttachment(SecurityAttachments.SECURITY_ENABLED);
 
-        String metaDataSecurityDomain = metaData.getSecurityDomain();
+        String tempSecurityDomain = metaData.getSecurityDomain();
-        if (metaDataSecurityDomain == null) {
+        if (tempSecurityDomain == null) {
-            metaDataSecurityDomain = getJBossAppSecurityDomain(deploymentUnit);
+            tempSecurityDomain = getJBossAppSecurityDomain(deploymentUnit);
-        }
-        if (metaDataSecurityDomain != null) {
-            metaDataSecurityDomain = metaDataSecurityDomain.trim();
         }
+        tempSecurityDomain = tempSecurityDomain == null ? defaultSecurityDomain : SecurityUtil.unprefixSecurityDomain(tempSecurityDomain);
+        boolean known = tempSecurityDomain != null && knownSecurityDomain.test(tempSecurityDomain);
 
-        final String securityDomain;
+        final String securityDomain = (securityEnabled || known) ? tempSecurityDomain : null;
-        if(securityEnabled) {
-            securityDomain = metaDataSecurityDomain == null ? defaultSecurityDomain : SecurityUtil
-                    .unprefixSecurityDomain(metaDataSecurityDomain);
-        } else {
-            securityDomain = null;
-        }
 
         final Set<ServiceName> additionalDependencies = new HashSet<>();
         for (final SetupAction setupAction : setupActions) {
@@ -345,7 +338,7 @@ private void processDeployment(final WarMetaData warMetaData, final DeploymentUn
                 .addDependency(SuspendController.SERVICE_NAME, SuspendController.class, undertowDeploymentInfoService.getSuspendControllerInjectedValue())
                 .addDependencies(additionalDependencies);
         if(securityDomain != null) {
-            if (knownSecurityDomain.test(securityDomain)) {
+            if (known) {
                 infoBuilder.addDependency(
                         deploymentUnit.getAttachment(Attachments.CAPABILITY_SERVICE_SUPPORT)
                                 .getCapabilityServiceName(
@@ -529,7 +522,7 @@ private String getJBossAppSecurityDomain(final DeploymentUnit deploymentUnit) {
                 securityDomain = ((JBossAppMetaData) jbossAppMetaData).getSecurityDomain();
             }
         }
-        return securityDomain;
+        return securityDomain != null ? securityDomain.trim() : null;
     }
 
     @Override