safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-538: Add web application support for AUDIT permission.

Browse Source
This commit is contained in:
Virtually Nick
2021-05-31 09:30:59 -04:00
parent 24e7e05ad9
commit 04806f8d0a
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/frontend/src/app/manage/directives/systemPermissionEditor.js
View File

@@ -121,6 +121,10 @@ angular.module('manage').directive('systemPermissionEditor', ['$injector',
label: "MANAGE_USER.FIELD_HEADER_ADMINISTER_SYSTEM", label: "MANAGE_USER.FIELD_HEADER_ADMINISTER_SYSTEM",
value: PermissionSet.SystemPermissionType.ADMINISTER value: PermissionSet.SystemPermissionType.ADMINISTER
}, },
{
label: "MANAGE_USER.FIELD_HEADER_AUDIT_SYSTEM",
value: PermissionSet.SystemPermissionType.AUDIT
},
{ {
label: "MANAGE_USER.FIELD_HEADER_CREATE_NEW_USERS", label: "MANAGE_USER.FIELD_HEADER_CREATE_NEW_USERS",
value: PermissionSet.SystemPermissionType.CREATE_USER value: PermissionSet.SystemPermissionType.CREATE_USER

7
guacamole/src/main/frontend/src/app/navigation/services/userPageService.js
View File

@@ -298,8 +298,9 @@ angular.module('navigation').factory('userPageService', ['$injector',
// Determine whether the current user needs access to view connection history // Determine whether the current user needs access to view connection history
if ( if (
// A user must be a system administrator to view connection records // A user must be a system administrator or auditor to view connection records
PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER) PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER)
|| PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.AUDIT)
) { ) {
canViewConnectionRecords.push(dataSource); canViewConnectionRecords.push(dataSource);
} }
@@ -312,7 +313,7 @@ angular.module('navigation').factory('userPageService', ['$injector',
url : '/settings/sessions' url : '/settings/sessions'
})); }));
// If user can manage connections, add links for connection management pages // If user can view connection records, add links for connection history pages
angular.forEach(canViewConnectionRecords, function addConnectionHistoryLink(dataSource) { angular.forEach(canViewConnectionRecords, function addConnectionHistoryLink(dataSource) {
pages.push(new PageDefinition({ pages.push(new PageDefinition({
name : [ name : [

5
guacamole/src/main/frontend/src/app/rest/types/PermissionSet.js
View File

@@ -136,6 +136,11 @@ angular.module('rest').factory('PermissionSet', [function definePermissionSet()
* Permission to administer the entire system. * Permission to administer the entire system.
*/ */
ADMINISTER : "ADMINISTER", ADMINISTER : "ADMINISTER",
/**
* Permission to view connection and user records for the entire system.
*/
AUDIT : "AUDIT",
/** /**
* Permission to create new users. * Permission to create new users.

2
guacamole/src/main/frontend/src/translations/en.json
View File

@@ -408,6 +408,7 @@
"ERROR_PASSWORD_MISMATCH" : "@:APP.ERROR_PASSWORD_MISMATCH", "ERROR_PASSWORD_MISMATCH" : "@:APP.ERROR_PASSWORD_MISMATCH",
"FIELD_HEADER_ADMINISTER_SYSTEM" : "Administer system:", "FIELD_HEADER_ADMINISTER_SYSTEM" : "Administer system:",
"FIELD_HEADER_AUDIT_SYSTEM" : "Audit system:",
"FIELD_HEADER_CHANGE_OWN_PASSWORD" : "Change own password:", "FIELD_HEADER_CHANGE_OWN_PASSWORD" : "Change own password:",
"FIELD_HEADER_CREATE_NEW_USERS" : "Create new users:", "FIELD_HEADER_CREATE_NEW_USERS" : "Create new users:",
"FIELD_HEADER_CREATE_NEW_USER_GROUPS" : "Create new user groups:", "FIELD_HEADER_CREATE_NEW_USER_GROUPS" : "Create new user groups:",
@@ -449,6 +450,7 @@
"DIALOG_HEADER_ERROR" : "@:APP.DIALOG_HEADER_ERROR", "DIALOG_HEADER_ERROR" : "@:APP.DIALOG_HEADER_ERROR",
"FIELD_HEADER_ADMINISTER_SYSTEM" : "@:MANAGE_USER.FIELD_HEADER_ADMINISTER_SYSTEM", "FIELD_HEADER_ADMINISTER_SYSTEM" : "@:MANAGE_USER.FIELD_HEADER_ADMINISTER_SYSTEM",
"FIELD_HEADER_AUDIT_SYSTEM" : "@:MANAGE_USER.FIELD_HEADER_AUDIT_SYSTEM",
"FIELD_HEADER_CHANGE_OWN_PASSWORD" : "@:MANAGE_USER.FIELD_HEADER_CHANGE_OWN_PASSWORD", "FIELD_HEADER_CHANGE_OWN_PASSWORD" : "@:MANAGE_USER.FIELD_HEADER_CHANGE_OWN_PASSWORD",
"FIELD_HEADER_CREATE_NEW_USERS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_USERS", "FIELD_HEADER_CREATE_NEW_USERS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_USERS",
"FIELD_HEADER_CREATE_NEW_USER_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_USER_GROUPS", "FIELD_HEADER_CREATE_NEW_USER_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_USER_GROUPS",