Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(rbac): don't start transaction if there no group policies #1923

Merged
merged 2 commits into from
Jul 24, 2024
Merged

fix(rbac): don't start transaction if there no group policies #1923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d1a5e2
fix(rbac): don't start transaction if there no group policies
AndrienkoAleksandr Jul 23, 2024
9fbb0e1
fix(rbac): reduce number of transactions for admin role
PatAKnight Jul 22, 2024
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
4 changes: 2 additions & 2 deletions plugins/rbac-backend/src/service/enforcer-delegate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,12 @@ export class EnforcerDelegate {
roleMetadata: RoleMetadataDao,
externalTrx?: Knex.Transaction,
): Promise<void> {
const trx = externalTrx ?? (await this.knex.transaction());

if (policies.length === 0) {
return;
}

const trx = externalTrx ?? (await this.knex.transaction());

try {
const currentRoleMetadata =
await this.roleMetadataStorage.findRoleMetadata(
Expand Down
12 changes: 9 additions & 3 deletions plugins/rbac-backend/src/service/permission-policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ const useAdminsFromConfig = async (
await roleMetadataStorage.findRoleMetadata(ADMIN_ROLE_NAME);

const trx = await knex.transaction();
let addedRoleMembers;
try {
if (!adminRoleMeta) {
// even if there are no user, we still create default role metadata for admins
Expand All @@ -101,15 +102,20 @@ const useAdminsFromConfig = async (
trx,
);
}

addedRoleMembers = Array.from<string[]>(newGroupPolicies.entries());
await enf.addGroupingPolicies(
addedRoleMembers,
getAdminRoleMetadata(),
trx,
);

await trx.commit();
} catch (error) {
await trx.rollback(error);
throw error;
}

const addedRoleMembers = Array.from<string[]>(newGroupPolicies.entries());
await enf.addGroupingPolicies(addedRoleMembers, getAdminRoleMetadata());

await auditLogger.auditLog<RoleAuditInfo>({
actorId: RBAC_BACKEND,
message: `Created or updated role`,
Expand Down
Loading