From f88d606acbc566e2f777a18d1b1f90db428162b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Moser?= <mail@renemoser.net>
Date: Thu, 26 Jul 2018 09:31:23 +0200
Subject: [PATCH] consoleproxy: Fixes #2733 invalid consoleproxy url after
 upgrade (#2734)

Ensures we have a valid console proxy domain for protocol http even a * setting is used. See #2733
---
 core/src/com/cloud/info/ConsoleProxyInfo.java | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/core/src/com/cloud/info/ConsoleProxyInfo.java b/core/src/com/cloud/info/ConsoleProxyInfo.java
index 16993d71bdc..78cb877e7db 100644
--- a/core/src/com/cloud/info/ConsoleProxyInfo.java
+++ b/core/src/com/cloud/info/ConsoleProxyInfo.java
@@ -35,40 +35,42 @@ public class ConsoleProxyInfo {
 
     public ConsoleProxyInfo(boolean sslEnabled, String proxyIpAddress, int port, int proxyUrlPort, String consoleProxyUrlDomain) {
         this.sslEnabled = sslEnabled;
+        this.proxyPort = port;
+        this.proxyUrlPort = proxyUrlPort;
+        this.proxyAddress = this.formatProxyAddress(consoleProxyUrlDomain, proxyIpAddress);
 
         if (sslEnabled) {
-            StringBuffer sb = new StringBuffer();
-            if (consoleProxyUrlDomain.startsWith("*")) {
-                sb.append(proxyIpAddress);
-                for (int i = 0; i < proxyIpAddress.length(); i++)
-                    if (sb.charAt(i) == '.')
-                        sb.setCharAt(i, '-');
-                sb.append(consoleProxyUrlDomain.substring(1));//skip the *
-            } else {
-                //LB address
-                sb.append(consoleProxyUrlDomain);
-            }
-            proxyAddress = sb.toString();
-            proxyPort = port;
-            this.proxyUrlPort = proxyUrlPort;
-
             proxyImageUrl = "https://" + proxyAddress;
-            if (proxyUrlPort != 443)
+            if (proxyUrlPort != 443) {
                 proxyImageUrl += ":" + this.proxyUrlPort;
-        } else {
-            proxyAddress = proxyIpAddress;
-            if (StringUtils.isNotBlank(consoleProxyUrlDomain)) {
-                proxyAddress = consoleProxyUrlDomain;
             }
-            proxyPort = port;
-            this.proxyUrlPort = proxyUrlPort;
 
+        } else {
             proxyImageUrl = "http://" + proxyAddress;
-            if (proxyUrlPort != 80)
+            if (proxyUrlPort != 80) {
                 proxyImageUrl += ":" + proxyUrlPort;
+            }
         }
     }
 
+    private String formatProxyAddress(String consoleProxyUrlDomain, String proxyIpAddress) {
+        StringBuffer sb = new StringBuffer();
+        // Domain in format *.example.com, proxy IP is 1.2.3.4 --> 1-2-3-4.example.com
+        if (consoleProxyUrlDomain.startsWith("*")) {
+            sb.append(proxyIpAddress.replaceAll("\\.", "-"));
+            sb.append(consoleProxyUrlDomain.substring(1)); // skip the *
+
+        // Otherwise we assume a valid domain if config not blank
+        } else if (StringUtils.isNotBlank(consoleProxyUrlDomain)) {
+            sb.append(consoleProxyUrlDomain);
+
+        // Blank config, we use the proxy IP
+        } else {
+            sb.append(proxyIpAddress);
+        }
+        return sb.toString();
+    }
+
     public String getProxyAddress() {
         return proxyAddress;
     }