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-926: Merge batch import removal of leading/trailing spaces from user and user group names.

Browse Source
This commit is contained in:
Mike Jumper
2023-05-11 08:33:42 -07:00
committed by GitHub
parent 353bccb4bc 6c1ac0b008
commit 52b95f13c1
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
guacamole/src/main/frontend/src/app/import/services/connectionParseService.js
View File

@@ -456,20 +456,36 @@ angular.module('import').factory('connectionParseService',
// Ensure that the specified user list, if any, is an array
const users = connection.users;
if (users && !Array.isArray(users))
if (users) {
// Ensure all users in the array are trimmed strings
if (Array.isArray(users))
connection.users = users.map(user => String(user).trim());
else
connection.errors.push(new ParseError({
message: 'Invalid users list - must be an array',
key: 'IMPORT.ERROR_INVALID_USERS_TYPE'
}));
// Ensure that the specified user list, if any, is an array
}
// Ensure that the specified user group list, if any, is an array
const groups = connection.groups;
if (groups && !Array.isArray(groups))
if (groups) {
// Ensure all groups in the array are trimmed strings
if (Array.isArray(groups))
connection.groups = groups.map(group => String(group).trim());
else
connection.errors.push(new ParseError({
message: 'Invalid groups list - must be an array',
key: 'IMPORT.ERROR_INVALID_USER_GROUPS_TYPE'
}));
}
// If the protocol is not valid, there's no point in trying to check
// parameter case sensitivity
if (!protocols[protocol])