Merge pull request #398 from openshift-cherrypick-robot/cherry-pick-3…

…96-to-18.0-fr1 [18.0-fr1] [httpd] Use absolute url with schema in redirect rule
openstack-k8s-operators · Dec 23, 2024 · 9353ce7 · 9353ce7
2 parents 2e200c1 + 4fd122e
commit 9353ce7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/controllers/horizon_controller.go b/controllers/horizon_controller.go
@@ -888,14 +888,15 @@ func (r *HorizonReconciler) generateServiceConfigMaps(
 	}
 
 	templateParameters := map[string]interface{}{
-		"keystoneURL":        authURL,
-		"horizonEndpointUrl": url.Host,
-		"memcachedServers":   mc.GetMemcachedServerListQuotedString(),
-		"memcachedTLS":       mc.GetMemcachedTLSSupport(),
-		"ServerName":         fmt.Sprintf("%s.%s.svc", horizon.ServiceName, instance.Namespace),
-		"Port":               horizon.HorizonPort,
-		"TLS":                false,
-		"isPublicHTTPS":      url.Scheme == "https",
+		"keystoneURL":         authURL,
+		"horizonEndpoint":     instance.Status.Endpoint,
+		"horizonEndpointHost": url.Host,
+		"memcachedServers":    mc.GetMemcachedServerListQuotedString(),
+		"memcachedTLS":        mc.GetMemcachedTLSSupport(),
+		"ServerName":          fmt.Sprintf("%s.%s.svc", horizon.ServiceName, instance.Namespace),
+		"Port":                horizon.HorizonPort,
+		"TLS":                 false,
+		"isPublicHTTPS":       url.Scheme == "https",
 	}
 
 	// create httpd tls template parameters

diff --git a/templates/horizon/config/httpd.conf b/templates/horizon/config/httpd.conf
@@ -57,7 +57,7 @@ LogLevel debug
   CustomLog /dev/stdout "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" env=forwarded
 
   ## RedirectMatch rules
-  RedirectMatch permanent  ^/$ /dashboard
+  RedirectMatch permanent  ^/$ "{{ .horizonEndpoint }}/dashboard"
 
   ## WSGI configuration
   WSGIApplicationGroup %{GLOBAL}

diff --git a/templates/horizon/config/local_settings.py b/templates/horizon/config/local_settings.py
@@ -64,18 +64,26 @@
 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(("{{ .horizonEndpointUrl }}", 80))
+        s.connect(hostport)
         return s.getsockname()[0]
     except socket.gaierror:
         s.close()
         s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
-        s.connect(("{{ .horizonEndpointUrl }}", 80))
+        s.connect(hostport)
         return "[{}]".format(s.getsockname()[0])
     finally:
         s.close()
 
-ALLOWED_HOSTS = [get_pod_ip(), "{{ .horizonEndpointUrl }}"]
+ALLOWED_HOSTS = [get_pod_ip(), "{{ .horizonEndpointHost }}"]
 
 USE_X_FORWARDED_HOST = True