Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions workspaces/rbac/.changeset/funny-suns-approve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@backstage-community/plugin-rbac': patch
---

hide permissions for uninstalled plugins
2 changes: 1 addition & 1 deletion workspaces/rbac/plugins/rbac/src/hooks/useRoles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export const useRoles = (
getPluginInfo(
permissionPolicies as PluginPermissionMetaData[],
po,
).pluginId,
)?.pluginId,
);
accPls = [...accPls, ...pls].filter(val => !!val) as string[];
}
Expand Down
8 changes: 8 additions & 0 deletions workspaces/rbac/plugins/rbac/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ export type PermissionsDataSet = {
usingResourceType?: boolean;
};

export type PluginInfoType = {
pluginId: string;
isResourced: boolean;
resourceType?: string;
permissionName: string;
usingResourceType?: boolean;
};

export type SelectedPlugin = { label: string; value: string };

export type PermissionsData = {
Expand Down
20 changes: 15 additions & 5 deletions workspaces/rbac/plugins/rbac/src/utils/rbac-utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {

import {
PermissionAction,
PluginPermissionMetaData,
RoleConditionalPolicyDecision,
} from '@backstage-community/plugin-rbac-common';

Expand Down Expand Up @@ -181,33 +182,42 @@ describe('rbac utils', () => {
expect(getMembersFromGroup(resource)).toBe(0);
});

it('should return plugin-id of the policy', () => {
it('should return plugin-id of the policy and return null if no pluginId exists', () => {
expect(
getPluginInfo(mockPermissionPolicies, {
permission: 'catalog.entity.read',
policy: 'read',
}).pluginId,
})?.pluginId,
).toBe('catalog');
expect(
getPluginInfo(mockPermissionPolicies, {
permission: 'scaffolder.template.read',
policy: 'read',
}).pluginId,
})?.pluginId,
).toBe('scaffolder');
const mockPermissionPoliciesWithoutPluginId = [
{ ...mockPermissionPolicies[0], pluginId: undefined },
] as any as PluginPermissionMetaData[];
expect(
getPluginInfo(mockPermissionPoliciesWithoutPluginId, {
permission: 'scaffolder.template.read',
policy: 'read',
}),
).toBe(null);
});

it('should return if the permission is resourced', () => {
expect(
getPluginInfo(mockPermissionPolicies, {
permission: 'catalog.entity.read',
policy: 'read',
}).isResourced,
})?.isResourced,
).toBe(true);
expect(
getPluginInfo(mockPermissionPolicies, {
permission: 'scaffolder.template.read',
policy: 'read',
}).isResourced,
})?.isResourced,
).toBe(true);
});

Expand Down
60 changes: 21 additions & 39 deletions workspaces/rbac/plugins/rbac/src/utils/rbac-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import {
MembersData,
PermissionsData,
PermissionsDataSet,
PluginInfoType,
} from '../types';
import { getMembersCount } from './create-role-utils';

Expand Down Expand Up @@ -135,24 +136,9 @@ export const getMembersFromGroup = (group: GroupEntity): number => {
export const getPluginInfo = (
permissions: PluginPermissionMetaData[],
policy: RoleBasedPolicy,
): {
pluginId: string;
isResourced: boolean;
resourceType?: string;
permissionName: string;
usingResourceType?: boolean;
} =>
): PluginInfoType | null =>
permissions.reduce(
(
acc: {
pluginId: string;
isResourced: boolean;
resourceType?: string;
permissionName: string;
usingResourceType?: boolean;
},
p: PluginPermissionMetaData,
) => {
(acc: PluginInfoType | null, p: PluginPermissionMetaData) => {
const policyData = p.policies.find(pol => {
if (pol.policy === policy.policy) {
if (isResourcedPolicy(pol)) {
Expand All @@ -166,9 +152,9 @@ export const getPluginInfo = (
}
return false;
});
if (policyData) {
if (p.pluginId && policyData) {
return {
pluginId: p.pluginId || '-',
pluginId: p.pluginId,
permissionName: policyData.name || '-',
isResourced: isResourcedPolicy(policyData) || false,
resourceType: isResourcedPolicy(policyData)
Expand All @@ -181,7 +167,7 @@ export const getPluginInfo = (
}
return acc;
},
{ pluginId: '-', isResourced: false, permissionName: '-' },
null,
);

const getPolicy = (str: string) => {
Expand Down Expand Up @@ -226,25 +212,21 @@ export const getPermissionsData = (
const policyTitleCase = capitalizeFirstLetter(policyStr);
const policyString = new Set<string>();
const policiesSet = new Set<{ policy: string; effect: string }>();
const {
pluginId,
isResourced,
resourceType,
permissionName,
usingResourceType,
} = getPluginInfo(permissionPolicies, policy);
acc.push({
permission: permissionName,
plugin: pluginId,
policyString: policyString.add(policyTitleCase || 'Use'),
policies: policiesSet.add({
policy: policyTitleCase || 'Use',
effect: policy.effect,
}),
isResourced,
resourceType,
usingResourceType,
});
const pluginInfo = getPluginInfo(permissionPolicies, policy);
if (pluginInfo?.pluginId) {
acc.push({
permission: pluginInfo.permissionName,
plugin: pluginInfo.pluginId,
policyString: policyString.add(policyTitleCase || 'Use'),
policies: policiesSet.add({
policy: policyTitleCase || 'Use',
effect: policy.effect,
}),
isResourced: pluginInfo.isResourced,
resourceType: pluginInfo.resourceType,
usingResourceType: pluginInfo.usingResourceType,
});
}
}
return acc;
},
Expand Down