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

GUACAMOLE-926: Merge correction to handling of invalid parentIdentifiers within connection import.

Browse Source
This commit is contained in:
Mike Jumper
2023-04-14 10:28:51 -07:00
committed by GitHub
parent 9548e15651 6f6f8d44b8
commit e005673dab
2 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,20 +80,25 @@ angular.module('import').factory('connectionParseService',
});
}
/**
* Returns a promise that resolves to an object mapping potential groups
* that might be encountered in an imported connection to group identifiers.
* Returns a promise that resolves to an object containing both a map of
* connection group paths to group identifiers and a set of all known group
* identifiers.
*
* The resolved object will contain a "groupLookups" key with a map of group
* paths to group identifier, as well as a "identifierSet" key containing a
* set of all known group identifiers.
*
* The idea is that a user-provided import file might directly specify a
* parentIdentifier, or it might specify a named group path like "ROOT",
* "ROOT/parent", or "ROOT/parent/child". This object resolved by the
* promise returned from this function will map all of the above to the
* identifier of the appropriate group, if defined.
* "ROOT/parent", or "ROOT/parent/child". The resolved "groupLookups" field
* will map all of the above to the identifier of the appropriate group, if
* defined. The "identifierSet" field can be used to check if a given group
* identifier is known.
*
* @returns {Promise.<Object>}
* A promise that resolves to an object mapping groups to group
* identifiers.
* A promise that resolves to an object containing a map of group paths
* to group identifiers, as well as set of all known group identifiers.
*/
function getGroupLookups() {
@@ -106,7 +111,12 @@ angular.module('import').factory('connectionParseService',
connectionGroupService.getConnectionGroupTree(dataSource).then(
rootGroup => {
const groupLookup = {};
// An object mapping group paths to group identifiers
const groupLookups = {};
// An object mapping group identifiers to the boolean value true,
// i.e. a set of all known group identifiers
const identifierSet = {};
// Add the specified group to the lookup, appending all specified
// prefixes, and then recursively call saveLookups for all children
@@ -117,7 +127,10 @@ angular.module('import').factory('connectionParseService',
const currentPath = prefix + group.name;
// Add the current path to the lookup
groupLookup[currentPath] = group.identifier;
groupLookups[currentPath] = group.identifier;
// Add this group identifier to the set
identifierSet[group.identifier] = true;
// Add each child group to the lookup
const nextPrefix = currentPath + "/";
@@ -130,7 +143,7 @@ angular.module('import').factory('connectionParseService',
saveLookups("", rootGroup);
// Resolve with the now fully-populated lookups
deferredGroupLookups.resolve(groupLookup);
deferredGroupLookups.resolve({ groupLookups, identifierSet });
});
@@ -153,14 +166,30 @@ angular.module('import').factory('connectionParseService',
* "group" field into a "parentIdentifier" field if possible.
*/
function getGroupTransformer() {
return getGroupLookups().then(lookups => connection => {
return getGroupLookups().then(({groupLookups, identifierSet}) =>
connection => {
// If there's no group to translate, do nothing
if (!connection.group)
return connection;
const parentIdentifier = connection.parentIdentifier;
// If there's no group path defined for this connection
if (!connection.group) {
// If the specified parentIdentifier is not specified
// at all, or valid, there's nothing to be done
if (!parentIdentifier || identifierSet[parentIdentifier])
return connection;
// If a parent group identifier is present, but not valid
if (parentIdentifier)
throw new ParseError({
message: 'No group with identifier: ' + parentIdentifier,
key: 'IMPORT.ERROR_INVALID_GROUP_IDENTIFIER',
variables: { IDENTIFIER: parentIdentifier }
});
}
// If both are specified, the parent group is ambigious
if (connection.parentIdentifier)
if (parentIdentifier)
throw new ParseError({
message: 'Only one of group or parentIdentifier can be set',
key: 'IMPORT.ERROR_AMBIGUOUS_PARENT_GROUP'
@@ -184,7 +213,7 @@ angular.module('import').factory('connectionParseService',
group = group.slice(0, -1);
// Look up the parent identifier for the specified group path
const identifier = lookups[group];
const identifier = groupLookups[group];
// If the group doesn't match anything in the tree
if (!identifier)

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

@@ -208,8 +208,7 @@
"ERROR_INVALID_CSV_HEADER": "Invalid CSV Header \"{HEADER}\" is neither an attribute or parameter",
"ERROR_INVALID_MIME_TYPE": "Unsupported file type: \"{TYPE}\"",
"ERROR_INVALID_GROUP": "No group matching \"{GROUP}\" found",
"ERROR_INVALID_USER_GROUP_IDENTIFIERS": "User Groups not found: {IDENTIFIER_LIST}",
"ERROR_INVALID_USER_IDENTIFIERS": "Users not found: {IDENTIFIER_LIST}",
"ERROR_INVALID_GROUP_IDENTIFIER": "No connection group with identifier \"{IDENTIFIER}\" found",
"ERROR_NO_FILE_SUPPLIED": "Please select a file to import",
"ERROR_REQUIRED_NAME": "No connection name found in the provided file",
"ERROR_REQUIRED_PROTOCOL": "No connection protocol found in the provided file",