Skip to content

Commit f6829ac

Browse files
davidjumanishwstppr
davidjumani
authored and
shwstppr
committed
noVNC console integration (apache#3967)
* Adding noVNC repo * Adding support for noVNC * Adding Ctl+Esc * Removing device name from novnc header
1 parent 981f83c commit f6829ac

File tree

197 files changed

+34006
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+34006
-6
lines changed

‎server/src/com/cloud/consoleproxy/ConsoleProxyManager.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import com.cloud.utils.component.Manager;
2020
import com.cloud.vm.ConsoleProxyVO;
2121

22+
import org.apache.cloudstack.framework.config.ConfigKey;
23+
2224
public interface ConsoleProxyManager extends Manager, ConsoleProxyService {
2325

2426
public static final int DEFAULT_PROXY_CAPACITY = 50;
@@ -31,9 +33,14 @@ public interface ConsoleProxyManager extends Manager, ConsoleProxyService {
3133
public static final int DEFAULT_PROXY_URL_PORT = 80;
3234
public static final int DEFAULT_PROXY_SESSION_TIMEOUT = 300000; // 5 minutes
3335

36+
public static final int DEFAULT_NOVNC_PORT = 8080;
37+
3438
public static final String ALERT_SUBJECT = "proxy-alert";
3539
public static final String CERTIFICATE_NAME = "CPVMCertificate";
3640

41+
public static final ConfigKey<Boolean> NoVncConsoleDefault = new ConfigKey<Boolean>("Advanced", Boolean.class, "novnc.console.default", "true",
42+
"If true, noVNC console will be default console for virtual machines", true);
43+
3744
public void setManagementState(ConsoleProxyManagementState state);
3845

3946
public ConsoleProxyManagementState getManagementState();

‎server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
import org.apache.cloudstack.config.ApiServiceConfiguration;
3333
import org.apache.cloudstack.context.CallContext;
3434
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
35+
import org.apache.cloudstack.framework.config.ConfigKey;
36+
import org.apache.cloudstack.framework.config.Configurable;
3537
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
3638
import org.apache.cloudstack.framework.security.keys.KeysManager;
3739
import org.apache.cloudstack.framework.security.keystore.KeystoreDao;
@@ -152,7 +154,8 @@
152154
// Starting, HA, Migrating, Running state are all counted as "Open" for available capacity calculation
153155
// because sooner or later, it will be driven into Running state
154156
//
155-
public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxyManager, VirtualMachineGuru, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
157+
public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxyManager, VirtualMachineGuru, SystemVmLoadScanHandler<Long>, ResourceStateAdapter, Configurable {
158+
156159
private static final Logger s_logger = Logger.getLogger(ConsoleProxyManagerImpl.class);
157160

158161
private static final int DEFAULT_CAPACITY_SCAN_INTERVAL = 30000; // 30 seconds
@@ -1732,4 +1735,14 @@ public void setConsoleProxyAllocators(List<ConsoleProxyAllocator> consoleProxyAl
17321735
_consoleProxyAllocators = consoleProxyAllocators;
17331736
}
17341737

1738+
@Override
1739+
public String getConfigComponentName() {
1740+
return ConsoleProxyManager.class.getSimpleName();
1741+
}
1742+
1743+
@Override
1744+
public ConfigKey<?>[] getConfigKeys() {
1745+
return new ConfigKey<?>[] { NoVncConsoleDefault };
1746+
}
1747+
17351748
}

‎server/src/com/cloud/servlet/ConsoleProxyServlet.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
import org.springframework.stereotype.Component;
4141
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
4242

43+
import org.apache.cloudstack.framework.security.keys.KeysManager;
44+
import com.cloud.consoleproxy.ConsoleProxyManager;
45+
import com.cloud.vm.VmDetailConstants;
4346
import com.google.gson.Gson;
4447
import com.google.gson.GsonBuilder;
4548

46-
import org.apache.cloudstack.framework.security.keys.KeysManager;
47-
4849
import com.cloud.exception.PermissionDeniedException;
4950
import com.cloud.host.HostVO;
5051
import com.cloud.hypervisor.Hypervisor;
@@ -461,7 +462,12 @@ private String composeConsoleAccessUrl(String rootUrl, VirtualMachine vm, HostVO
461462
param.setClientTunnelSession(parsedHostInfo.third());
462463
}
463464

464-
sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
465+
if (param.getHypervHost() != null || !ConsoleProxyManager.NoVncConsoleDefault.value()) {
466+
sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param));
467+
} else {
468+
sb.append("/resource/noVNC/vnc_lite.html?port=" + ConsoleProxyManager.DEFAULT_NOVNC_PORT + "&token="
469+
+ encryptor.encryptObject(ConsoleProxyClientParam.class, param));
470+
}
465471

466472
// for console access, we need guest OS type to help implement keyboard
467473
long guestOs = vm.getGuestOSId();

‎services/console-proxy/server/pom.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,21 @@
4949
<artifactId>cloudstack-service-console-proxy-rdpclient</artifactId>
5050
<version>${project.version}</version>
5151
</dependency>
52+
<dependency>
53+
<groupId>javax.websocket</groupId>
54+
<artifactId>javax.websocket-api</artifactId>
55+
<version>1.0</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.eclipse.jetty</groupId>
59+
<artifactId>jetty-server</artifactId>
60+
<version>${cs.jetty.version}</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.eclipse.jetty.websocket</groupId>
64+
<artifactId>websocket-server</artifactId>
65+
<version>${cs.jetty.version}</version>
66+
</dependency>
5267
</dependencies>
5368
<build>
5469
<resources>

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

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
import org.apache.commons.codec.binary.Base64;
3737
import org.apache.log4j.xml.DOMConfigurator;
38+
import org.eclipse.jetty.websocket.api.Session;
3839

3940
import com.google.gson.Gson;
4041
import com.sun.net.httpserver.HttpServer;
@@ -360,12 +361,22 @@ private static void startupHttpMain() {
360361
server.createContext("/ajaximg", new ConsoleProxyAjaxImageHandler());
361362
server.setExecutor(new ThreadExecutor()); // creates a default executor
362363
server.start();
364+
365+
ConsoleProxyNoVNCServer noVNCServer = getNoVNCServer();
366+
noVNCServer.start();
367+
363368
} catch (Exception e) {
364369
s_logger.error(e.getMessage(), e);
365370
System.exit(1);
366371
}
367372
}
368373

374+
private static ConsoleProxyNoVNCServer getNoVNCServer() {
375+
if (httpListenPort == 443)
376+
return new ConsoleProxyNoVNCServer(ksBits, ksPassword);
377+
return new ConsoleProxyNoVNCServer();
378+
}
379+
369380
private static void startupHttpCmdPort() {
370381
try {
371382
s_logger.info("Listening for HTTP CMDs on port " + httpCmdListenPort);
@@ -411,7 +422,7 @@ public static ConsoleProxyClient getVncViewer(ConsoleProxyClientParam param) thr
411422
String clientKey = param.getClientMapKey();
412423
synchronized (connectionMap) {
413424
viewer = connectionMap.get(clientKey);
414-
if (viewer == null) {
425+
if (viewer == null || viewer.getClass() == ConsoleProxyNoVncClient.class) {
415426
viewer = getClient(param);
416427
viewer.initClient(param);
417428
connectionMap.put(clientKey, viewer);
@@ -445,7 +456,7 @@ public static ConsoleProxyClient getAjaxVncViewer(ConsoleProxyClientParam param,
445456
String clientKey = param.getClientMapKey();
446457
synchronized (connectionMap) {
447458
ConsoleProxyClient viewer = connectionMap.get(clientKey);
448-
if (viewer == null) {
459+
if (viewer == null || viewer.getClass() == ConsoleProxyNoVncClient.class) {
449460
authenticationExternally(param);
450461
viewer = getClient(param);
451462
viewer.initClient(param);
@@ -537,4 +548,40 @@ public void execute(Runnable r) {
537548
new Thread(r).start();
538549
}
539550
}
551+
552+
public static ConsoleProxyNoVncClient getNoVncViewer(ConsoleProxyClientParam param, String ajaxSession,
553+
Session session) throws AuthenticationException {
554+
boolean reportLoadChange = false;
555+
String clientKey = param.getClientMapKey();
556+
synchronized (connectionMap) {
557+
ConsoleProxyClient viewer = connectionMap.get(clientKey);
558+
if (viewer == null || viewer.getClass() != ConsoleProxyNoVncClient.class) {
559+
authenticationExternally(param);
560+
viewer = new ConsoleProxyNoVncClient(session);
561+
viewer.initClient(param);
562+
563+
connectionMap.put(clientKey, viewer);
564+
reportLoadChange = true;
565+
} else {
566+
if (param.getClientHostPassword() == null || param.getClientHostPassword().isEmpty() ||
567+
!param.getClientHostPassword().equals(viewer.getClientHostPassword()))
568+
throw new AuthenticationException("Cannot use the existing viewer " + viewer + ": bad sid");
569+
570+
if (!viewer.isFrontEndAlive()) {
571+
authenticationExternally(param);
572+
viewer.initClient(param);
573+
reportLoadChange = true;
574+
}
575+
}
576+
577+
if (reportLoadChange) {
578+
ConsoleProxyClientStatsCollector statsCollector = getStatsCollector();
579+
String loadInfo = statsCollector.getStatsReport();
580+
reportLoadInfo(loadInfo);
581+
if (s_logger.isDebugEnabled())
582+
s_logger.debug("Report load change : " + loadInfo);
583+
}
584+
return (ConsoleProxyNoVncClient)viewer;
585+
}
586+
}
540587
}

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

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.consoleproxy;
18+
19+
import java.io.IOException;
20+
import java.util.Map;
21+
22+
import javax.servlet.ServletException;
23+
import javax.servlet.http.HttpServletRequest;
24+
import javax.servlet.http.HttpServletResponse;
25+
26+
import com.cloud.consoleproxy.util.Logger;
27+
28+
import org.eclipse.jetty.server.Request;
29+
import org.eclipse.jetty.websocket.api.Session;
30+
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
31+
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
32+
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketFrame;
33+
import org.eclipse.jetty.websocket.api.annotations.WebSocket;
34+
import org.eclipse.jetty.websocket.api.extensions.Frame;
35+
import org.eclipse.jetty.websocket.server.WebSocketHandler;
36+
import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
37+
38+
@WebSocket
39+
public class ConsoleProxyNoVNCHandler extends WebSocketHandler {
40+
41+
private ConsoleProxyNoVncClient viewer;
42+
private static final Logger s_logger = Logger.getLogger(ConsoleProxyNoVNCHandler.class);
43+
44+
public ConsoleProxyNoVNCHandler() {
45+
super();
46+
}
47+
48+
@Override
49+
public void configure(WebSocketServletFactory webSocketServletFactory) {
50+
webSocketServletFactory.register(ConsoleProxyNoVNCHandler.class);
51+
}
52+
53+
@Override
54+
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
55+
throws IOException, ServletException {
56+
57+
if (this.getWebSocketFactory().isUpgradeRequest(request, response)) {
58+
response.addHeader("Sec-WebSocket-Protocol", "binary");
59+
if (this.getWebSocketFactory().acceptWebSocket(request, response)) {
60+
baseRequest.setHandled(true);
61+
return;
62+
}
63+
64+
if (response.isCommitted()) {
65+
return;
66+
}
67+
}
68+
69+
super.handle(target, baseRequest, request, response);
70+
}
71+
72+
@OnWebSocketConnect
73+
public void onConnect(final Session session) throws IOException, InterruptedException {
74+
75+
String queries = session.getUpgradeRequest().getQueryString();
76+
Map<String, String> queryMap = ConsoleProxyHttpHandlerHelper.getQueryMap(queries);
77+
78+
String host = queryMap.get("host");
79+
String portStr = queryMap.get("port");
80+
String sid = queryMap.get("sid");
81+
String tag = queryMap.get("tag");
82+
String ticket = queryMap.get("ticket");
83+
String ajaxSessionIdStr = queryMap.get("sess");
84+
String console_url = queryMap.get("consoleurl");
85+
String console_host_session = queryMap.get("sessionref");
86+
String vm_locale = queryMap.get("locale");
87+
String hypervHost = queryMap.get("hypervHost");
88+
String username = queryMap.get("username");
89+
String password = queryMap.get("password");
90+
91+
if (tag == null)
92+
tag = "";
93+
94+
long ajaxSessionId = 0;
95+
int port;
96+
97+
if (host == null || portStr == null || sid == null)
98+
throw new IllegalArgumentException();
99+
100+
try {
101+
port = Integer.parseInt(portStr);
102+
} catch (NumberFormatException e) {
103+
s_logger.warn("Invalid number parameter in query string: " + portStr);
104+
throw new IllegalArgumentException(e);
105+
}
106+
107+
if (ajaxSessionIdStr != null) {
108+
try {
109+
ajaxSessionId = Long.parseLong(ajaxSessionIdStr);
110+
} catch (NumberFormatException e) {
111+
s_logger.warn("Invalid number parameter in query string: " + ajaxSessionIdStr);
112+
throw new IllegalArgumentException(e);
113+
}
114+
}
115+
116+
try {
117+
ConsoleProxyClientParam param = new ConsoleProxyClientParam();
118+
param.setClientHostAddress(host);
119+
param.setClientHostPort(port);
120+
param.setClientHostPassword(sid);
121+
param.setClientTag(tag);
122+
param.setTicket(ticket);
123+
param.setClientTunnelUrl(console_url);
124+
param.setClientTunnelSession(console_host_session);
125+
param.setLocale(vm_locale);
126+
param.setHypervHost(hypervHost);
127+
param.setUsername(username);
128+
param.setPassword(password);
129+
viewer = ConsoleProxy.getNoVncViewer(param, ajaxSessionIdStr, session);
130+
} catch (Exception e) {
131+
s_logger.warn("Failed to create viewer due to " + e.getMessage(), e);
132+
return;
133+
}
134+
}
135+
136+
@OnWebSocketClose
137+
public void onClose(Session session, int statusCode, String reason) throws IOException, InterruptedException {
138+
ConsoleProxy.removeViewer(viewer);
139+
}
140+
141+
@OnWebSocketFrame
142+
public void onFrame(Frame f) throws IOException {
143+
viewer.sendClientFrame(f);
144+
}
145+
}

0 commit comments

Comments
 (0)