Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 48 additions & 20 deletions lib/acl.js
Original file line number Diff line number Diff line change
Expand Up @@ -679,32 +679,60 @@ Acl.prototype.middleware = function(numPathComponents, userId, actions){
return;
}

url = req.originalUrl.split('?')[0];
if(!numPathComponents){
resource = url;
}else{
resource = url.split('/').slice(0,numPathComponents+1).join('/');
}
var isResourceAllowed = function (originalUrl, callback){
url = originalUrl.split('?')[0];
if(!numPathComponents){
resource = url;
}else{
resource = url.split('/').slice(0,numPathComponents+1).join('/');
}

if(!_actions){
_actions = req.method.toLowerCase();
}
if(!_actions){
_actions = req.method.toLowerCase();
}

acl.logger?acl.logger.debug('Requesting '+_actions+' on '+resource+' by user '+_userId):null;
acl.logger?acl.logger.debug('Requesting '+_actions+' on '+resource+' by user '+_userId):null;

acl.isAllowed(_userId, resource, _actions, function(err, allowed){
if (err){
callback(new Error('Error checking permissions to access resource'));
}else if(allowed === false){
if (acl.logger) {
acl.logger.debug('Not allowed '+_actions+' on '+resource+' by user '+_userId);
acl.allowedPermissions(_userId, resource, function(err, obj){
acl.logger.debug('Allowed permissions: '+util.inspect(obj));
});
}
callback(new HttpError(403,'Insufficient permissions to access resource'));
}else{
acl.logger?acl.logger.debug('Allowed '+_actions+' on '+resource+' by user '+_userId):null;
callback();
}
});
}

acl.isAllowed(_userId, resource, _actions, function(err, allowed){
// check requested URL first
isResourceAllowed(req.originalUrl, function (err) {
if (err){
next(new Error('Error checking permissions to access resource'));
}else if(allowed === false){
if (acl.logger) {
acl.logger.debug('Not allowed '+_actions+' on '+resource+' by user '+_userId);
acl.allowedPermissions(_userId, resource, function(err, obj){
acl.logger.debug('Allowed permissions: '+util.inspect(obj));
});
// try current route URL if access to actual URL is denied
var routeUrl = req.baseUrl;
if (routeUrl.length > 0 && routeUrl[routeUrl.length - 1] !== '/') {
routeUrl += '/';
}

var routePath = req.route.path;
if (routePath.length > 0 && routePath !== '/' && routePath[0] === '/') {
routeUrl += routePath.substring(1);
}
next(new HttpError(403,'Insufficient permissions to access resource'));

isResourceAllowed(routeUrl, function (err) {
if (err){
next(err);
}else{
next();
}
});
}else{
acl.logger?acl.logger.debug('Allowed '+_actions+' on '+resource+' by user '+_userId):null;
next();
}
});
Expand Down
Loading