Skip to content

fix: Added Batch operations. #22

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

Merged
merged 4 commits into from
May 8, 2020
Merged

fix: Added Batch operations. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42e447b
fix: Added addPolicies and removePolicies member functions.
divy9881 May 7, 2020
03e56c1
fix: Added tests.
divy9881 May 7, 2020
e703299
fix: Remove unwanted imports.
divy9881 May 7, 2020
611ee3d
fix: Make operations transactional.
divy9881 May 8, 2020
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
68 changes: 66 additions & 2 deletions src/adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import {Adapter, Helper, Model} from 'casbin';
import {CasbinRule} from './casbinRule';
import {Connection, ConnectionOptions, createConnection, getRepository} from 'typeorm';
import {Connection, ConnectionOptions, createConnection, getRepository, getConnection} from 'typeorm';
import {CasbinMongoRule} from './casbinMongoRule';

type GenericCasbinRule = CasbinRule | CasbinMongoRule;
Expand Down Expand Up @@ -130,7 +130,21 @@ export default class TypeORMAdapter implements Adapter {
lines.push(line);
}
}
await getRepository(this.getCasbinRuleConstructor(), this.option.name).save(lines);

const queryRunner = this.typeorm.createQueryRunner();

await queryRunner.connect();
await queryRunner.startTransaction();

try {
await queryRunner.manager.save(lines);
await queryRunner.commitTransaction();
} catch (err) {
await queryRunner.rollbackTransaction();
throw err;
} finally {
await queryRunner.release();
}

return true;
}
Expand All @@ -143,6 +157,32 @@ export default class TypeORMAdapter implements Adapter {
await getRepository(this.getCasbinRuleConstructor(), this.option.name).save(line);
}

/**
* addPolicies adds policy rules to the storage.
*/
public async addPolicies(sec: string, ptype: string, rules: string[][]) {
const lines: GenericCasbinRule[] = [];
for (const rule of rules) {
const line = this.savePolicyLine(ptype, rule);
lines.push(line);
}

const queryRunner = this.typeorm.createQueryRunner();

await queryRunner.connect();
await queryRunner.startTransaction();

try {
await queryRunner.manager.save(lines);
await queryRunner.commitTransaction();
} catch (err) {
await queryRunner.rollbackTransaction();
throw err;
} finally {
await queryRunner.release();
}
}

/**
* removePolicy removes a policy rule from the storage.
*/
Expand All @@ -151,6 +191,30 @@ export default class TypeORMAdapter implements Adapter {
await getRepository(this.getCasbinRuleConstructor(), this.option.name).delete(line);
}

/**
* removePolicies removes policy rules from the storage.
*/
public async removePolicies(sec: string, ptype: string, rules: string[][]) {
const queryRunner = this.typeorm.createQueryRunner();
const type = TypeORMAdapter.getCasbinRuleType(this.option.type);

await queryRunner.connect();
await queryRunner.startTransaction();

try {
for (const rule of rules) {
const line = this.savePolicyLine(ptype, rule);
await queryRunner.manager.delete(type, line);
}
await queryRunner.commitTransaction();
} catch (err) {
await queryRunner.rollbackTransaction();
throw err;
} finally {
await queryRunner.release();
}
}

/**
* removeFilteredPolicy removes policy rules that match the filter from the storage.
*/
Expand Down
41 changes: 41 additions & 0 deletions test/adapter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,50 @@ test('TestAdapter', async () => {
['data2_admin', 'data2', 'write'],
['role', 'res', 'action']]);

await a.addPolicies('', 'p', [
['role1', 'res1', 'action1'],
['role2', 'res2', 'action2'],
['role3', 'res3', 'action3'],
['role4', 'res4', 'action4'],
['role5', 'res5', 'action5']
]);
e = await Enforcer.newEnforcer('examples/rbac_model.conf', a);
testGetPolicy(e, [
['alice', 'data1', 'read'],
['bob', 'data2', 'write'],
['data2_admin', 'data2', 'read'],
['data2_admin', 'data2', 'write'],
['role', 'res', 'action'],
['role1', 'res1', 'action1'],
['role2', 'res2', 'action2'],
['role3', 'res3', 'action3'],
['role4', 'res4', 'action4'],
['role5', 'res5', 'action5']
]);

// Remove policy from DB
await a.removePolicy('', 'p', ['role', 'res', 'action']);
e = await Enforcer.newEnforcer('examples/rbac_model.conf', a);
testGetPolicy(e, [
['alice', 'data1', 'read'],
['bob', 'data2', 'write'],
['data2_admin', 'data2', 'read'],
['data2_admin', 'data2', 'write'],
['role1', 'res1', 'action1'],
['role2', 'res2', 'action2'],
['role3', 'res3', 'action3'],
['role4', 'res4', 'action4'],
['role5', 'res5', 'action5']
]);

await a.removePolicies('', 'p', [
['role1', 'res1', 'action1'],
['role2', 'res2', 'action2'],
['role3', 'res3', 'action3'],
['role4', 'res4', 'action4'],
['role5', 'res5', 'action5']
]);
e = await Enforcer.newEnforcer('examples/rbac_model.conf', a);
testGetPolicy(e, [
['alice', 'data1', 'read'],
['bob', 'data2', 'write'],
Expand Down