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

GUAC-574: Synchronize across ActiveConnectionMap to prevent connection usage race conditions. Need to revisit architecture of connection management within MySQL.

Browse Source
This commit is contained in:
Michael Jumper
2014-03-26 16:47:27 -07:00
parent 633535c83e
commit b6ccf4c2f3
3 changed files with 77 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java
View File

@@ -39,7 +39,7 @@ public class MySQLGuacamoleSocket implements GuacamoleSocket {
* Injected ActiveConnectionMap which will contain all active connections. * Injected ActiveConnectionMap which will contain all active connections.
*/ */
@Inject @Inject
private ActiveConnectionMap activeConnectionSet; private ActiveConnectionMap activeConnectionMap;
/** /**
* The wrapped socket. * The wrapped socket.
@@ -67,7 +67,7 @@ public class MySQLGuacamoleSocket implements GuacamoleSocket {
* @param connectionGroupID The ID of the balancing connection group that is * @param connectionGroupID The ID of the balancing connection group that is
* being connected to; null if not used. * being connected to; null if not used.
*/ */
public void init(GuacamoleSocket socket, int connectionID, int userID, public void init(GuacamoleSocket socket,
int historyID, Integer connectionGroupID) { int historyID, Integer connectionGroupID) {
this.socket = socket; this.socket = socket;
this.historyID = historyID; this.historyID = historyID;
@@ -91,7 +91,10 @@ public class MySQLGuacamoleSocket implements GuacamoleSocket {
socket.close(); socket.close();
// Mark this connection as inactive // Mark this connection as inactive
activeConnectionSet.closeConnection(historyID, connectionGroupID); synchronized (activeConnectionMap) {
activeConnectionMap.closeConnection(historyID, connectionGroupID);
}
} }
@Override @Override

7
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java
View File

@@ -176,7 +176,7 @@ public class ConnectionGroupService {
* Connect to the connection within the given group with the lowest number * Connect to the connection within the given group with the lowest number
* of currently active users. * of currently active users.
* *
* @param connection The group to load balance across. * @param group The group to load balance across.
* @param info The information to use when performing the connection * @param info The information to use when performing the connection
* handshake. * handshake.
* @param userID The ID of the user who is connecting to the socket. * @param userID The ID of the user who is connecting to the socket.
@@ -191,6 +191,8 @@ public class ConnectionGroupService {
List<Integer> connectionIDs = connectionService.getAllConnectionIDs List<Integer> connectionIDs = connectionService.getAllConnectionIDs
(group.getConnectionGroupID()); (group.getConnectionGroupID());
synchronized (activeConnectionMap) {
// Get the least used connection. // Get the least used connection.
Integer leastUsedConnectionID = Integer leastUsedConnectionID =
activeConnectionMap.getLeastUsedConnection(connectionIDs); activeConnectionMap.getLeastUsedConnection(connectionIDs);
@@ -216,6 +218,9 @@ public class ConnectionGroupService {
// Connect to the connection // Connect to the connection
return connectionService.connect(connection, info, userID, group.getConnectionGroupID()); return connectionService.connect(connection, info, userID, group.getConnectionGroupID());
}
} }
/** /**

7
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java
View File

@@ -322,6 +322,8 @@ public class ConnectionService {
GuacamoleClientInformation info, int userID, Integer connectionGroupID) GuacamoleClientInformation info, int userID, Integer connectionGroupID)
throws GuacamoleException { throws GuacamoleException {
synchronized (activeConnectionMap) {
// If the given connection is active, and multiple simultaneous // If the given connection is active, and multiple simultaneous
// connections are not allowed, disallow connection // connections are not allowed, disallow connection
if(GuacamoleProperties.getProperty( if(GuacamoleProperties.getProperty(
@@ -358,13 +360,14 @@ public class ConnectionService {
// Return new MySQLGuacamoleSocket // Return new MySQLGuacamoleSocket
MySQLGuacamoleSocket mySQLGuacamoleSocket = mySQLGuacamoleSocketProvider.get(); MySQLGuacamoleSocket mySQLGuacamoleSocket = mySQLGuacamoleSocketProvider.get();
mySQLGuacamoleSocket.init(socket, connection.getConnectionID(), userID, mySQLGuacamoleSocket.init(socket, historyID, connectionGroupID);
historyID, connectionGroupID);
return mySQLGuacamoleSocket; return mySQLGuacamoleSocket;
} }
}
/** /**
* Creates a new connection having the given name and protocol. * Creates a new connection having the given name and protocol.
* *