apps: hasAccessTo -> canAccess
This commit is contained in:
10
src/ldap.js
10
src/ldap.js
@@ -53,7 +53,7 @@ async function getUsersWithAccessToApp(req) {
|
||||
assert.strictEqual(typeof req.app, 'object');
|
||||
|
||||
const result = await users.list();
|
||||
const allowedUsers = result.filter((user) => apps.hasAccessTo(req.app, user));
|
||||
const allowedUsers = result.filter((user) => apps.canAccess(req.app, user));
|
||||
return allowedUsers;
|
||||
}
|
||||
|
||||
@@ -472,9 +472,9 @@ async function authorizeUserForApp(req, res, next) {
|
||||
assert.strictEqual(typeof req.user, 'object');
|
||||
assert.strictEqual(typeof req.app, 'object');
|
||||
|
||||
const hasAccess = apps.hasAccessTo(req.app, req.user);
|
||||
const canAccess = apps.canAccess(req.app, req.user);
|
||||
// we return no such object, to avoid leakage of a users existence
|
||||
if (!hasAccess) return next(new ldap.NoSuchObjectError(req.dn.toString()));
|
||||
if (!canAccess) return next(new ldap.NoSuchObjectError(req.dn.toString()));
|
||||
|
||||
await eventlog.upsertLoginEvent(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', appId: req.app.id }, { userId: req.user.id, user: users.removePrivateFields(req.user) });
|
||||
|
||||
@@ -586,8 +586,8 @@ async function userSearchSftp(req, res, next) {
|
||||
|
||||
if (req.requireAdmin && users.compareRoles(user.role, users.ROLE_ADMIN) < 0) return next(new ldap.InsufficientAccessRightsError('Insufficient previleges'));
|
||||
|
||||
const hasAccess = apps.hasAccessTo(app, user);
|
||||
if (!hasAccess) return next(new ldap.InsufficientAccessRightsError('Not authorized'));
|
||||
const canAccess = apps.canAccess(app, user);
|
||||
if (!canAccess) return next(new ldap.InsufficientAccessRightsError('Not authorized'));
|
||||
|
||||
const obj = {
|
||||
dn: ldap.parseDN(`cn=${username}@${appFqdn},ou=sftp,dc=cloudron`).toString(),
|
||||
|
||||
Reference in New Issue
Block a user