alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Entanglement] Correctly Call Policy Service

Browse Source 
Move, Copy, and Link services correctly call the policy service to
check whether composition is allowed.  Fixes open-1254.
This commit is contained in:
larkin
2015-06-12 09:39:24 -07:00
parent d041655546
commit c6186ae186
6 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/entanglement/src/services/CopyService.js
View File

@@ -83,8 +83,8 @@ define(
} }
return policyService.allow( return policyService.allow(
"composition", "composition",
object.getCapability('type'), parentCandidate.getCapability('type'),
parentCandidate.getCapability('type') object.getCapability('type')
); );
}, },
/** /**

4
platform/entanglement/src/services/LinkService.js
View File

@@ -44,8 +44,8 @@ define(
} }
return policyService.allow( return policyService.allow(
"composition", "composition",
object.getCapability('type'), parentCandidate.getCapability('type'),
parentCandidate.getCapability('type') object.getCapability('type')
); );
}, },
/** /**

4
platform/entanglement/src/services/MoveService.js
View File

@@ -51,8 +51,8 @@ define(
} }
return policyService.allow( return policyService.allow(
"composition", "composition",
object.getCapability('type'), parentCandidate.getCapability('type'),
parentCandidate.getCapability('type') object.getCapability('type')
); );
}, },
/** /**

19
platform/entanglement/test/services/CopyServiceSpec.js
View File

@@ -60,10 +60,16 @@ define(
policyService policyService
); );
object = domainObjectFactory({ object = domainObjectFactory({
name: 'object' name: 'object',
capabilities: {
type: { type: 'object' }
}
}); });
parentCandidate = domainObjectFactory({ parentCandidate = domainObjectFactory({
name: 'parentCandidate' name: 'parentCandidate',
capabilities: {
type: { type: 'parentCandidate' }
}
}); });
validate = function () { validate = function () {
return copyService.validate(object, parentCandidate); return copyService.validate(object, parentCandidate);
@@ -88,6 +94,15 @@ define(
parentCandidate.id = 'b'; parentCandidate.id = 'b';
}); });
it("calls policy service with correct args", function () {
validate();
expect(policyService.allow).toHaveBeenCalledWith(
"composition",
parentCandidate.capabilities.type,
object.capabilities.type
);
});
it("and returns false", function () { it("and returns false", function () {
policyService.allow.andReturn(false); policyService.allow.andReturn(false);
expect(validate()).toBe(false); expect(validate()).toBe(false);

13
platform/entanglement/test/services/LinkServiceSpec.js
View File

@@ -84,10 +84,23 @@ define(
describe("defers to policyService", function () { describe("defers to policyService", function () {
beforeEach(function () { beforeEach(function () {
object.id = 'abc'; object.id = 'abc';
object.capabilities.type = { type: 'object' };
parentCandidate.id = 'xyz'; parentCandidate.id = 'xyz';
parentCandidate.capabilities.type = {
type: 'parentCandidate'
};
parentCandidate.model.composition = []; parentCandidate.model.composition = [];
}); });
it("calls policy service with correct args", function () {
validate();
expect(mockPolicyService.allow).toHaveBeenCalledWith(
"composition",
parentCandidate.capabilities.type,
object.capabilities.type
);
});
it("and returns false", function () { it("and returns false", function () {
mockPolicyService.allow.andReturn(true); mockPolicyService.allow.andReturn(true);
expect(validate()).toBe(true); expect(validate()).toBe(true);

17
platform/entanglement/test/services/MoveServiceSpec.js
View File

@@ -65,7 +65,8 @@ define(
name: 'object', name: 'object',
id: 'a', id: 'a',
capabilities: { capabilities: {
context: objectContextCapability context: objectContextCapability,
type: { type: 'object' }
} }
}); });
@@ -79,7 +80,10 @@ define(
parentCandidate = domainObjectFactory({ parentCandidate = domainObjectFactory({
name: 'parentCandidate', name: 'parentCandidate',
model: { composition: [] }, model: { composition: [] },
id: 'c' id: 'c',
capabilities: {
type: { type: 'parentCandidate' }
}
}); });
validate = function () { validate = function () {
@@ -112,6 +116,15 @@ define(
describe("defers to policyService", function () { describe("defers to policyService", function () {
it("calls policy service with correct args", function () {
validate();
expect(policyService.allow).toHaveBeenCalledWith(
"composition",
parentCandidate.capabilities.type,
object.capabilities.type
);
});
it("and returns false", function () { it("and returns false", function () {
policyService.allow.andReturn(false); policyService.allow.andReturn(false);
expect(validate()).toBe(false); expect(validate()).toBe(false);