From d104a3170b4d933fe4ff5bba53ceabd265574c11 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 28 Feb 2015 22:46:46 -0800 Subject: [PATCH] GUAC-1101: Do not query accessible identifiers if none given. --- .../auth/jdbc/permission/ObjectPermissionService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java index 0bd19d44f..79ce6407e 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java @@ -233,6 +233,10 @@ public abstract class ObjectPermissionService ModeledUser targetUser, Collection permissions, Collection identifiers) throws GuacamoleException { + // Nothing is always accessible + if (identifiers.isEmpty()) + return identifiers; + // Determine whether the user is an admin boolean isAdmin = user.getUser().isAdministrator();