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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data

This commit is contained in:
Vicent Llopis 2022-02-23 09:12:25 +01:00
parent 578685e05e 17b178b6bf
commit c7db8c6b06
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/account/back/models/role-config.js
View File

@ -1,7 +1,9 @@
module.exports = Self => { module.exports = Self => {
Self.getSynchronizer = async function() { Self.getSynchronizer = async function() {
return await Self.findOne({fields: ['id']}); return await Self.findOne({
fields: ['id', 'rolePrefix', 'userPrefix', 'userHost']
});
}; };
Object.assign(Self.prototype, { Object.assign(Self.prototype, {
@ -14,17 +16,16 @@ module.exports = Self => {
}, },
async syncUser(userName, info, password) { async syncUser(userName, info, password) {
const mysqlHost = '%';
let mysqlUser = userName; let mysqlUser = userName;
if (this.dbType == 'MySQL') mysqlUser = `!${mysqlUser}`; if (this.dbType == 'MySQL')
mysqlUser = this.userPrefix + mysqlUser;
const [row] = await Self.rawSql( const [row] = await Self.rawSql(
`SELECT COUNT(*) AS nRows `SELECT COUNT(*) AS nRows
FROM mysql.user FROM mysql.user
WHERE User = ? WHERE User = ?
AND Host = ?`, AND Host = ?`,
[mysqlUser, mysqlHost] [mysqlUser, this.userHost]
); );
let userExists = row.nRows > 0; let userExists = row.nRows > 0;
@ -35,11 +36,10 @@ module.exports = Self => {
FROM mysql.global_priv FROM mysql.global_priv
WHERE User = ? WHERE User = ?
AND Host = ?`, AND Host = ?`,
[mysqlUser, mysqlHost] [mysqlUser, this.userHost]
); );
const priv = row && JSON.parse(row.priv); const priv = row && JSON.parse(row.priv);
const role = priv && priv.default_role; isUpdatable = !row || (priv && priv.autogenerated);
isUpdatable = !row || (role && role.startsWith('z-'));
} }
if (!isUpdatable) { if (!isUpdatable) {
@ -51,31 +51,27 @@ module.exports = Self => {
if (password) { if (password) {
if (!userExists) { if (!userExists) {
await Self.rawSql('CREATE USER ?@? IDENTIFIED BY ?', await Self.rawSql('CREATE USER ?@? IDENTIFIED BY ?',
[mysqlUser, mysqlHost, password] [mysqlUser, this.userHost, password]);
);
userExists = true; userExists = true;
} else { } else {
switch (this.dbType) { switch (this.dbType) {
case 'MariaDB': case 'MariaDB':
await Self.rawSql('ALTER USER ?@? IDENTIFIED BY ?', await Self.rawSql('ALTER USER ?@? IDENTIFIED BY ?',
[mysqlUser, mysqlHost, password] [mysqlUser, this.userHost, password]);
);
break; break;
default: default:
await Self.rawSql('SET PASSWORD FOR ?@? = PASSWORD(?)', await Self.rawSql('SET PASSWORD FOR ?@? = PASSWORD(?)',
[mysqlUser, mysqlHost, password] [mysqlUser, this.userHost, password]);
);
} }
} }
} }
if (userExists && this.dbType == 'MariaDB') { if (userExists && this.dbType == 'MariaDB') {
let role = `z-${info.user.role().name}`; let role = `${this.rolePrefix}${info.user.role().name}`;
try { try {
await Self.rawSql('REVOKE ALL, GRANT OPTION FROM ?@?', await Self.rawSql('REVOKE ALL, GRANT OPTION FROM ?@?',
[mysqlUser, mysqlHost] [mysqlUser, this.userHost]);
);
} catch (err) { } catch (err) {
if (err.code == 'ER_REVOKE_GRANTS') if (err.code == 'ER_REVOKE_GRANTS')
console.warn(`${err.code}: ${err.sqlMessage}: ${err.sql}`); console.warn(`${err.code}: ${err.sqlMessage}: ${err.sql}`);
@ -83,21 +79,18 @@ module.exports = Self => {
throw err; throw err;
} }
await Self.rawSql('GRANT ? TO ?@?', await Self.rawSql('GRANT ? TO ?@?',
[role, mysqlUser, mysqlHost] [role, mysqlUser, this.userHost]);
);
if (role) { if (role) {
await Self.rawSql('SET DEFAULT ROLE ? FOR ?@?', await Self.rawSql('SET DEFAULT ROLE ? FOR ?@?',
[role, mysqlUser, mysqlHost] [role, mysqlUser, this.userHost]);
);
} else { } else {
await Self.rawSql('SET DEFAULT ROLE NONE FOR ?@?', await Self.rawSql('SET DEFAULT ROLE NONE FOR ?@?',
[mysqlUser, mysqlHost] [mysqlUser, this.userHost]);
);
} }
} }
} else if (userExists) } else if (userExists)
await Self.rawSql('DROP USER ?@?', [mysqlUser, mysqlHost]); await Self.rawSql('DROP USER ?@?', [mysqlUser, this.userHost]);
} }
}); });
}; };

12
modules/account/back/models/role-config.json
View File

@ -16,6 +16,18 @@
}, },
"mysqlPassword": { "mysqlPassword": {
"type": "string" "type": "string"
},
"rolePrefix": {
"type": "string"
},
"userPrefix": {
"type": "string"
},
"userHost": {
"type": "string"
},
"tplUser": {
"type": "string"
} }
} }
} }