fix: make hostname extraction work with IPv6 addresses

Author: cortlepp

modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java

@@ -23,7 +23,6 @@
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
-import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.description.*;
 import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
@@ -36,12 +35,15 @@
 import org.apache.neethi.PolicyReference;
 
 import javax.xml.namespace.QName;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.*;
 
 /**
  * Helps the AxisService to WSDL process
  */
 public class WSDLSerializationUtil {
+    private static final OnDemandLogger log = new OnDemandLogger(WSDLSerializationUtil.class);
 
     public static final String CDATA_START = "<![CDATA[";
     public static final String CDATA_START_REGEX = "<!\\[CDATA\\[";
@@ -422,29 +424,31 @@ private static AxisService getAxisService(AxisDescription description) {
 		}
 	}                              
 
-	public static String extractHostIP(String serviceURL){
-            
+	public static String extractHostIP(String serviceURL) {
+        try {
+            return new URI(serviceURL).getHost();
+        } catch (URISyntaxException | NullPointerException e) {
+            log.debug("encountered invalid URI when trying to extract host ip, will try to parse manually now", e);
             String ip = null;
-            
+
             if (serviceURL != null) {
-            
+
                 int ipindex = serviceURL.indexOf("//");
-                        
+
                 if (ipindex >= 0) {
-                    ip = serviceURL.substring(ipindex + 2, serviceURL.length());
+                    ip = serviceURL.substring(ipindex + 2);
                     int seperatorIndex = ip.indexOf(":");
                     int slashIndex = ip.indexOf("/");
-                        
+
                     if (seperatorIndex >= 0) {
                         ip = ip.substring(0, seperatorIndex);
                     } else {
                         ip = ip.substring(0, slashIndex);
-                    }                      
+                    }
                 }
             }
-               
-            return ip;      
-        }      
 
-	
+            return ip;
+        }
+    }
 }

modules/transport/http/src/main/java/org/apache/axis2/transport/http/ListingAgent.java

@@ -27,10 +27,7 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.PolicyInclude;
 import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.axis2.util.ExternalPolicySerializer;
-import org.apache.axis2.util.IOUtils;
-import org.apache.axis2.util.JavaUtils;
-import org.apache.axis2.util.OnDemandLogger;
+import org.apache.axis2.util.*;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyComponent;
 import org.apache.neethi.PolicyRegistry;
@@ -46,11 +43,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 
 public class ListingAgent extends AbstractAgent {
 
@@ -99,19 +97,7 @@ protected void processIndex(HttpServletRequest httpServletRequest,
     }
 
     private String extractHost(String filePart) {
-        int ipindex = filePart.indexOf("//");
-        String ip = null;
-        if (ipindex >= 0) {
-            ip = filePart.substring(ipindex + 2, filePart.length());
-            int seperatorIndex = ip.indexOf(":");
-            int slashIndex = ip.indexOf("/");
-            if (seperatorIndex >= 0) {
-                ip = ip.substring(0, seperatorIndex);
-            } else {
-                ip = ip.substring(0, slashIndex);
-            }
-        }
-        return ip;
+        return WSDLSerializationUtil.extractHostIP(filePart);
     }
 
     public void processExplicitSchemaAndWSDL(HttpServletRequest req,