From e195fa6a1e8348e264641c343784be0fdd4daf2d Mon Sep 17 00:00:00 2001 From: Miguel Angel Flores Date: Mon, 18 Sep 2017 13:51:50 +0200 Subject: [PATCH 1/5] return first permission that matches our request, not first. Added missing break. --- common/models/acl.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/common/models/acl.js b/common/models/acl.js index a453d7a77..9fadbe753 100644 --- a/common/models/acl.js +++ b/common/models/acl.js @@ -210,7 +210,7 @@ module.exports = function(ACL) { * @param {AccessRequest} req The access request * @returns {AccessRequest} result The resolved access request */ - ACL.resolvePermission = function resolvePermission(acls, req) { + ACL.resolvePermission = function resolvePermission(acls, req, principalType, principalId) { if (!(req instanceof AccessRequest)) { req.registry = this.registry; req = new AccessRequest(req); @@ -231,6 +231,16 @@ module.exports = function(ACL) { } if (!req.isWildcard()) { // We should stop from the first match for non-wildcard + permission = candidate.permission; + + // Not really. We must find the first permission that matches our request + var new_candidate = acls.find((acl) => { + return ((acl.principalType === principalType) && (acl.principalId === principalId)); + }); + if (new_candidate) { + candidate = new_candidate; + } + permission = candidate.permission; break; } else { @@ -244,6 +254,7 @@ module.exports = function(ACL) { if (candidateOrder > permissionOrder) { permission = candidate.permission; } + break; } } @@ -348,7 +359,7 @@ module.exports = function(ACL) { var acls = this.getStaticACLs(model, property); // resolved is an instance of AccessRequest - var resolved = this.resolvePermission(acls, req); + var resolved = this.resolvePermission(acls, req, principalType, principalId); if (resolved && resolved.permission === ACL.DENY) { debug('Permission denied by statically resolved permission'); @@ -368,7 +379,7 @@ module.exports = function(ACL) { } acls = acls.concat(dynACLs); // resolved is an instance of AccessRequest - resolved = self.resolvePermission(acls, req); + resolved = self.resolvePermission(acls, req, principalType, principalId); return callback(null, resolved); }); return callback.promise; From 191a563134c01b8be03ef3696e658fa4d1baca99 Mon Sep 17 00:00:00 2001 From: Miguel Angel Flores Date: Mon, 18 Sep 2017 13:53:34 +0200 Subject: [PATCH 2/5] some parameters missing in resolvePermission call --- common/models/acl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/models/acl.js b/common/models/acl.js index 9fadbe753..a2c0c1a8d 100644 --- a/common/models/acl.js +++ b/common/models/acl.js @@ -528,7 +528,7 @@ module.exports = function(ACL) { if (err) return callback(err, null); // resolved is an instance of AccessRequest - var resolved = self.resolvePermission(effectiveACLs, req); + var resolved = self.resolvePermission(effectiveACLs, req, principalType, principalId); debug('---Resolved---'); resolved.debug(); From 185926a84b1dc2ffe57d2aa7a7e398423becb4dd Mon Sep 17 00:00:00 2001 From: Miguel Angel Flores Date: Mon, 18 Sep 2017 14:17:42 +0200 Subject: [PATCH 3/5] change package name in order to pubish to npmjs --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b4350725c..6984d0ab2 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "loopback", + "name": "loopback-right-checkpermission", "version": "3.11.1", "description": "LoopBack: Open Source Framework for Node.js", "homepage": "http://loopback.io", @@ -101,7 +101,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/strongloop/loopback" + "url": "https://github.com/supermafete/loopback-right-checkpermission" }, "browser": { "express": "./lib/browser-express.js", From 5f8544f7263dc42a8dc344f2ef9ca87a5324c175 Mon Sep 17 00:00:00 2001 From: Miguel Angel Flores Date: Mon, 18 Sep 2017 14:31:24 +0200 Subject: [PATCH 4/5] fixed error in acl.js --- common/models/acl.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/models/acl.js b/common/models/acl.js index a2c0c1a8d..9fadbe753 100644 --- a/common/models/acl.js +++ b/common/models/acl.js @@ -528,7 +528,7 @@ module.exports = function(ACL) { if (err) return callback(err, null); // resolved is an instance of AccessRequest - var resolved = self.resolvePermission(effectiveACLs, req, principalType, principalId); + var resolved = self.resolvePermission(effectiveACLs, req); debug('---Resolved---'); resolved.debug(); diff --git a/package.json b/package.json index 6984d0ab2..9a9a9f248 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "loopback-right-checkpermission", - "version": "3.11.1", + "version": "3.11.1.1", "description": "LoopBack: Open Source Framework for Node.js", "homepage": "http://loopback.io", "keywords": [ From 4c67e120912052bcffa286d8271382482cf62b76 Mon Sep 17 00:00:00 2001 From: Miguel Angel Flores Date: Mon, 18 Sep 2017 14:32:50 +0200 Subject: [PATCH 5/5] v3.11.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9a9a9f248..83be27ddb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "loopback-right-checkpermission", - "version": "3.11.1.1", + "version": "3.11.2", "description": "LoopBack: Open Source Framework for Node.js", "homepage": "http://loopback.io", "keywords": [