Merge pull request #6441 from bstansberry/WFCORE-7276

[WFCORE-7276] InterfaceAddHandler should consider updates made by lat…

Author: yersan

controller/src/main/java/org/jboss/as/controller/interfaces/ParsedInterfaceCriteria.java

@@ -11,6 +11,7 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -39,7 +40,7 @@ public final class ParsedInterfaceCriteria {
 
     private final String failureMessage;
     private final boolean anyLocal;
-    private final Set<InterfaceCriteria> criteria = new LinkedHashSet<InterfaceCriteria>();
+    private final Set<InterfaceCriteria> criteria = new LinkedHashSet<>();
 
     private ParsedInterfaceCriteria(final String failureMessage) {
         this.failureMessage = failureMessage;
@@ -84,12 +85,19 @@ public static ParsedInterfaceCriteria parse(final ModelNode model, final boolean
         } else {
             try {
                 final List<Property> nodes = subModel.asPropertyList();
-                final Set<InterfaceCriteria> criteriaSet = new LinkedHashSet<InterfaceCriteria>();
-                for (final Property property : nodes) {
+                final Set<InterfaceCriteria> criteriaSet = new LinkedHashSet<>();
+                int definedPropertyCount = 0;
+                for (Iterator<Property> propertyIterator = nodes.iterator(); propertyIterator.hasNext() ; ) {
+                    Property property = propertyIterator.next();
+                    // The model will have properties for all attributes; ignore the undefined ones
+                    if (!property.getValue().isDefined()) {
+                        continue;
+                    }
+                    definedPropertyCount++;
                     final InterfaceCriteria criterion = parseCriteria(property, false, expressionResolver);
                     if (criterion instanceof WildcardInetAddressInterfaceCriteria) {
-                        // AS7-1668: stop processing and just return the any binding.
-                        if (nodes.size() > 1) {
+                        // AS7-1668: stop processing and just return the 'any' binding.
+                        if (definedPropertyCount > 1 || hasMoreDefinedProperties(propertyIterator)) {
                             MGMT_OP_LOGGER.wildcardAddressDetected();
                         }
                         return ParsedInterfaceCriteria.ANY;
@@ -172,7 +180,7 @@ private static InterfaceCriteria parseNested(final ModelNode subModel, final boo
         if(!subModel.isDefined() || subModel.asInt() == 0) {
             return null;
         }
-        final Set<InterfaceCriteria> criteriaSet = new LinkedHashSet<InterfaceCriteria>();
+        final Set<InterfaceCriteria> criteriaSet = new LinkedHashSet<>();
         for(final Property nestedProperty :  subModel.asPropertyList()) {
             final Element element = Element.forName(nestedProperty.getName());
             switch (element) {
@@ -272,6 +280,15 @@ private static ModelNode parsePossibleExpression(final ModelNode node) {
         return (node.getType() == ModelType.STRING) ? ParseUtils.parsePossibleExpression(node.asString()) : node;
     }
 
+    private static boolean hasMoreDefinedProperties(Iterator<Property> iterator) {
+        while (iterator.hasNext()) {
+            if (iterator.next().getValue().isDefined()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static class ParsingException extends RuntimeException {
         private static final long serialVersionUID = -5627251228393035383L;
 

controller/src/main/java/org/jboss/as/controller/operations/common/InterfaceAddHandler.java

@@ -59,7 +59,7 @@ protected void validateAndSet(final AttributeDefinition definition, final ModelN
 
     protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model) throws OperationFailedException {
         String name = context.getCurrentAddressValue();
-        ParsedInterfaceCriteria parsed = getCriteria(context, operation);
+        ParsedInterfaceCriteria parsed = getCriteria(context, model);
         if (parsed.getFailureMessage() != null) {
             throw new OperationFailedException(parsed.getFailureMessage());
         }

controller/src/main/java/org/jboss/as/controller/operations/common/InterfaceCriteriaWriteHandler.java

@@ -66,13 +66,18 @@ public void execute(final OperationContext context, final ModelNode operation) t
         } else {
             throw new OperationFailedException(ControllerLogger.ROOT_LOGGER.unknownAttribute(attributeName));
         }
-        if (updateRuntime) {
+        // A runtime update after boot must be via a reload.
+        // During boot, no reload is needed because we just modified the model
+        // and the Stage.RUNTIME handler for the op that added this interface
+        // will process a model that includes our update.
+        boolean reload = updateRuntime && !context.isBooting();
+        if (reload) {
             // Require a reload
             context.reloadRequired();
         }
         // Verify the model in a later step
         context.addStep(VERIFY_HANDLER, OperationContext.Stage.MODEL);
-        OperationContext.RollbackHandler rollbackHandler = updateRuntime
+        OperationContext.RollbackHandler rollbackHandler = reload
                 ? OperationContext.RollbackHandler.REVERT_RELOAD_REQUIRED_ROLLBACK_HANDLER
                 : OperationContext.RollbackHandler.NOOP_ROLLBACK_HANDLER;
         context.completeStep(rollbackHandler);

testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/management/persistence/yaml/YamlExtensionTestCase.java

@@ -22,6 +22,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -46,8 +49,10 @@
 import org.jboss.as.controller.client.helpers.Operations;
 import org.jboss.as.controller.client.impl.AdditionalBootCliScriptInvoker;
 import org.jboss.as.controller.operations.common.Util;
+import org.jboss.as.network.NetworkUtils;
 import org.jboss.as.test.integration.management.util.CLIWrapper;
 import org.jboss.as.test.shared.AssumeTestGroupUtil;
+import org.jboss.as.test.shared.TestSuiteEnvironment;
 import org.jboss.as.test.shared.TimeoutUtil;
 import org.jboss.dmr.ModelNode;
 import org.jboss.logging.Logger;
@@ -93,6 +98,7 @@ public class YamlExtensionTestCase {
     private static Path testSocketOverrideYaml;
     private static Path testPortOffsetOverrideYaml;
     private static Path testRemoveSocketYaml;
+    private static Path testInterfaceOverrideYaml;
     private static Path testAddingExtensionPathDeploymentOverlayIgnored;
     private static Path testAddingEmptyExtensionFailYaml;
     private static Path testDeploymentYaml;
@@ -151,6 +157,7 @@ public static void setup() throws Exception {
         testSocketOverrideYaml = getResourceFilePath("test-socket-override.yml");
         testPortOffsetOverrideYaml = getResourceFilePath("test-port-offset-override.yml");
         testRemoveSocketYaml = getResourceFilePath("test-remove-socket.yml");
+        testInterfaceOverrideYaml = getResourceFilePath("test-interface-override.yml");
         testAddingExtensionPathDeploymentOverlayIgnored = getResourceFilePath("test-adding-extension-path-deployment-overlay-ignored.yml");
         testAddingEmptyExtensionFailYaml = getResourceFilePath("test-adding-empty-extension.yml");
         testDeploymentYaml = getResourceFilePath("test-deployment.yml");
@@ -644,6 +651,21 @@ public void testPostStartCLIChangesToModelDoNotSurviveRestart() throws Exception
         Assert.assertEquals("Yaml changes to configuration were persisted to xml. This should never happen.", defaultXml, readConfigAsXml());
     }
 
+    @Test
+    public void testInterfaceOverride() throws UnknownHostException {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        container.startYamlExtension(new PrintStream(byteArrayOutputStream), new Path[]{testInterfaceOverrideYaml});
+        String logged = byteArrayOutputStream.toString();
+
+        InetAddress serverAddress = InetAddress.getByName(TestSuiteEnvironment.getServerAddress());
+        String expectedAddress = serverAddress instanceof Inet4Address ? "0.0.0.0" : "[0:0:0:0:0:0:0:0]";
+        String expectedConsoleOutput = "http://"+ expectedAddress + ":9990/management";
+        assertThat("The server didn't log it is listening on address 0.0.0.0.", logged, CoreMatchers.containsString(expectedConsoleOutput));
+        String unexpectedAddress = NetworkUtils.formatIPAddressForURI(serverAddress);
+        String unexpectedConsoleOutput = "http://" + unexpectedAddress + ":9990/management";
+        assertThat("The server logged it is listening on address 127.0.0.1.", logged, CoreMatchers.not(CoreMatchers.containsString(unexpectedConsoleOutput)));
+    }
+
     private void waitForRunningMode(String runningMode) throws Exception {
         // Following a reload to normal mode, we might read the running mode too early and hit the admin-only server
         // Cycle around a bit to make sure we get the server reloaded into normal mode

testsuite/manualmode/src/test/resources/org/jboss/as/test/manualmode/management/persistence/yaml/test-interface-override.yml

@@ -0,0 +1,5 @@
+---
+wildfly-configuration:
+  interface:
+    management:
+      inet-address: "0.0.0.0"