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

GUACAMOLE-5: Do not attempt to join a closed connection.

Browse Source
This commit is contained in:
Michael Jumper
2016-07-21 15:16:34 -07:00
parent 43761ef482
commit 702441d720
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
View File

@@ -467,7 +467,7 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
// Verify that the connection ID is known // Verify that the connection ID is known
String connectionID = activeConnection.getConnectionID(); String connectionID = activeConnection.getConnectionID();
if (connectionID == null) if (!activeConnection.isActive() || connectionID == null)
throw new GuacamoleResourceNotFoundException("No existing connection to be joined."); throw new GuacamoleResourceNotFoundException("No existing connection to be joined.");
// Build configuration from the sharing profile and the ID of // Build configuration from the sharing profile and the ID of

8
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ActiveConnectionRecord.java
View File

@@ -36,8 +36,7 @@ import org.apache.guacamole.protocol.ConfiguredGuacamoleSocket;
/** /**
* A connection record implementation that describes an active connection. As * A connection record implementation that describes an active connection. As
* the associated connection has not yet ended, getEndDate() will always return * the associated connection has not yet ended, getEndDate() will always return
* null, and isActive() will always return true. The associated start date will * null. The associated start date will be the time of this objects creation.
* be the time of this objects creation.
* *
* @author Michael Jumper * @author Michael Jumper
*/ */
@@ -325,10 +324,7 @@ public class ActiveConnectionRecord implements ConnectionRecord {
@Override @Override
public boolean isActive() { public boolean isActive() {
return tunnel != null && tunnel.isOpen();
// Active connections are active by definition
return true;
} }
/** /**