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

Ticket #263: Checking correct parentID for move().

Browse Source
This commit is contained in:
James Muehlner
2013-08-14 21:45:13 -07:00
parent 5dcbd24206
commit 2f239ca203
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,7 +329,8 @@ public class ConnectionDirectory implements Directory<String, Connection>{
// Verify that no connection already exists with this name.
MySQLConnection previousConnection =
connectionService.retrieveConnection(mySQLConnection.getName(), parentID, user_id);
connectionService.retrieveConnection(mySQLConnection.getName(),
toConnectionGroupID, user_id);
if(previousConnection != null)
throw new GuacamoleClientException("That connection name is already in use.");

4
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
View File

@@ -48,7 +48,6 @@ import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupPermissionMap
import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupPermissionKey;
import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;
import net.sourceforge.guacamole.net.auth.mysql.service.PermissionCheckService;
import net.sourceforge.guacamole.net.auth.permission.ObjectPermission;
import org.mybatis.guice.transactional.Transactional;
/**
@@ -279,7 +278,8 @@ public class ConnectionGroupDirectory implements Directory<String, ConnectionGro
// Verify that no connection already exists with this name.
MySQLConnectionGroup previousConnectionGroup =
connectionGroupService.retrieveConnectionGroup(mySQLConnectionGroup.getName(), parentID, user_id);
connectionGroupService.retrieveConnectionGroup(mySQLConnectionGroup.getName(),
toConnectionGroupID, user_id);
if(previousConnectionGroup != null)
throw new GuacamoleClientException("That connection group name is already in use.");