safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-504: Reimplement closeConnection() with int parameters.

Browse Source
This commit is contained in:
Nick Couchman
2018-02-10 15:13:19 -05:00
parent e996a5a299
commit bb1670a808
4 changed files with 67 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
View File

@@ -73,14 +73,12 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
* @param guac_status The status to send. * @param guac_status The status to send.
* @param webSocketCode The numeric WebSocket status to send. * @param webSocketCode The numeric WebSocket status to send.
*/ */
private void closeConnection(Session session, GuacamoleStatus guac_status, private void closeConnection(Session session, int guacamoleStatusCode,
Integer webSocketCode) { int webSocketCode) {
try { try {
if (webSocketCode == null)
webSocketCode = guac_status.getWebSocketCode();
CloseCode code = CloseReason.CloseCodes.getCloseCode(webSocketCode); CloseCode code = CloseReason.CloseCodes.getCloseCode(webSocketCode);
String message = Integer.toString(guac_status.getGuacamoleStatusCode()); String message = Integer.toString(guacamoleStatusCode);
session.close(new CloseReason(code, message)); session.close(new CloseReason(code, message));
} }
catch (IOException e) { catch (IOException e) {
@@ -113,7 +111,8 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
// Get tunnel // Get tunnel
tunnel = createTunnel(session, config); tunnel = createTunnel(session, config);
if (tunnel == null) { if (tunnel == null) {
closeConnection(session, GuacamoleStatus.RESOURCE_NOT_FOUND, null); closeConnection(session, GuacamoleStatus.RESOURCE_NOT_FOUND.getGuacamoleStatusCode(),
GuacamoleStatus.RESOURCE_NOT_FOUND.getWebSocketCode());
return; return;
} }
@@ -121,7 +120,7 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
catch (GuacamoleException e) { catch (GuacamoleException e) {
logger.error("Creation of WebSocket tunnel to guacd failed: {}", e.getMessage()); logger.error("Creation of WebSocket tunnel to guacd failed: {}", e.getMessage());
logger.debug("Error connecting WebSocket tunnel.", e); logger.debug("Error connecting WebSocket tunnel.", e);
closeConnection(session, e.getStatus(), e.getWebSocketCode()); closeConnection(session, e.getStatus().getGuacamoleStatusCode(), e.getWebSocketCode());
return; return;
} }
@@ -175,7 +174,8 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
} }
// No more data // No more data
closeConnection(session, GuacamoleStatus.SUCCESS, null); closeConnection(session, GuacamoleStatus.SUCCESS.getGuacamoleStatusCode(),
GuacamoleStatus.SUCCESS.getWebSocketCode());
} }
@@ -185,22 +185,24 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
catch (GuacamoleClientException e) { catch (GuacamoleClientException e) {
logger.info("WebSocket connection terminated: {}", e.getMessage()); logger.info("WebSocket connection terminated: {}", e.getMessage());
logger.debug("WebSocket connection terminated due to client error.", e); logger.debug("WebSocket connection terminated due to client error.", e);
closeConnection(session, e.getStatus(), e.getWebSocketCode()); closeConnection(session, e.getStatus().getGuacamoleStatusCode(), e.getWebSocketCode());
} }
catch (GuacamoleConnectionClosedException e) { catch (GuacamoleConnectionClosedException e) {
logger.debug("Connection to guacd closed.", e); logger.debug("Connection to guacd closed.", e);
closeConnection(session, GuacamoleStatus.SUCCESS, null); closeConnection(session, GuacamoleStatus.SUCCESS.getGuacamoleStatusCode(),
GuacamoleStatus.SUCCESS.getWebSocketCode());
} }
catch (GuacamoleException e) { catch (GuacamoleException e) {
logger.error("Connection to guacd terminated abnormally: {}", e.getMessage()); logger.error("Connection to guacd terminated abnormally: {}", e.getMessage());
logger.debug("Internal error during connection to guacd.", e); logger.debug("Internal error during connection to guacd.", e);
closeConnection(session, e.getStatus(), e.getWebSocketCode()); closeConnection(session, e.getStatus().getGuacamoleStatusCode(), e.getWebSocketCode());
} }
} }
catch (IOException e) { catch (IOException e) {
logger.debug("I/O error prevents further reads.", e); logger.debug("I/O error prevents further reads.", e);
closeConnection(session, GuacamoleStatus.SERVER_ERROR, null); closeConnection(session, GuacamoleStatus.SERVER_ERROR.getGuacamoleStatusCode(),
GuacamoleStatus.SERVER_ERROR.getWebSocketCode());
} }
} }

32
guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
View File

@@ -61,13 +61,10 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
* @param webSocketCode The numeric WebSocket status code to send. * @param webSocketCode The numeric WebSocket status code to send.
*/ */
private static void closeConnection(Connection connection, private static void closeConnection(Connection connection,
GuacamoleStatus guac_status, Integer webSocketCode) { int guacamoleStatusCode, int webSocketCode) {
if (webSocketCode == null)
webSocketCode = guac_status.getWebSocketCode();
connection.close(webSocketCode, connection.close(webSocketCode,
Integer.toString(guac_status.getGuacamoleStatusCode())); Integer.toString(guacamoleStatusCode));
} }
@@ -118,13 +115,16 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
catch (GuacamoleException e) { catch (GuacamoleException e) {
logger.error("Creation of WebSocket tunnel to guacd failed: {}", e.getMessage()); logger.error("Creation of WebSocket tunnel to guacd failed: {}", e.getMessage());
logger.debug("Error connecting WebSocket tunnel.", e); logger.debug("Error connecting WebSocket tunnel.", e);
closeConnection(connection, e.getStatus(), e.getWebSocketCode()); closeConnection(connection, e.getStatus().getGuacamoleStatusCode(),
e.getWebSocketCode());
return; return;
} }
// Do not start connection if tunnel does not exist // Do not start connection if tunnel does not exist
if (tunnel == null) { if (tunnel == null) {
closeConnection(connection, GuacamoleStatus.RESOURCE_NOT_FOUND, null); closeConnection(connection,
GuacamoleStatus.RESOURCE_NOT_FOUND.getGuacamoleStatusCode(),
GuacamoleStatus.RESOURCE_NOT_FOUND.getWebSocketCode());
return; return;
} }
@@ -162,7 +162,9 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
} }
// No more data // No more data
closeConnection(connection, GuacamoleStatus.SUCCESS, null); closeConnection(connection,
GuacamoleStatus.SUCCESS.getGuacamoleStatusCode(),
GuacamoleStatus.SUCCESS.getWebSocketCode());
} }
@@ -172,22 +174,28 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
catch (GuacamoleClientException e) { catch (GuacamoleClientException e) {
logger.info("WebSocket connection terminated: {}", e.getMessage()); logger.info("WebSocket connection terminated: {}", e.getMessage());
logger.debug("WebSocket connection terminated due to client error.", e); logger.debug("WebSocket connection terminated due to client error.", e);
closeConnection(connection, e.getStatus(), e.getWebSocketCode()); closeConnection(connection, e.getStatus().getGuacamoleStatusCode(),
e.getWebSocketCode());
} }
catch (GuacamoleConnectionClosedException e) { catch (GuacamoleConnectionClosedException e) {
logger.debug("Connection to guacd closed.", e); logger.debug("Connection to guacd closed.", e);
closeConnection(connection, GuacamoleStatus.SUCCESS, null); closeConnection(connection,
GuacamoleStatus.SUCCESS.getGuacamoleStatusCode(),
GuacamoleStatus.SUCCESS.getWebSocketCode());
} }
catch (GuacamoleException e) { catch (GuacamoleException e) {
logger.error("Connection to guacd terminated abnormally: {}", e.getMessage()); logger.error("Connection to guacd terminated abnormally: {}", e.getMessage());
logger.debug("Internal error during connection to guacd.", e); logger.debug("Internal error during connection to guacd.", e);
closeConnection(connection, e.getStatus(), e.getWebSocketCode()); closeConnection(connection, e.getStatus().getGuacamoleStatusCode(),
e.getWebSocketCode());
} }
} }
catch (IOException e) { catch (IOException e) {
logger.debug("WebSocket tunnel read failed due to I/O error.", e); logger.debug("WebSocket tunnel read failed due to I/O error.", e);
closeConnection(connection, GuacamoleStatus.SERVER_ERROR, null); closeConnection(connection,
GuacamoleStatus.SERVER_ERROR.getGuacamoleStatusCode(),
GuacamoleStatus.SERVER_ERROR.getWebSocketCode());
} }
} }

28
guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
View File

@@ -64,13 +64,11 @@ public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListe
* @param guac_status The status to send. * @param guac_status The status to send.
* @param webSocketCode The numeric WebSocket status code to send. * @param webSocketCode The numeric WebSocket status code to send.
*/ */
private void closeConnection(Session session, GuacamoleStatus guac_status, private void closeConnection(Session session, int guacamoleStatusCode,
Integer webSocketCode) { int webSocketCode) {
try { try {
if (webSocketCode == null) String message = Integer.toString(guacamoleStatusCode);
webSocketCode = guac_status.getWebSocketCode();
String message = Integer.toString(guac_status.getGuacamoleStatusCode());
session.close(new CloseStatus(webSocketCode, message)); session.close(new CloseStatus(webSocketCode, message));
} }
catch (IOException e) { catch (IOException e) {
@@ -100,7 +98,8 @@ public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListe
// Get tunnel // Get tunnel
tunnel = createTunnel(session); tunnel = createTunnel(session);
if (tunnel == null) { if (tunnel == null) {
closeConnection(session, GuacamoleStatus.RESOURCE_NOT_FOUND, null); closeConnection(session, GuacamoleStatus.RESOURCE_NOT_FOUND.getGuacamoleStatusCode(),
GuacamoleStatus.RESOURCE_NOT_FOUND.getWebSocketCode());
return; return;
} }
@@ -108,7 +107,7 @@ public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListe
catch (GuacamoleException e) { catch (GuacamoleException e) {
logger.error("Creation of WebSocket tunnel to guacd failed: {}", e.getMessage()); logger.error("Creation of WebSocket tunnel to guacd failed: {}", e.getMessage());
logger.debug("Error connecting WebSocket tunnel.", e); logger.debug("Error connecting WebSocket tunnel.", e);
closeConnection(session, e.getStatus(), e.getWebSocketCode()); closeConnection(session, e.getStatus().getGuacamoleStatusCode(), e.getWebSocketCode());
return; return;
} }
@@ -152,7 +151,8 @@ public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListe
} }
// No more data // No more data
closeConnection(session, GuacamoleStatus.SUCCESS, null); closeConnection(session, GuacamoleStatus.SUCCESS.getGuacamoleStatusCode(),
GuacamoleStatus.SUCCESS.getWebSocketCode());
} }
@@ -162,22 +162,26 @@ public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListe
catch (GuacamoleClientException e) { catch (GuacamoleClientException e) {
logger.info("WebSocket connection terminated: {}", e.getMessage()); logger.info("WebSocket connection terminated: {}", e.getMessage());
logger.debug("WebSocket connection terminated due to client error.", e); logger.debug("WebSocket connection terminated due to client error.", e);
closeConnection(session, e.getStatus(), e.getWebSocketCode()); closeConnection(session, e.getStatus().getGuacamoleStatusCode(),
e.getWebSocketCode());
} }
catch (GuacamoleConnectionClosedException e) { catch (GuacamoleConnectionClosedException e) {
logger.debug("Connection to guacd closed.", e); logger.debug("Connection to guacd closed.", e);
closeConnection(session, GuacamoleStatus.SUCCESS, null); closeConnection(session, GuacamoleStatus.SUCCESS.getGuacamoleStatusCode(),
GuacamoleStatus.SUCCESS.getWebSocketCode());
} }
catch (GuacamoleException e) { catch (GuacamoleException e) {
logger.error("Connection to guacd terminated abnormally: {}", e.getMessage()); logger.error("Connection to guacd terminated abnormally: {}", e.getMessage());
logger.debug("Internal error during connection to guacd.", e); logger.debug("Internal error during connection to guacd.", e);
closeConnection(session, e.getStatus(), e.getWebSocketCode()); closeConnection(session, e.getStatus().getGuacamoleStatusCode(),
e.getWebSocketCode());
} }
} }
catch (IOException e) { catch (IOException e) {
logger.debug("I/O error prevents further reads.", e); logger.debug("I/O error prevents further reads.", e);
closeConnection(session, GuacamoleStatus.SERVER_ERROR, null); closeConnection(session, GuacamoleStatus.SERVER_ERROR.getGuacamoleStatusCode(),
GuacamoleStatus.SERVER_ERROR.getWebSocketCode());
} }
} }

29
guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
View File

@@ -65,13 +65,11 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
* @param guac_status The status to send. * @param guac_status The status to send.
* @param webSocketCode The numeric WebSocket status code to send. * @param webSocketCode The numeric WebSocket status code to send.
*/ */
private void closeConnection(WsOutbound outbound, GuacamoleStatus guac_status, private void closeConnection(WsOutbound outbound, int guacamoleStatusCode,
Integer webSocketCode) { int webSocketCode) {
try { try {
if (webSocketCode == null) byte[] message = Integer.toString(guacamoleStatusCode).getBytes("UTF-8");
webSocketCode = guac_status.getWebSocketCode();
byte[] message = Integer.toString(guac_status.getGuacamoleStatusCode()).getBytes("UTF-8");
outbound.close(webSocketCode, ByteBuffer.wrap(message)); outbound.close(webSocketCode, ByteBuffer.wrap(message));
} }
catch (IOException e) { catch (IOException e) {
@@ -146,13 +144,15 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
catch (GuacamoleException e) { catch (GuacamoleException e) {
logger.error("Creation of WebSocket tunnel to guacd failed: {}", e.getMessage()); logger.error("Creation of WebSocket tunnel to guacd failed: {}", e.getMessage());
logger.debug("Error connecting WebSocket tunnel.", e); logger.debug("Error connecting WebSocket tunnel.", e);
closeConnection(outbound, e.getStatus(), e.getWebSocketCode()); closeConnection(outbound, e.getStatus().getGuacamoleStatusCode(),
e.getWebSocketCode());
return; return;
} }
// Do not start connection if tunnel does not exist // Do not start connection if tunnel does not exist
if (tunnel == null) { if (tunnel == null) {
closeConnection(outbound, GuacamoleStatus.RESOURCE_NOT_FOUND, null); closeConnection(outbound, GuacamoleStatus.RESOURCE_NOT_FOUND.getGuacamoleStatusCode(),
GuacamoleStatus.RESOURCE_NOT_FOUND.getWebSocketCode());
return; return;
} }
@@ -190,7 +190,8 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
} }
// No more data // No more data
closeConnection(outbound, GuacamoleStatus.SUCCESS, null); closeConnection(outbound, GuacamoleStatus.SUCCESS.getGuacamoleStatusCode(),
GuacamoleStatus.SUCCESS.getWebSocketCode());
} }
@@ -200,22 +201,26 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
catch (GuacamoleClientException e) { catch (GuacamoleClientException e) {
logger.info("WebSocket connection terminated: {}", e.getMessage()); logger.info("WebSocket connection terminated: {}", e.getMessage());
logger.debug("WebSocket connection terminated due to client error.", e); logger.debug("WebSocket connection terminated due to client error.", e);
closeConnection(outbound, e.getStatus(), e.getWebSocketCode()); closeConnection(outbound, e.getStatus().getGuacamoleStatusCode(),
e.getWebSocketCode());
} }
catch (GuacamoleConnectionClosedException e) { catch (GuacamoleConnectionClosedException e) {
logger.debug("Connection to guacd closed.", e); logger.debug("Connection to guacd closed.", e);
closeConnection(outbound, GuacamoleStatus.SUCCESS, null); closeConnection(outbound, GuacamoleStatus.SUCCESS.getGuacamoleStatusCode(),
GuacamoleStatus.SUCCESS.getWebSocketCode());
} }
catch (GuacamoleException e) { catch (GuacamoleException e) {
logger.error("Connection to guacd terminated abnormally: {}", e.getMessage()); logger.error("Connection to guacd terminated abnormally: {}", e.getMessage());
logger.debug("Internal error during connection to guacd.", e); logger.debug("Internal error during connection to guacd.", e);
closeConnection(outbound, e.getStatus(), e.getWebSocketCode()); closeConnection(outbound, e.getStatus().getGuacamoleStatusCode(),
e.getWebSocketCode());
} }
} }
catch (IOException e) { catch (IOException e) {
logger.debug("I/O error prevents further reads.", e); logger.debug("I/O error prevents further reads.", e);
closeConnection(outbound, GuacamoleStatus.SERVER_ERROR, null); closeConnection(outbound, GuacamoleStatus.SERVER_ERROR.getGuacamoleStatusCode(),
GuacamoleStatus.SERVER_ERROR.getWebSocketCode());
} }
} }