From 1f1b586ab3949602fd88fe50ac6ce3d47d4dcd7f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 27 Feb 2013 22:52:38 -0800 Subject: [PATCH] Ticket #269: Add support for system ADMINISTER permission. --- .../guacamole/net/auth/mysql/MySQLConstants.java | 6 ++++++ .../net/auth/mysql/service/PermissionCheckService.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConstants.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConstants.java index e7186cccf..623c622ab 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConstants.java +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConstants.java @@ -105,4 +105,10 @@ public final class MySQLConstants { */ public static final String SYSTEM_CONNECTION_CREATE = "CREATE_CONNECTION"; + /** + * The string stored in the database to represent permission to administer + * the system as a whole. + */ + public static final String SYSTEM_ADMINISTER = "ADMINISTER"; + } diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java index 379416b05..1a44a5eef 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java @@ -877,6 +877,10 @@ public class PermissionCheckService { else if(systemPermission.getPermission().equals(MySQLConstants.SYSTEM_CONNECTION_CREATE)) allPermissions.add(new SystemPermission(SystemPermission.Type.CREATE_CONNECTION)); + // System administration permission + else if(systemPermission.getPermission().equals(MySQLConstants.SYSTEM_ADMINISTER)) + allPermissions.add(new SystemPermission(SystemPermission.Type.ADMINISTER)); + } return allPermissions;