Merge pull request #3639 from jmesnil/WFCORE-4269_socket_parsing

[WFCORE-4269] Fix socket parser
wildfly · Jan 14, 2019 · 7315627 · 7315627
2 parents 6072983 + 49ce483
commit 7315627
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/parsing/HostXml_10.java b/host-controller/src/main/java/org/jboss/as/host/controller/parsing/HostXml_10.java
@@ -502,6 +502,9 @@ private void parseHttpManagementInterface(XMLExtendedStreamReader reader, ModelN
         operationAddress.add(MANAGEMENT_INTERFACE, HTTP_INTERFACE);
         final ModelNode addOp = Util.getEmptyOperation(ADD, operationAddress);
 
+        int socketCount = 0;
+        int httpUpgradeCount = 0;
+
         // Handle attributes
         parseHttpManagementInterfaceAttributes(reader, addOp);
 
@@ -511,9 +514,15 @@ private void parseHttpManagementInterface(XMLExtendedStreamReader reader, ModelN
             final Element element = Element.forName(reader.getLocalName());
             switch (element) {
                 case SOCKET:
+                    if (++socketCount > 1) {
+                        throw unexpectedElement(reader);
+                    }
                     parseHttpManagementSocket(reader, addOp);
                     break;
                 case HTTP_UPGRADE:
+                    if (++httpUpgradeCount > 1) {
+                        throw unexpectedElement(reader);
+                    }
                     parseHttpUpgrade(reader, addOp);
                     break;
                 default: