Fixed behavior related to getHostName

- it is not guaranteed that the local host name is resolvable by DNS
- but it should be in nearly all cases we use it

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

Author: dmatej

appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/CreateIiopListenerTest.java

@@ -54,7 +54,7 @@
 @ExtendWith(OrbJunitExtension.class)
 public class CreateIiopListenerTest {
 
-    private static final String LOCALHOST = NetUtils.getHostName();
+    private static final String LOCALHOST = NetUtils.getCanonicalHostName();
 
     @Inject
     private ServiceLocator services;

appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/DeleteIiopListenerTest.java

@@ -100,7 +100,7 @@ public void tearDown() throws TransactionFailure {
      */
     @Test
     public void testExecuteSuccessDefaultTarget() {
-        parameters.set("listeneraddress", NetUtils.getHostName());
+        parameters.set("listeneraddress", NetUtils.getCanonicalHostName());
         parameters.set("iiopport", "4440");
         parameters.set("listener_id", "iiop_1");
         CreateIiopListener createCommand = services.getService(CreateIiopListener.class);

appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/ListIiopListenersTest.java

@@ -114,7 +114,7 @@ public void testExecuteSuccessValidTargetOperand() {
      */
     @Test
     public void testExecuteSuccessListListener() {
-        parameters.set("listeneraddress", NetUtils.getHostName());
+        parameters.set("listeneraddress", NetUtils.getCanonicalHostName());
         parameters.set("iiopport", "4440");
         parameters.set("listener_id", "listener");
         CreateIiopListener createCommand = services.getService(CreateIiopListener.class);

appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IiopFolbGmsClient.java

@@ -138,11 +138,6 @@ boolean isGMSAvailable() {
         return gmsAdapter != null ;
     }
 
-    ////////////////////////////////////////////////////
-    //
-    // Action
-    //
-
     @Override
     public void processNotification(final Signal signal) {
         try {
@@ -250,18 +245,7 @@ private ClusterInstanceInfo getClusterInstanceInfo(Server server, Config config,
         final int weight = Integer.parseInt(server.getLbWeight());
         LOG.log(DEBUG, "getClusterInstanceInfo: weight {0}", weight);
 
-        final String nodeName = server.getNodeRef();
-        String hostName = nodeName;
-        if (nodes != null) {
-            Node node = nodes.getNode(nodeName);
-            if (node != null) {
-                if (node.isLocal()) {
-                    hostName = NetUtils.getHostName();
-                } else {
-                    hostName = node.getNodeHost();
-                }
-            }
-        }
+        final String hostName = getHostName(server.getNodeRef());
 
         LOG.log(DEBUG, "getClusterInstanceInfo: host {0}", hostName);
 
@@ -273,8 +257,7 @@ private ClusterInstanceInfo getClusterInstanceInfo(Server server, Config config,
 
         final List<SocketInfo> sinfos = new ArrayList<>();
         for (IiopListener il : listeners) {
-            SocketInfo sinfo = new SocketInfo(il.getId(), hostName, resolvePort(server, il));
-            sinfos.add(sinfo);
+            sinfos.add(new SocketInfo(il.getId(), hostName, resolvePort(server, il)));
         }
         LOG.log(DEBUG, "getClusterInstanceInfo: sinfos {0}", sinfos);
 
@@ -284,6 +267,17 @@ private ClusterInstanceInfo getClusterInstanceInfo(Server server, Config config,
         return result;
     }
 
+    private String getHostName(final String nodeName) {
+        if (nodes == null) {
+            return nodeName;
+        }
+        Node node = nodes.getNode(nodeName);
+        if (node == null) {
+            return nodeName;
+        }
+        return node.isLocal() ? NetUtils.getCanonicalHostName() : node.getNodeHost();
+    }
+
 
     private Config getConfigForServer(Server server) {
         LOG.log(DEBUG, "getConfigForServer: server {0}", server);

appserver/security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java

@@ -1076,7 +1076,6 @@ private List<String> getHostAndPort(HttpRequest request) throws IOException {
             for (NetworkListener nwListener : networkListeners.getNetworkListener()) {
                 // Loop through the network listeners
                 String nwAddress = nwListener.getAddress();
-                InetAddress[] localHostAdresses;
                 if (nwAddress == null || nwAddress.equals("0.0.0.0")) {
                     nwAddress = NetUtils.getCanonicalHostName();
                     if (nwAddress.equals(hostPort[0])) {
@@ -1095,8 +1094,8 @@ private List<String> getHostAndPort(HttpRequest request) throws IOException {
                         // only if the hostname in the header
                         // does not match with the hostname in the
                         // listener-To avoid performance overhead
-                        localHostAdresses = NetUtils.getHostAddresses();
-                        if (localHostAdresses.length == 0) {
+                        List<InetAddress> localHostAdresses = NetUtils.getHostAddresses();
+                        if (localHostAdresses.isEmpty()) {
                             break;
                         }
                         InetAddress hostAddress = InetAddress.getByName(hostPort[0]);

appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java

@@ -221,7 +221,7 @@ public static void setServerName(Properties properties) {
             }
             final String serverName;
             if (properties.getProperty(JTS_XA_SERVER_NAME) == null) {
-                serverName = NetUtils.getHostName();
+                serverName = NetUtils.getCanonicalHostName();
             } else {
                 serverName = properties.getProperty(JTS_XA_SERVER_NAME);
                 LOG.log(DEBUG, "DTR: Got serverName from JTS_XA_SERVER_NAME");

nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortManager.java

@@ -220,7 +220,7 @@ private Map<String, Integer> reassignPorts() throws TransactionFailure {
 
     private Integer reassignPort(int num) throws TransactionFailure {
         int max = num + 100;
-        final String hostName = NetUtils.getHostName();
+        final String hostName = NetUtils.getCanonicalHostName();
         while (num < max) {
             num = getNextUnassignedPort(num);
             if (NetUtils.isPortFree(hostName, num)) {

nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerHelper.java

@@ -93,7 +93,7 @@ public final String getAdminHost() throws RuntimeException {
                 // We are the DAS. Return our hostname
                 return System.getProperty(HOST_NAME.getSystemPropertyName());
             }
-            return NetUtils.getHostName();
+            return NetUtils.getCanonicalHostName();
         }
 
         String hostName = null;
@@ -107,7 +107,7 @@ public final String getAdminHost() throws RuntimeException {
             }
             // Hack to get around the fact that the default localhost node entry is malformed
             if (hostName == null && nodeName.equals("localhost-" + domain.getName())) {
-                return NetUtils.getHostName();
+                return NetUtils.getCanonicalHostName();
             }
         }
 

nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java

@@ -522,7 +522,7 @@ public Subject authenticate(Object credentials) {
                 }
             }
         } else {
-            host = NetUtils.getHostName();
+            host = NetUtils.getCanonicalHostName();
         }
 
         String realm = as.getSystemJmxConnector().getAuthRealmName(); //yes, for backward compatibility;