fix on cpvm

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java

@@ -36,16 +36,15 @@
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.eclipse.jetty.websocket.api.Session;
 
 import com.cloud.utils.PropertiesUtil;
 import com.google.gson.Gson;
 import com.sun.net.httpserver.HttpServer;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 /**
  *
  * ConsoleProxy, singleton class that manages overall activities in console proxy process. To make legacy code work, we still
@@ -598,6 +597,8 @@ public static ConsoleProxyNoVncClient getNoVncViewer(ConsoleProxyClientParam par
             Session session) throws AuthenticationException {
         boolean reportLoadChange = false;
         String clientKey = param.getClientMapKey();
+        LOGGER.debug("Getting NoVNC viewer for {}. Session requires new viewer: {}, client tag: {}. session UUID: {}",
+                clientKey, param.isSessionRequiresNewViewer(), param.getClientTag(), param.getSessionUuid());
         synchronized (connectionMap) {
             ConsoleProxyClient viewer = connectionMap.get(clientKey);
             if (viewer == null || viewer.getClass() != ConsoleProxyNoVncClient.class) {

services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyClientParam.java

@@ -232,4 +232,8 @@ public void setClientIp(String clientIp) {
     public boolean isSessionRequiresNewViewer() {
         return sessionRequiresNewViewer;
     }
+
+    public void setSessionRequiresNewViewer(boolean sessionRequiresNewViewer) {
+        this.sessionRequiresNewViewer = sessionRequiresNewViewer;
+    }
 }

services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelper.java

@@ -110,6 +110,9 @@ public static Map<String, String> getQueryMap(String query) {
                 if (param.getExtraSecurityToken() != null) {
                     map.put("extraSecurityToken", param.getExtraSecurityToken());
                 }
+                if (param.isSessionRequiresNewViewer()) {
+                    map.put("sessionRequiresNewViewer", Boolean.TRUE.toString());
+                }
             } else {
                 LOGGER.error("Unable to decode token");
             }

services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVNCHandler.java

@@ -93,6 +93,7 @@ public void onConnect(final Session session) throws IOException, InterruptedExce
         String websocketUrl = queryMap.get("websocketUrl");
         String sessionUuid = queryMap.get("sessionUuid");
         String clientIp = session.getRemoteAddress().getAddress().getHostAddress();
+        boolean sessionRequiresNewViewer = Boolean.parseBoolean(queryMap.get("sessionRequiresNewViewer"));
 
         if (tag == null)
             tag = "";
@@ -141,6 +142,7 @@ public void onConnect(final Session session) throws IOException, InterruptedExce
             param.setSessionUuid(sessionUuid);
             param.setSourceIP(sourceIP);
             param.setClientIp(clientIp);
+            param.setSessionRequiresNewViewer(sessionRequiresNewViewer);
 
             if (queryMap.containsKey("extraSecurityToken")) {
                 param.setExtraSecurityToken(queryMap.get("extraSecurityToken"));