From 392f62dae0f59b3b00437d61ab8cee0ebfb9e60a Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 16 Apr 2018 18:12:41 +0530 Subject: [PATCH] consoleproxy: use consoleproxy.domain for non-ssl enable env (#2562) This allows CloudStack to use a console proxy domain instead of public IP address even when ssl is not enabled but console proxy url/domain is defined in global settings. Signed-off-by: Rohit Yadav --- core/src/com/cloud/info/ConsoleProxyInfo.java | 5 +++++ .../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/com/cloud/info/ConsoleProxyInfo.java b/core/src/com/cloud/info/ConsoleProxyInfo.java index b15abcb54ff..16993d71bdc 100644 --- a/core/src/com/cloud/info/ConsoleProxyInfo.java +++ b/core/src/com/cloud/info/ConsoleProxyInfo.java @@ -19,6 +19,8 @@ package com.cloud.info; +import org.apache.commons.lang3.StringUtils; + public class ConsoleProxyInfo { private boolean sslEnabled; @@ -55,6 +57,9 @@ public class ConsoleProxyInfo { proxyImageUrl += ":" + this.proxyUrlPort; } else { proxyAddress = proxyIpAddress; + if (StringUtils.isNotBlank(consoleProxyUrlDomain)) { + proxyAddress = consoleProxyUrlDomain; + } proxyPort = port; this.proxyUrlPort = proxyUrlPort; diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index f131714ecaf..e6c0a8da6ec 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -231,7 +231,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy private String _instance; private int _proxySessionTimeoutValue = DEFAULT_PROXY_SESSION_TIMEOUT; - private boolean _sslEnabled = true; + private boolean _sslEnabled = false; private String _consoleProxyUrlDomain; // global load picture at zone basis @@ -1246,8 +1246,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy Map configs = _configDao.getConfiguration("management-server", params); - String value = configs.get(Config.ConsoleProxyCmdPort.key()); - value = configs.get("consoleproxy.sslEnabled"); + String value = configs.get("consoleproxy.sslEnabled"); if (value != null && value.equalsIgnoreCase("true")) { _sslEnabled = true; }