From 479062462057d22f6b56124b15d85140758e0223 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Fri, 13 Feb 2015 12:21:24 -0800
Subject: [PATCH] GUAC-1101: Note the permission-enforcing nature of each
 service.

---
 .../auth/mysql/service/DirectoryObjectService.java    |  3 ++-
 .../auth/mysql/service/ObjectPermissionService.java   | 11 ++---------
 .../net/auth/mysql/service/PermissionService.java     |  3 ++-
 .../auth/mysql/service/SystemPermissionService.java   |  3 ++-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/DirectoryObjectService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/DirectoryObjectService.java
index bb6c6d8bd..016adb54a 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/DirectoryObjectService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/DirectoryObjectService.java
@@ -36,7 +36,8 @@ import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
- * manipulating users.
+ * manipulating users. This service will automatically enforce the
+ * permissions of the current user.
  *
  * @author Michael Jumper
  * @param <ObjectType>
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ObjectPermissionService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ObjectPermissionService.java
index e9aa87163..22269b62d 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ObjectPermissionService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ObjectPermissionService.java
@@ -22,22 +22,15 @@
 
 package net.sourceforge.guacamole.net.auth.mysql.service;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLUser;
-import net.sourceforge.guacamole.net.auth.mysql.dao.PermissionMapper;
 import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
 import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.Permission;
 import org.glyptodon.guacamole.net.auth.permission.PermissionSet;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
- * deleting object permissions.
+ * deleting object permissions. This service will automatically enforce the
+ * permissions of the current user.
  *
  * @author Michael Jumper
  * @param <ObjectPermissionType>
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionService.java
index fa4f4d375..926db0ee2 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionService.java
@@ -35,7 +35,8 @@ import org.glyptodon.guacamole.net.auth.permission.Permission;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
- * deleting permissions.
+ * deleting permissions. This service will automatically enforce the
+ * permissions of the current user.
  *
  * @author Michael Jumper
  * @param <PermissionType>
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SystemPermissionService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SystemPermissionService.java
index 5680568fd..ff622197a 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SystemPermissionService.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SystemPermissionService.java
@@ -34,7 +34,8 @@ import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
 
 /**
  * Service which provides convenience methods for creating, retrieving, and
- * deleting system permissions.
+ * deleting system permissions. This service will automatically enforce
+ * the permissions of the current user.
  *
  * @author Michael Jumper
  */