WIP: Allow filtering of roles during permission fetching #61
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch? |
Page-
requested changes
Aug 10, 2017
src/sbvr-api/permissions.coffee
Outdated
| @@ -180,7 +180,10 @@ exports.setup = (app, sbvrUtils) -> | |||
| throw err | |||
| .nodeify(callback) | |||
|
|
|||
| exports.getUserPermissions = getUserPermissions = (userId, callback) -> | |||
| exports.getUserPermissions = getUserPermissions = (userId, roles, callback) -> | |||
| if typeof roles is 'function' | |||
There was a problem hiding this comment.
Can you use _.isFunction please
src/sbvr-api/permissions.coffee
Outdated
| @@ -206,6 +209,14 @@ exports.setup = (app, sbvrUtils) -> | |||
| uhr: expiry_date: null | |||
| , uhr: expiry_date: $gt: $now: null | |||
| ] | |||
| if roles? | |||
| innerFilter = _.get(permsFilter, '$or.is_of__role.$any.$expr.rhp.role.$any.$expr') | |||
There was a problem hiding this comment.
I'd rather this is done as
roleFilter =
r: is_of__user: $any:
$alias: 'uhr'
$expr:
uhr: user: userId
$or: [
uhr: expiry_date: null
, uhr: expiry_date: $gt: $now: null
]
if roles?
roleFilter = $and: [
roleFilter,
r: name: $in: roles
]
permsFilter = $or:
is_of__user: $any:
$alias: 'uhp'
$expr:
uhp: user: userId
$or: [
uhp: expiry_date: null
, uhp: expiry_date: $gt: $now: null
]
is_of__role: $any:
$alias: 'rhp'
$expr: rhp: role: $any:
$alias: 'r'
$expr: roleFilterrather than using this hardcoded path which will be awkward to spot issues with and fix if the structure of the query changes in future (the logic should be the same, we just do the augmentation first and then it gets inserted straight into the correct spot of permsFilter when it's first created, rather than afterward)
|
add to whitelist |
afitzek
changed the title
This adds an optional external whitelist of roles available to a user. Change-Type: minor Connects-To: #60 Signed-off-by: Andreas Fitzek <andreas@resin.io>
afitzek
force-pushed
the
60-filter-roles-during-permission-fetching
branch
from
1b90cc5
to
cc38fec
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds an optional external whitelist of roles available to a user.
We want to be able to restrict credentials (like a JWT), to only a given subset of the roles the user actually has and therefore only to the permissions associated with that given role.
Flowdock: https://www.flowdock.com/app/rulemotion/r-security/threads/6aoRkUtQ2XpwuPkwBu9rvnNrXb_
Change-Type: minor
Connects-To: #60
This is untested so far, I just tested it by changing the js directly in the api node_modules.