Skip to content

novnc: Accept new novnc client and disconnect old session #4531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 2 commits into from
Mar 6, 2021
Merged

novnc: Accept new novnc client and disconnect old session #4531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3754a7
novnc: Reject new novnc client if novnc viewer object is still alive
ustcweizhou Dec 10, 2020
30eab0c
#4531 novnc: Accept new novnc client and disconnect old session
ustcweizhou Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,11 +551,23 @@ public static ConsoleProxyNoVncClient getNoVncViewer(ConsoleProxyClientParam par
!param.getClientHostPassword().equals(viewer.getClientHostPassword()))
throw new AuthenticationException("Cannot use the existing viewer " + viewer + ": bad sid");

if (!viewer.isFrontEndAlive()) {
try {
authenticationExternally(param);
viewer.initClient(param);
reportLoadChange = true;
} catch (Exception e) {
s_logger.error("Authencation failed for param: " + param);
return null;
}
s_logger.info("Initializing new novnc client and disconnecting existing session");
try {
((ConsoleProxyNoVncClient)viewer).getSession().disconnect();
} catch (IOException e) {
s_logger.error("Exception while disconnect session of novnc viewer object: " + viewer, e);
}
removeViewer(viewer);
viewer = new ConsoleProxyNoVncClient(session);
viewer.initClient(param);
connectionMap.put(clientKey, viewer);
reportLoadChange = true;
}

if (reportLoadChange) {
Expand Down
10 changes: 8 additions & 2 deletions ...s/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVNCHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
@WebSocket
public class ConsoleProxyNoVNCHandler extends WebSocketHandler {

private ConsoleProxyNoVncClient viewer;
private ConsoleProxyNoVncClient viewer = null;
private static final Logger s_logger = Logger.getLogger(ConsoleProxyNoVNCHandler.class);

public ConsoleProxyNoVNCHandler() {
Expand Down Expand Up @@ -130,12 +130,18 @@ public void onConnect(final Session session) throws IOException, InterruptedExce
} catch (Exception e) {
s_logger.warn("Failed to create viewer due to " + e.getMessage(), e);
return;
} finally {
if (viewer == null) {
session.disconnect();
}
}
}

@OnWebSocketClose
public void onClose(Session session, int statusCode, String reason) throws IOException, InterruptedException {
ConsoleProxy.removeViewer(viewer);
if (viewer != null) {
ConsoleProxy.removeViewer(viewer);
}
}

@OnWebSocketFrame
Expand Down
4 changes: 4 additions & 0 deletions ...es/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,8 @@ public String getClientTag() {
return "";
}

public Session getSession() {
return session;
}

}