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

Ticket #263: Fixed a couple of bugs after testing.

Browse Source
This commit is contained in:
James Muehlner
2013-08-09 00:12:14 -07:00
parent e7ec3399c6
commit c4e3ff1122
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java
View File

@@ -48,6 +48,7 @@ import net.sourceforge.guacamole.net.auth.AuthenticationProvider;
import net.sourceforge.guacamole.net.auth.Credentials; import net.sourceforge.guacamole.net.auth.Credentials;
import net.sourceforge.guacamole.net.auth.UserContext; import net.sourceforge.guacamole.net.auth.UserContext;
import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupMapper; import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupMapper;
import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupPermissionMapper;
import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionHistoryMapper; import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionHistoryMapper;
import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper; import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper;
import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionParameterMapper; import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionParameterMapper;
@@ -159,6 +160,7 @@ public class MySQLAuthenticationProvider implements AuthenticationProvider {
addMapperClass(ConnectionHistoryMapper.class); addMapperClass(ConnectionHistoryMapper.class);
addMapperClass(ConnectionMapper.class); addMapperClass(ConnectionMapper.class);
addMapperClass(ConnectionGroupMapper.class); addMapperClass(ConnectionGroupMapper.class);
addMapperClass(ConnectionGroupPermissionMapper.class);
addMapperClass(ConnectionParameterMapper.class); addMapperClass(ConnectionParameterMapper.class);
addMapperClass(ConnectionPermissionMapper.class); addMapperClass(ConnectionPermissionMapper.class);
addMapperClass(SystemPermissionMapper.class); addMapperClass(SystemPermissionMapper.class);

3
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java
View File

@@ -150,11 +150,12 @@ public class MySQLConnectionGroup extends AbstractConnectionGroup {
* @param userID The IID of the user who queried this connection. * @param userID The IID of the user who queried this connection.
*/ */
public void init(Integer connectionGroupID, Integer parentID, String name, public void init(Integer connectionGroupID, Integer parentID, String name,
String identifier, String type, int userID) { String identifier, ConnectionGroup.Type type, int userID) {
this.connectionGroupID = connectionGroupID; this.connectionGroupID = connectionGroupID;
this.parentID = parentID; this.parentID = parentID;
setName(name); setName(name);
setIdentifier(identifier); setIdentifier(identifier);
setType(type);
this.userID = userID; this.userID = userID;
connectionDirectory = connectionDirectoryProvider.get(); connectionDirectory = connectionDirectoryProvider.get();

12
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java
View File

@@ -65,11 +65,10 @@ public class MySQLUserContext implements UserContext {
private UserDirectory userDirectory; private UserDirectory userDirectory;
/** /**
* User directory restricted by the permissions of the user associated * The root connection group.
* with this context.
*/ */
@Inject @Inject
private MySQLConnectionGroup mySQLConnectionGroup; private MySQLConnectionGroup rootConnectionGroup;
/** /**
* Service for accessing users. * Service for accessing users.
@@ -85,9 +84,10 @@ public class MySQLUserContext implements UserContext {
public void init(int user_id) { public void init(int user_id) {
this.user_id = user_id; this.user_id = user_id;
userDirectory.init(user_id); userDirectory.init(user_id);
mySQLConnectionGroup.init(null, null, MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER, rootConnectionGroup.init(null, null,
MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER, MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER,
MySQLConstants.CONNECTION_GROUP_ORGANIZATIONAL, user_id); MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER,
ConnectionGroup.Type.ORGANIZATIONAL, user_id);
} }
@Override @Override
@@ -102,7 +102,7 @@ public class MySQLUserContext implements UserContext {
@Override @Override
public ConnectionGroup getConnectionGroup() throws GuacamoleException { public ConnectionGroup getConnectionGroup() throws GuacamoleException {
return mySQLConnectionGroup; return rootConnectionGroup;
} }
} }

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

@@ -283,12 +283,21 @@ public class ConnectionGroupService {
// Create new MySQLConnection from retrieved data // Create new MySQLConnection from retrieved data
MySQLConnectionGroup mySQLConnectionGroup = mysqlConnectionGroupProvider.get(); MySQLConnectionGroup mySQLConnectionGroup = mysqlConnectionGroupProvider.get();
String mySqlType = connectionGroup.getType();
net.sourceforge.guacamole.net.auth.ConnectionGroup.Type authType;
if(mySqlType.equals(MySQLConstants.CONNECTION_GROUP_ORGANIZATIONAL))
authType = net.sourceforge.guacamole.net.auth.ConnectionGroup.Type.ORGANIZATIONAL;
else
authType = net.sourceforge.guacamole.net.auth.ConnectionGroup.Type.BALANCING;
mySQLConnectionGroup.init( mySQLConnectionGroup.init(
connectionGroup.getConnection_group_id(), connectionGroup.getConnection_group_id(),
connectionGroup.getParent_id(), connectionGroup.getParent_id(),
connectionGroup.getConnection_group_name(), connectionGroup.getConnection_group_name(),
Integer.toString(connectionGroup.getConnection_group_id()), Integer.toString(connectionGroup.getConnection_group_id()),
connectionGroup.getType(), authType,
userID userID
); );