safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-878: Prefer WebSocket from JSR. Warn if HTTP used instead.

Browse Source
This commit is contained in:
Michael Jumper
2014-10-12 22:17:59 -07:00
parent 59356af44e
commit 115f647f7a
2 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
View File

@@ -44,6 +44,10 @@ public class BasicGuacamoleTunnelServlet extends GuacamoleHTTPTunnelServlet {
@Override
protected GuacamoleTunnel doConnect(HttpServletRequest request) throws GuacamoleException {
// Warn of lack of WebSocket
logger.warn("Using HTTP tunnel (not WebSocket). Performance may be sub-optimal.");
return BasicTunnelRequestUtility.createTunnel(new HTTPTunnelRequest(request));
}

43
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketSupportLoader.java
View File

@@ -60,6 +60,39 @@ public class WebSocketSupportLoader implements ServletContextListener {
"org.glyptodon.guacamole.net.basic.websocket.tomcat.BasicGuacamoleWebSocketTunnelServlet"
};
/**
* Checks for JSR 356 support, returning true if such support is found, and
* false otherwise.
*
* @return true if support for JSR 356 is found, false otherwise.
*/
private boolean implementsJSR_356() {
try {
// Attempt to find WebSocket servlet
GuacamoleClassLoader.getInstance().findClass("javax.websocket.Endpoint");
// JSR 356 found
return true;
}
// If no such servlet class, this particular WebSocket support
// is not present
catch (ClassNotFoundException e) {}
catch (NoClassDefFoundError e) {}
// Log all GuacamoleExceptions
catch (GuacamoleException e) {
logger.error("Unable to load/detect WebSocket support.", e);
}
// JSR 356 not found
return false;
}
private boolean loadWebSocketTunnel(ServletContext context, String classname) {
try {
@@ -129,6 +162,12 @@ public class WebSocketSupportLoader implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent sce) {
// Check for JSR 356 support
if (implementsJSR_356()) {
logger.info("JSR-356 WebSocket support present.");
return;
}
// Try to load each WebSocket tunnel in sequence
for (String classname : WEBSOCKET_CLASSES) {
if (loadWebSocketTunnel(sce.getServletContext(), classname)) {
@@ -137,8 +176,8 @@ public class WebSocketSupportLoader implements ServletContextListener {
}
}
// No legacy WebSocket support found (usually good)
logger.debug("Legacy WebSocket support NOT loaded.");
// Warn of lack of WebSocket
logger.debug("WebSocket support NOT present. Only HTTP will be used.");
}