@@ -1809,10 +1810,9 @@
}
function updateSiteAdmin() {
- var noServerBackup = '{{{noServerBackup}}}';
+ var serverFeatures = parseInt('{{{serverfeatures}}}');
var siteRights = userinfo.siteadmin;
var accountSettingsLocked = ((siteRights != 0xFFFFFFFF) && ((siteRights & 1024) != 0));
- if (noServerBackup == 1) { siteRights &= 0xFFFFFFFA; } // If not server backups allowed, remove server backup and restore permissions
// Update account actions
QV('p2AccountSecurity', ((features & 4) == 0) && (serverinfo.domainauth == false) && ((features & 4096) != 0) && (accountSettingsLocked == false)); // Hide Account Security if in single user mode or domain authentication, 2 factor auth not supported.
@@ -1823,12 +1823,13 @@
QV('p2AccountPassActions', ((features & 4) == 0) && (serverinfo.domainauth == false) && (userinfo != null) && (userinfo._id.split('/')[2].startsWith('~') == false)); // Hide Account Actions if in single user mode or domain authentication
//QV('p2AccountImage', ((features & 4) == 0) && (serverinfo.domainauth == false)); // If account actions are not visible, also remove the image on that panel
QV('p2AccountImage', !accountSettingsLocked)
- QV('p2ServerActions', siteRights & 21);
+ QV('p2ServerActions', (siteRights & 21) && ((serverFeatures & 15) != 0));
QV('LeftMenuMyServer', siteRights & 21); // 16 + 4 + 1
QV('MainMenuMyServer', siteRights & 21);
- QV('p2ServerActionsBackup', siteRights & 1);
- QV('p2ServerActionsRestore', siteRights & 4);
- QV('p2ServerActionsVersion', siteRights & 16);
+ QV('p2ServerActionsBackup', (siteRights & 1) && ((serverFeatures & 1) != 0));
+ QV('p2ServerActionsRestore', (siteRights & 4) && ((serverFeatures & 2) != 0));
+ QV('p2ServerActionsVersion', (siteRights & 16) && ((serverFeatures & 4) != 0));
+ QV('p2ServerActionsErrors', (siteRights & 16) && ((serverFeatures & 8) != 0));
QV('MainMenuMyFiles', siteRights & 8);
QV('LeftMenuMyFiles', siteRights & 8);
if (((siteRights & 8) == 0) && (xxcurrentView == 5)) { setDialogMode(0); go(1); }
@@ -1847,8 +1848,8 @@
if (xxcurrentView == 4 || ((xxcurrentView >= 30) && (xxcurrentView < 40))) { setDialogMode(0); go(1); currentUser = null; }
}
meshserver.send({ action: 'events', limit: parseInt(p3limitdropdown.value) });
- QV('ServerConsole', userinfo.siteadmin === 0xFFFFFFFF);
- QV('ServerTrace', userinfo.siteadmin === 0xFFFFFFFF);
+ QV('ServerConsole', (userinfo.siteadmin === 0xFFFFFFFF) && ((serverFeatures & 16) != 0));
+ QV('ServerTrace', (userinfo.siteadmin === 0xFFFFFFFF) && ((serverFeatures & 32) != 0));
if ((xxcurrentView == 115) && (userinfo.siteadmin != 0xFFFFFFFF)) { go(6); }
if ((xxcurrentView == 6) && ((userinfo.siteadmin & 21) == 0)) { go(1); }
diff --git a/webserver.js b/webserver.js
index 02cab3ee..f2af82a2 100644
--- a/webserver.js
+++ b/webserver.js
@@ -2370,8 +2370,41 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
var customui = '';
if (domain.customui != null) { customui = encodeURIComponent(JSON.stringify(domain.customui)); }
+ // Server features
+ var serverFeatures = 63;
+ if (domain.myserver) {
+ if (domain.myserver.backup !== true) { serverFeatures -= 1; } // Allow server backups
+ if (domain.myserver.restore !== true) { serverFeatures -= 2; } // Allow server restore
+ if (domain.myserver.upgrade !== true) { serverFeatures -= 4; } // Allow server upgrade
+ if (domain.myserver.errorlog !== true) { serverFeatures -= 8; } // Allow show server crash log
+ if (domain.myserver.console !== true) { serverFeatures -= 16; } // Allow server console
+ if (domain.myserver.trace !== true) { serverFeatures -= 32; } // Allow server tracing
+ }
+
// Refresh the session
- render(req, res, getRenderPage('default', req, domain), getRenderArgs({ authCookie: authCookie, authRelayCookie: authRelayCookie, viewmode: viewmode, currentNode: currentNode, logoutControls: encodeURIComponent(JSON.stringify(logoutcontrols)).replace(/'/g, '%27'), domain: domain.id, debuglevel: parent.debugLevel, serverDnsName: obj.getWebServerName(domain), serverRedirPort: args.redirport, serverPublicPort: httpsPort, noServerBackup: (args.noserverbackup == 1 ? 1 : 0), features: features, sessiontime: args.sessiontime, mpspass: args.mpspass, passRequirements: passRequirements, customui: customui, webcerthash: Buffer.from(obj.webCertificateFullHashs[domain.id], 'binary').toString('base64').replace(/\+/g, '@').replace(/\//g, '$'), footer: (domain.footer == null) ? '' : domain.footer, webstate: encodeURIComponent(webstate).replace(/'/g, '%27'), amtscanoptions: amtscanoptions, pluginHandler: (parent.pluginHandler == null) ? 'null' : parent.pluginHandler.prepExports() }, req, domain));
+ render(req, res, getRenderPage('default', req, domain), getRenderArgs({
+ authCookie: authCookie,
+ authRelayCookie: authRelayCookie,
+ viewmode: viewmode,
+ currentNode: currentNode,
+ logoutControls: encodeURIComponent(JSON.stringify(logoutcontrols)).replace(/'/g, '%27'),
+ domain: domain.id,
+ debuglevel: parent.debugLevel,
+ serverDnsName: obj.getWebServerName(domain),
+ serverRedirPort: args.redirport,
+ serverPublicPort: httpsPort,
+ serverfeatures: serverFeatures,
+ features: features,
+ sessiontime: args.sessiontime,
+ mpspass: args.mpspass,
+ passRequirements: passRequirements,
+ customui: customui,
+ webcerthash: Buffer.from(obj.webCertificateFullHashs[domain.id], 'binary').toString('base64').replace(/\+/g, '@').replace(/\//g, '$'),
+ footer: (domain.footer == null) ? '' : domain.footer,
+ webstate: encodeURIComponent(webstate).replace(/'/g, '%27'),
+ amtscanoptions: amtscanoptions,
+ pluginHandler: (parent.pluginHandler == null) ? 'null' : parent.pluginHandler.prepExports()
+ }, req, domain));
});
} else {
// Send back the login application
@@ -4016,7 +4049,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
const domain = checkUserIpAddress(req, res);
if (domain == null) { return; }
if ((domain.loginkey != null) && (domain.loginkey.indexOf(req.query.key) == -1)) { res.sendStatus(404); return; } // Check 3FA URL key
- if ((!req.session) || (req.session == null) || (!req.session.userid) || (obj.parent.args.noserverbackup == 1)) { res.sendStatus(401); return; }
+ if ((!req.session) || (req.session == null) || (!req.session.userid)) { res.sendStatus(401); return; }
+ if ((domain.myserver != null) && (domain.myserver.backup !== true)) { res.sendStatus(401); return; }
+
var user = obj.users[req.session.userid];
if ((user == null) || ((user.siteadmin & 1) == 0)) { res.sendStatus(401); return; } // Check if we have server backup rights
@@ -4044,7 +4079,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
const domain = checkUserIpAddress(req, res);
if (domain == null) { return; }
if ((domain.loginkey != null) && (domain.loginkey.indexOf(req.query.key) == -1)) { res.sendStatus(404); return; } // Check 3FA URL key
- if (obj.parent.args.noserverbackup == 1) { res.sendStatus(401); return; }
+ if ((domain.myserver != null) && (domain.myserver.restore !== true)) { res.sendStatus(401); return; }
+
var authUserid = null;
if ((req.session != null) && (typeof req.session.userid == 'string')) { authUserid = req.session.userid; }
const multiparty = require('multiparty');
@@ -4769,8 +4805,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
obj.app.get(url, handleRootRequest);
obj.app.post(url, handleRootPostRequest);
obj.app.get(url + 'refresh.ashx', function (req, res) { res.sendStatus(200); });
- obj.app.get(url + 'backup.zip', handleBackupRequest);
- obj.app.post(url + 'restoreserver.ashx', handleRestoreRequest);
+ if ((domain.myserver == null) || (domain.myserver.backup === true)) { obj.app.get(url + 'backup.zip', handleBackupRequest); }
+ if ((domain.myserver == null) || (domain.myserver.restore === true)) { obj.app.post(url + 'restoreserver.ashx', handleRestoreRequest); }
obj.app.get(url + 'terms', handleTermsRequest);
obj.app.get(url + 'xterm', handleXTermRequest);
obj.app.post(url + 'login', handleLoginRequest);