MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-12 07:23:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Access control improvements on mobile app.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-04-17 15:22:51 -07:00
parent 6ca8a392c6
commit ce39ab8691
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meshuser.js
View File

@ -45,6 +45,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
const MESHRIGHT_LIMITEVENTS = 8192; const MESHRIGHT_LIMITEVENTS = 8192;
const MESHRIGHT_CHATNOTIFY = 16384; const MESHRIGHT_CHATNOTIFY = 16384;
const MESHRIGHT_UNINSTALL = 32768; const MESHRIGHT_UNINSTALL = 32768;
const MESHRIGHT_NODESKTOP = 65536;
// Site rights // Site rights
const SITERIGHT_SERVERBACKUP = 1; // 0x00000001 const SITERIGHT_SERVERBACKUP = 1; // 0x00000001

9
views/default-mobile.handlebars
View File

@ -815,10 +815,10 @@
} }
// If we are currently looking at a node this is now gone, change the view. // If we are currently looking at a node this is now gone, change the view.
//if ((currentNode != null) && (getNodeFromId(currentNode._id) == null)) { currentNode = null; go(1); } if ((currentNode != null) && (IsNodeViewable(currentNode) == false)) { currentNode = null; go(2); }
// Change the reference to the current node // Change the reference to the current node
if (currentNode != null) { currentNode = getNodeFromId(currentNode._id); } if (currentNode != null) { currentNode = getNodeFromId(currentNode._id); if (currentNode != null) { gotoDevice(currentNode._id, xxcurrentView, true); } else { go(2); } }
//onSortSelectChange(); //onSortSelectChange();
//onSearchInputChanged(); //onSearchInputChanged();
@ -2103,6 +2103,7 @@
meshserver.send({ action: 'toast', nodeids: [currentNode._id], title: 'MeshCentral', msg: Q('d2devToast').value }); meshserver.send({ action: 'toast', nodeids: [currentNode._id], title: 'MeshCentral', msg: Q('d2devToast').value });
} }
// && ((meshrights == 0xFFFFFFFF) || ((meshrights & 65536) == 0))
function setupDeviceMenu(op, obj) { function setupDeviceMenu(op, obj) {
var meshrights = GetNodeRights(currentNode); var meshrights = GetNodeRights(currentNode);
if (op != null) { currentDevicePanel = op; } if (op != null) { currentDevicePanel = op; }
@ -2111,11 +2112,13 @@
QV('p10files', currentDevicePanel == 2); QV('p10files', currentDevicePanel == 2);
var menus = []; var menus = [];
if (currentDevicePanel != 0) { menus.push({ n: 'General', f: 'setupDeviceMenu(0)' }); } if (currentDevicePanel != 0) { menus.push({ n: 'General', f: 'setupDeviceMenu(0)' }); }
if ((currentDevicePanel != 1) && if ((currentDevicePanel != 1) &&
(currentNode != null) && (currentNode != null) &&
((meshrights & 8) || (meshrights & 256)) && ((meshrights & 8) || (meshrights & 256)) && ((meshrights == 0xFFFFFFFF) || ((meshrights & 65536) == 0)) &&
(((currentNode.agent == null) && ((typeof currentNode.intelamt.sku !== 'number') || ((currentNode.intelamt.sku & 8) != 0))) || (currentNode.agent && (currentNode.agent.caps & 1))) (((currentNode.agent == null) && ((typeof currentNode.intelamt.sku !== 'number') || ((currentNode.intelamt.sku & 8) != 0))) || (currentNode.agent && (currentNode.agent.caps & 1)))
) { menus.push({ n: 'Desktop', f: 'setupDeviceMenu(1)' }); } ) { menus.push({ n: 'Desktop', f: 'setupDeviceMenu(1)' }); }
if ((currentDevicePanel != 2) && (currentNode != null) && (meshrights & 8) && ((meshrights == 0xFFFFFFFF) || ((meshrights & 1024) == 0)) && ((currentNode.mtype == 2) && (currentNode.agent.caps & 4))) { menus.push({ n: 'Files', f: 'setupDeviceMenu(2)' }); } if ((currentDevicePanel != 2) && (currentNode != null) && (meshrights & 8) && ((meshrights == 0xFFFFFFFF) || ((meshrights & 1024) == 0)) && ((currentNode.mtype == 2) && (currentNode.agent.caps & 4))) { menus.push({ n: 'Files', f: 'setupDeviceMenu(2)' }); }
updateFooterMenu(menus); updateFooterMenu(menus);
} }

2
views/default.handlebars
View File

@ -1847,7 +1847,7 @@
if ((currentNode != null) && (IsNodeViewable(currentNode) == false)) { currentNode = null; go(1); } if ((currentNode != null) && (IsNodeViewable(currentNode) == false)) { currentNode = null; go(1); }
// Change the reference to the current node // Change the reference to the current node
if (currentNode != null) { currentNode = getNodeFromId(currentNode._id); gotoDevice(currentNode._id, xxcurrentView, true); } if (currentNode != null) { currentNode = getNodeFromId(currentNode._id); if (currentNode != null) { gotoDevice(currentNode._id, xxcurrentView, true); } else { go(1); } }
masterUpdate(1 | 2 | 4 | 64); masterUpdate(1 | 2 | 4 | 64);
break; break;