From 1ba07bc03b40941db9f1f8ec2de444f1818df83d Mon Sep 17 00:00:00 2001
From: James Muehlner <james.muehlner@guac-dev.org>
Date: Thu, 15 Aug 2013 10:33:31 -0700
Subject: [PATCH] Ticket #263: Make sure that no group cycles can be created,
 and change it so you can move items to ROOT.

---
 .../guacamole/net/auth/mysql/ConnectionDirectory.java  |  6 +++---
 .../net/auth/mysql/ConnectionGroupDirectory.java       | 10 +++++-----
 .../net/auth/mysql/service/ConnectionGroupService.java |  4 ++--
 .../net/auth/mysql/service/ConnectionService.java      |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
index d599ca405..89f354170 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
@@ -295,16 +295,16 @@ public class ConnectionDirectory implements Directory<String, Connection>{
             throws GuacamoleException {
         
         if(!(directory instanceof ConnectionDirectory))
-            throw new GuacamoleException("Directory not from database");
+            throw new GuacamoleClientException("Directory not from database");
         
-        int toConnectionGroupID = ((ConnectionDirectory)directory).parentID;
+        Integer toConnectionGroupID = ((ConnectionDirectory)directory).parentID;
         
         // Get connection
         MySQLConnection mySQLConnection =
                 connectionService.retrieveConnection(identifier, user_id);
         
         if(mySQLConnection == null)
-            throw new GuacamoleException("Connection not found.");
+            throw new GuacamoleClientException("Connection not found.");
 
         // Verify permission to update the connection
         permissionCheckService.verifyConnectionAccess(this.user_id,
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
index 73af05804..7af77ce19 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
@@ -244,19 +244,19 @@ public class ConnectionGroupDirectory implements Directory<String, ConnectionGro
             throws GuacamoleException {
         
         if(MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER.equals(identifier))
-            throw new GuacamoleException("The root connection group cannot be moved.");
+            throw new GuacamoleClientException("The root connection group cannot be moved.");
         
         if(!(directory instanceof ConnectionGroupDirectory))
-            throw new GuacamoleException("Directory not from database");
+            throw new GuacamoleClientException("Directory not from database");
         
-        int toConnectionGroupID = ((ConnectionGroupDirectory)directory).parentID;
+        Integer toConnectionGroupID = ((ConnectionGroupDirectory)directory).parentID;
 
         // Get connection group
         MySQLConnectionGroup mySQLConnectionGroup =
                 connectionGroupService.retrieveConnectionGroup(identifier, user_id);
         
         if(mySQLConnectionGroup == null)
-            throw new GuacamoleException("Connection group not found.");
+            throw new GuacamoleClientException("Connection group not found.");
 
         // Verify permission to update the connection
         permissionCheckService.verifyConnectionAccess(this.user_id,
@@ -290,7 +290,7 @@ public class ConnectionGroupDirectory implements Directory<String, ConnectionGro
         Integer relativeParentID = toConnectionGroupID;
         while(relativeParentID != null) {
             if(relativeParentID == mySQLConnectionGroup.getConnectionGroupID())
-                throw new GuacamoleException("Connection group cycle detected.");
+                throw new GuacamoleClientException("Connection group cycle detected.");
             
             MySQLConnectionGroup relativeParentGroup = connectionGroupService.
                     retrieveConnectionGroup(relativeParentID, user_id);
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java
index b5e46205b..56cb98bbe 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java
@@ -390,8 +390,8 @@ public class ConnectionGroupService {
                 break;
         }
 
-        // Update the connection in the database
-        connectionGroupDAO.updateByPrimaryKeySelective(connectionGroup);
+        // Update the connection group in the database
+        connectionGroupDAO.updateByPrimaryKey(connectionGroup);
 
     }
 
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java
index 733deb08b..d639cb4aa 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java
@@ -416,7 +416,7 @@ public class ConnectionService {
         connection.setProtocol(mySQLConnection.getConfiguration().getProtocol());
 
         // Update the connection in the database
-        connectionDAO.updateByPrimaryKeySelective(connection);
+        connectionDAO.updateByPrimaryKey(connection);
 
     }