verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

test(samba): refs #5770 minor clean-code
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Javier Segarra 2024-05-10 22:18:42 +02:00
parent 54a8eb0cf8
commit 4222e2d4d9
2 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/account/back/mixins/account-linker.js
View File

@ -55,13 +55,15 @@ module.exports = function(Self, options) {
/** /**
* Synchronizes roles. * Synchronizes roles.
*/ */
async syncRoles() { try { async syncRoles() {
try {
await this.syncRoles(); await this.syncRoles();
} catch (e) { } catch (e) {
let err = new UserError(e.message); let err = new UserError(e.message);
err.name = e.name; err.name = e.name;
throw err; throw err;
}}, }
},
/** /**
* Tests linker configuration. * Tests linker configuration.

58
modules/account/back/models/samba-config.js
View File

@ -191,6 +191,35 @@ module.exports = Self => {
Object.assign(options, {filter}); Object.assign(options, {filter});
return this.adClient.searchAll(type, options); return this.adClient.searchAll(type, options);
}, },
removeMembers(role, user) {
return this.sambaTool('group', ['removemembers', role, user]);
},
addMembers(role, user) {
return this.sambaTool('group', ['addmembers', role, user]);
},
handleRoleMembers(users) {
if (users.length === 0) return [];
let members = users[0]?.member;
if (!members) return [];
if (!Array.isArray(members))members = [members];
return members.map((member => member.match(/CN=(.*?),(.*)/)[1]));
},
async handleUsersRole(role, currentUsers, users) {
const forbiddenUsers = ['guest'];
users = users.filter(u => !u.includes(forbiddenUsers));
const usersToDelete = differences(currentUsers, users);
if (usersToDelete.length > 0) {
const results = await Promise.all(usersToDelete.map(user =>
this.removemembers(role, user)));
printResults(results);
}
const usersToInsert = differences(users, currentUsers);
if (usersToInsert.length > 0) {
const results = await Promise.all(usersToInsert.map(user =>
this.addmembers(role, user)));
printResults(results);
}
},
async syncRoles() { async syncRoles() {
await this.init(); await this.init();
let $ = app.models; let $ = app.models;
@ -272,7 +301,7 @@ module.exports = Self => {
if (exist) { if (exist) {
return usersMap.get(role)?.map( return usersMap.get(role)?.map(
a => this.sambaTool('group', ['removemembers', role, a]) user => this.removeMembers(role, user)
); );
} else return []; } else return [];
} }
@ -295,7 +324,7 @@ module.exports = Self => {
// PROCEDIMIENTO PARA INSERTAR USUARIOS ASOCIADOS AL ROL // PROCEDIMIENTO PARA INSERTAR USUARIOS ASOCIADOS AL ROL
let usersToGroup = rolesToInsert.flatMap(role => usersMap.get(role).map( let usersToGroup = rolesToInsert.flatMap(role => usersMap.get(role).map(
a => this.sambaTool('group', ['addmembers', role, a]) user => this.addMembers(role, user)
) )
); );
const resultsUserGroup = await Promise.all(usersToGroup); const resultsUserGroup = await Promise.all(usersToGroup);
@ -303,7 +332,6 @@ module.exports = Self => {
} }
if (rolesToUpdate.length > 0) { if (rolesToUpdate.length > 0) {
let promises = [];
// OBTENER LDAPSJS MIEMBROS ROLES // OBTENER LDAPSJS MIEMBROS ROLES
for await (const role of rolesToUpdate) { for await (const role of rolesToUpdate) {
@ -324,29 +352,5 @@ module.exports = Self => {
console.error(error); console.error(error);
} }
}, },
handleRoleMembers(users) {
if (users.length === 0) return [];
let members = users[0]?.member;
if (!members) return [];
if (!Array.isArray(members))members = [members];
return members.map((member => member.match(/CN=(.*?),(.*)/)[1]));
},
async handleUsersRole(role, currentUsers, users) {
const forbiddenUsers = ['guest'];
users = users.filter(u => !u.includes(forbiddenUsers));
const usersToDelete = differences(currentUsers, users);
if (usersToDelete.length > 0) {
const results = await Promise.all(usersToDelete.map(user =>
this.sambaTool('group', ['removemembers', role, user])));
printResults(results);
}
const usersToInsert = differences(users, currentUsers);
if (usersToInsert.length > 0) {
const results = await Promise.all(usersToInsert.map(user =>
this.sambaTool('group', ['addmembers', role, user])));
printResults(results);
}
}
}); });
}; };