From 7a47064cd11ac6fb0511cc4bec51beda328e089e Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 3 Sep 2015 15:42:09 -0700 Subject: [PATCH] GUAC-586: Do not inspect permissions if permission set does not exist. --- .../webapp/app/navigation/services/userPageService.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/webapp/app/navigation/services/userPageService.js b/guacamole/src/main/webapp/app/navigation/services/userPageService.js index 257f4112a..d42b0381a 100644 --- a/guacamole/src/main/webapp/app/navigation/services/userPageService.js +++ b/guacamole/src/main/webapp/app/navigation/services/userPageService.js @@ -186,8 +186,13 @@ angular.module('navigation').factory('userPageService', ['$injector', // Inspect the contents of each provided permission set angular.forEach(dataSources, function inspectPermissions(dataSource) { - // Copy permissions for current data source - var permissions = angular.copy(permissionSets[dataSource]); + // Get permissions for current data source, skipping if non-existent + var permissions = permissionSets[dataSource]; + if (!permissions) + return; + + // Do not modify original object + permissions = angular.copy(permissions); // Ignore permission to update root group PermissionSet.removeConnectionGroupPermission(permissions,