MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-26 15:15:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Factorize siteadmin svrupdate perm check

Browse Source
This commit is contained in:
Noah Zalev 2021-08-06 23:37:33 -04:00
parent 69d2dc7e12
commit 72cd6e307c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meshuser.js
View File

@ -5615,9 +5615,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
function serverCommandPrint(command) { console.log(command.value); } function serverCommandPrint(command) { console.log(command.value); }
function serverCommandServerClearErrorLog(command) { function serverCommandServerClearErrorLog(command) {
// Clear the server error log // Clear the server error log if user has site update permissions
if ((user.siteadmin & 16) == 0) return; if (userHasSiteUpdate()) { fs.unlink(parent.parent.getConfigFilePath('mesherrors.txt'), function (err) { }); }
fs.unlink(parent.parent.getConfigFilePath('mesherrors.txt'), function (err) { });
} }
function serverCommandServerConsole(command) { function serverCommandServerConsole(command) {
@ -5645,7 +5644,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
function serverCommandServerErrors(command) { function serverCommandServerErrors(command) {
// Load the server error log // Load the server error log
if ((user.siteadmin & 16) == 0) return; if (!userHasSiteUpdate()) return;
if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.errorlog !== true))) return; if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.errorlog !== true))) return;
fs.readFile(parent.parent.getConfigFilePath('mesherrors.txt'), 'utf8', function (err, data) { try { ws.send(JSON.stringify({ action: 'servererrors', data: data })); } catch (ex) { } }); fs.readFile(parent.parent.getConfigFilePath('mesherrors.txt'), 'utf8', function (err, data) { try { ws.send(JSON.stringify({ action: 'servererrors', data: data })); } catch (ex) { } });
} }
@ -5670,7 +5669,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (req.session.loginToken != null) return; if (req.session.loginToken != null) return;
// Perform server update // Perform server update
if ((user.siteadmin & 16) == 0) return; if (!userHasSiteUpdate()) return;
if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) return; if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) return;
if ((command.version != null) && (typeof command.version != 'string')) return; if ((command.version != null) && (typeof command.version != 'string')) return;
parent.parent.performServerUpdate(command.version); parent.parent.performServerUpdate(command.version);
@ -5681,7 +5680,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (req.session.loginToken != null) return; if (req.session.loginToken != null) return;
// Check the server version // Check the server version
if ((user.siteadmin & 16) == 0) return; if (!userHasSiteUpdate()) return;
if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) return; if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) return;
parent.parent.getServerTags(function (tags, err) { try { ws.send(JSON.stringify({ action: 'serverversion', tags: tags })); } catch (ex) { } }); parent.parent.getServerTags(function (tags, err) { try { ws.send(JSON.stringify({ action: 'serverversion', tags: tags })); } catch (ex) { } });
} }
@ -6287,6 +6286,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
return extraids; return extraids;
} }
function userHasSiteUpdate() { return ((user.siteadmin & SITERIGHT_SERVERUPDATE) > 0); }
function csvClean(s) { return '\"' + s.split('\"').join('').split(',').join('').split('\r').join('').split('\n').join('') + '\"'; } function csvClean(s) { return '\"' + s.split('\"').join('').split(',').join('').split('\r').join('').split('\n').join('') + '\"'; }
// Return detailed information about an array of nodeid's // Return detailed information about an array of nodeid's