(cloudstack) branch 4.19 updated: server: add global setting consoleproxy.sslEnabled (#8809)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.19 by this push:
     new 313a165e62b server: add global setting consoleproxy.sslEnabled (#8809)
313a165e62b is described below

commit 313a165e62bea8ed4b31e79ab05b8c5c07e6c091
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Fri Jun 21 12:26:20 2024 +0200

    server: add global setting consoleproxy.sslEnabled (#8809)
---
 .../java/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java    | 2 +-
 server/src/main/java/com/cloud/consoleproxy/AgentHookBase.java        | 2 +-
 server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManager.java  | 3 +++
 .../src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 4 ++--
 .../main/java/com/cloud/consoleproxy/StaticConsoleProxyManager.java   | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/server/src/main/java/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
 
b/server/src/main/java/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
index a71c692aab1..1fe693a62de 100644
--- 
a/server/src/main/java/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
+++ 
b/server/src/main/java/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
@@ -118,7 +118,7 @@ public class AgentBasedConsoleProxyManager extends 
ManagerBase implements Consol
             _consoleProxyPort = NumbersUtil.parseInt(value, 
ConsoleProxyManager.DEFAULT_PROXY_VNC_PORT);
         }
 
-        value = configs.get("consoleproxy.sslEnabled");
+        value = configs.get(ConsoleProxySslEnabled.key());
         if (value != null && value.equalsIgnoreCase("true")) {
             _sslEnabled = true;
         }
diff --git a/server/src/main/java/com/cloud/consoleproxy/AgentHookBase.java 
b/server/src/main/java/com/cloud/consoleproxy/AgentHookBase.java
index efc5a1b5d84..ab72e3dc43e 100644
--- a/server/src/main/java/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/main/java/com/cloud/consoleproxy/AgentHookBase.java
@@ -213,7 +213,7 @@ public abstract class AgentHookBase implements AgentHook {
             byte[] ksBits = null;
 
             String consoleProxyUrlDomain = 
_configDao.getValue(Config.ConsoleProxyUrlDomain.key());
-            String consoleProxySslEnabled = 
_configDao.getValue("consoleproxy.sslEnabled");
+            String consoleProxySslEnabled = 
_configDao.getValue(ConsoleProxyManager.ConsoleProxySslEnabled.key());
             if (!StringUtils.isEmpty(consoleProxyUrlDomain) && 
!StringUtils.isEmpty(consoleProxySslEnabled)
                     && consoleProxySslEnabled.equalsIgnoreCase("true")) {
                 ksBits = 
_ksMgr.getKeystoreBits(ConsoleProxyManager.CERTIFICATE_NAME, 
ConsoleProxyManager.CERTIFICATE_NAME, storePassword);
diff --git 
a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManager.java 
b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManager.java
index 6280495fb1a..d271f66e02f 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManager.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManager.java
@@ -36,6 +36,9 @@ public interface ConsoleProxyManager extends Manager, 
ConsoleProxyService {
     String ALERT_SUBJECT = "proxy-alert";
     String CERTIFICATE_NAME = "CPVMCertificate";
 
+    ConfigKey<Boolean> ConsoleProxySslEnabled = new 
ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Boolean.class, 
"consoleproxy.sslEnabled", "false",
+            "Enable SSL for console proxy", false);
+
     ConfigKey<Boolean> NoVncConsoleDefault = new 
ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Boolean.class, 
"novnc.console.default", "true",
         "If true, noVNC console will be default console for virtual machines", 
true);
 
diff --git 
a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 
b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index c1d4a22bf77..b7248dd4a96 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1120,7 +1120,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
 
         Map<String, String> configs = 
configurationDao.getConfiguration("management-server", params);
 
-        String value = configs.get("consoleproxy.sslEnabled");
+        String value = configs.get(ConsoleProxySslEnabled.key());
         if (value != null && value.equalsIgnoreCase("true")) {
             sslEnabled = true;
         }
@@ -1609,7 +1609,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] { NoVncConsoleDefault, 
NoVncConsoleSourceIpCheckEnabled };
+        return new ConfigKey<?>[] { ConsoleProxySslEnabled, 
NoVncConsoleDefault, NoVncConsoleSourceIpCheckEnabled };
     }
 
     protected ConsoleProxyStatus parseJsonToConsoleProxyStatus(String json) 
throws JsonParseException {
diff --git 
a/server/src/main/java/com/cloud/consoleproxy/StaticConsoleProxyManager.java 
b/server/src/main/java/com/cloud/consoleproxy/StaticConsoleProxyManager.java
index bb2b426bf82..29a7497fc17 100644
--- a/server/src/main/java/com/cloud/consoleproxy/StaticConsoleProxyManager.java
+++ b/server/src/main/java/com/cloud/consoleproxy/StaticConsoleProxyManager.java
@@ -72,7 +72,7 @@ public class StaticConsoleProxyManager extends 
AgentBasedConsoleProxyManager imp
             _ip = "127.0.0.1";
         }
 
-        String value = (String)params.get("consoleproxy.sslEnabled");
+        String value = (String)params.get(ConsoleProxySslEnabled.key());
         if (value != null && value.equalsIgnoreCase("true")) {
             _sslEnabled = true;
         }