dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-24 15:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #787 from michael-pattern/feat/763/per-user_permissions_when_using_oauth-follow-up

Browse Source 
feat: per-user permissions when using oauth, follow-up
This commit is contained in:
Jan Prochazka
2024-06-07 10:54:45 +02:00
committed by GitHub
parent 66a9e0d14a 4214b4f613
commit 4e746a3055
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/api/src/utility/hasPermission.js
View File

@@ -9,7 +9,8 @@ function hasPermission(tested, req) {
return true; return true;
} }
const { user } = (req && req.auth) || {}; const { user } = (req && req.auth) || {};
const key = user || ''; const { login } = (process.env.OAUTH_PERMISSIONS && req && req.user) || {};
const key = user || login || '';
const logins = getLogins(); const logins = getLogins();
if (!userPermissions[key]) { if (!userPermissions[key]) {
@@ -39,7 +40,7 @@ function getLogins() {
permissions: process.env.PERMISSIONS, permissions: process.env.PERMISSIONS,
}); });
} }
if (process.env.LOGINS || process.env.OAUTH_PERMISSIONS) { if (process.env.LOGINS) {
const logins = _.compact(process.env.LOGINS.split(',').map(x => x.trim())); const logins = _.compact(process.env.LOGINS.split(',').map(x => x.trim()));
for (const login of logins) { for (const login of logins) {
const password = process.env[`LOGIN_PASSWORD_${login}`]; const password = process.env[`LOGIN_PASSWORD_${login}`];
@@ -51,13 +52,14 @@ function getLogins() {
permissions, permissions,
}); });
} }
if (process.env.OAUTH_PERMISSIONS) { }
res.push({ }
login, else if (process.env.OAUTH_PERMISSIONS) {
password: null, const login_permission_keys = Object.keys(process.env).filter((key) => _.startsWith(key, 'LOGIN_PERMISSIONS_'))
permissions, for (const permissions_key of login_permission_keys) {
}) const login = permissions_key.replace('LOGIN_PERMISSIONS_', '');
} const permissions = process.env[permissions_key];
userPermissions[login] = compilePermissions(permissions);
} }
} }