Close noVNC WebSocket when console session times out

Author: dheeraj12347

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

@@ -362,7 +362,16 @@ public void closeClient() {
         this.connectionAlive = false;
         // Clear buffer reference to allow GC when client disconnects
         this.readBuffer = null;
-        ConsoleProxy.removeViewer(this);
+
+        try {
+            if (session != null && session.isOpen()) {
+                session.disconnect();
+            }
+        } catch (IOException e) {
+            logger.warn("Failed to disconnect WebSocket session for client [{}].", clientId, e);
+        } finally {
+            ConsoleProxy.removeViewer(this);
+        }
     }
 
     @Override

services/console-proxy/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyNoVncClientTest.java

@@ -16,8 +16,10 @@
 // under the License.
 package com.cloud.consoleproxy;
 
+import org.eclipse.jetty.websocket.api.Session;
 import org.junit.Assert;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 public class ConsoleProxyNoVncClientTest {
     @Test
@@ -42,4 +44,16 @@ public void updateFrontEndActivityTimeUpdatesTimestamp() throws InterruptedExcep
         long updatedActivityTime = client.getClientLastFrontEndActivityTime();
         Assert.assertTrue(updatedActivityTime > previousActivityTime);
     }
+
+    @Test
+    public void closeClientDisconnectsOpenWebSocketSession() throws Exception {
+        Session session = Mockito.mock(Session.class);
+        Mockito.when(session.isOpen()).thenReturn(true);
+
+        ConsoleProxyNoVncClient client = new ConsoleProxyNoVncClient(session);
+
+        client.closeClient();
+
+        Mockito.verify(session).disconnect();
+    }
 }