[cloudstack] branch main updated: Fix VNC SecurityType None on RFB v3.8 (#7287)

[dahn]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new b8bc0b3e13f Fix VNC SecurityType None on RFB v3.8 (#7287)
b8bc0b3e13f is described below

commit b8bc0b3e13f03c65becb1f5cda8b3a9d409b8720
Author: Nicolas Vazquez <nicovazque...@gmail.com>
AuthorDate: Fri Feb 24 07:45:30 2023 -0300

    Fix VNC SecurityType None on RFB v3.8 (#7287)
---
 .../java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java  |  2 +-
 .../src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git 
a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
 
b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
index ae9573c3aea..6434dd6e42e 100644
--- 
a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
+++ 
b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
@@ -200,7 +200,7 @@ public class ConsoleProxyNoVncClient implements 
ConsoleProxyClient {
         client.processHandshakeSecurityType(secType, getClientHostPassword(),
                 getClientHostAddress(), getClientHostPort());
 
-        client.processSecurityResultMsg(secType);
+        client.processSecurityResultMsg();
         byte[] securityResultToClient = new byte[] { 0, 0, 0, 0 };
         sendMessageToVNCClient(securityResultToClient, 4);
         client.setWaitForNoVnc(true);
diff --git 
a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java
 
b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java
index c8318de1e35..8dee19910e7 100644
--- 
a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java
+++ 
b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java
@@ -472,18 +472,13 @@ public class NoVncClient {
         return new Pair<>(result, message);
     }
 
-    public void processSecurityResultMsg(int securityType) {
+    public void processSecurityResultMsg() {
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Processing security result message");
         }
 
-        int result;
-        if (securityType == RfbConstants.NO_AUTH) {
-            result = RfbConstants.VNC_AUTH_OK;
-        } else {
-            nioSocketConnection.waitForBytesAvailableForReading(1);
-            result = nioSocketConnection.readUnsignedInteger(32);
-        }
+        nioSocketConnection.waitForBytesAvailableForReading(1);
+        int result = nioSocketConnection.readUnsignedInteger(32);
 
         Pair<Boolean, String> securityResultType = 
processSecurityResultType(result);
         boolean success = BooleanUtils.toBoolean(securityResultType.first());