Improve robustness of get_pod_ip() function

In cases where single-stack IPv6 is used, it's possible that
an unhandled exception is raised since we first attempt
to verify ipv4 connectivity and fail before checking ipv6.
This change makes the get_pod_ip() function more robust
by ensuring that both are checked before raising an error.

Fixes #478
Jira: https://issues.redhat.com/browse/OSPRH-19216
Signed-off-by: Brendan Shephard <[email protected]>

Author: bshephar

templates/horizon/config/local_settings.py

@@ -63,25 +63,25 @@
 # retrieve the IP address, which we will then in turn add to the ALLOWED_HOSTS list.
 def get_pod_ip():
     import socket
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    hostport = (
-        "{{ .horizonEndpointHost }}",
-        {{- if .isPublicHTTPS }}
-        443
-        {{- else }}
-        80
-        {{- end }}
-    )
-    try:
-        s.connect(hostport)
-        return s.getsockname()[0]
-    except socket.gaierror:
-        s.close()
-        s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
-        s.connect(hostport)
-        return "[{}]".format(s.getsockname()[0])
-    finally:
-        s.close()
+
+    ipstacks = [socket.AF_INET, socket.AF_INET6]
+    last_error = None
+
+    host = "{{ .horizonEndpointHost }}"
+    port = 443 if {{ .isPublicHTTPS }} else 80
+
+    for ipstack in ipstacks:
+        try:
+            s = socket.socket(ipstack, socket.SOCK_DGRAM)
+            s.settimeout(2)
+            s.connect((host, port))
+            ip = s.getsockname()[0]
+            s.close()
+            return ip if ipstack == socket.AF_INET else f"[{ip}]"
+        except Exception as e:
+            last_error = e
+
+    raise RuntimeError(f"Could not determine pod IP: {last_error}")
 
 ALLOWED_HOSTS = [get_pod_ip(), "{{ .horizonEndpointHost }}"]