MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some fixes for traverser.

This commit is contained in:
mike12345567 2024-10-17 16:27:47 +01:00
parent cfc5848d14
commit 3da3bccc01
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/backend-core/src/security/roles.ts
View File

@ -98,7 +98,7 @@ export class RoleHierarchyTraversal {
const opts = this.opts, const opts = this.opts,
allRoles = this.allRoles allRoles = this.allRoles
// this will be a full walked list of roles - which may contain duplicates // this will be a full walked list of roles - which may contain duplicates
const roleList: RoleDoc[] = [] let roleList: RoleDoc[] = []
if (!role || !role._id) { if (!role || !role._id) {
return roleList return roleList
} }
@ -107,7 +107,7 @@ export class RoleHierarchyTraversal {
for (let roleId of role.inherits) { for (let roleId of role.inherits) {
const foundRole = findRole(roleId, allRoles, opts) const foundRole = findRole(roleId, allRoles, opts)
if (foundRole) { if (foundRole) {
return this.walk(foundRole) roleList = roleList.concat(this.walk(foundRole))
} }
} }
} else { } else {
@ -119,14 +119,18 @@ export class RoleHierarchyTraversal {
!rolesInList(foundRoleIds, currentRole.inherits) !rolesInList(foundRoleIds, currentRole.inherits)
) { ) {
if (Array.isArray(currentRole.inherits)) { if (Array.isArray(currentRole.inherits)) {
return this.walk(currentRole) return roleList.concat(this.walk(currentRole))
} else { } else {
foundRoleIds.push(currentRole.inherits) foundRoleIds.push(currentRole.inherits)
currentRole = findRole(currentRole.inherits, allRoles, opts) currentRole = findRole(currentRole.inherits, allRoles, opts)
if (role) { if (currentRole) {
roleList.push(role) roleList.push(currentRole)
} }
} }
// loop now found - stop iterating
if (helpers.roles.checkForRoleInheritanceLoops(roleList)) {
break
}
} }
} }
return uniqBy(roleList, role => role._id) return uniqBy(roleList, role => role._id)
@ -359,9 +363,6 @@ async function getAllUserRoles(
opts?: { defaultPublic?: boolean } opts?: { defaultPublic?: boolean }
): Promise<RoleDoc[]> { ): Promise<RoleDoc[]> {
const allRoles = await getAllRoles() const allRoles = await getAllRoles()
if (helpers.roles.checkForRoleInheritanceLoops(allRoles)) {
throw new Error("Loop detected in roles - cannot list roles")
}
// admins have access to all roles // admins have access to all roles
if (userRoleId === BUILTIN_IDS.ADMIN) { if (userRoleId === BUILTIN_IDS.ADMIN) {
return allRoles return allRoles