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

Rolled back two changes to see if it affects 2FA.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2019-09-14 17:27:49 -07:00
parent cdd1edfd61
commit 840133b3d3
6 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agents/meshcore.js
View File

@ -1672,15 +1672,11 @@ function createMeshCore(agent)
} }
/* /*
case 'npm': { case 'npm': {
var child = require('child_process').execFile('C:\\Program Files\\nodejs\\node.exe', ['-v']); var child = require('child_process').execFile('C:\\Program Files\\nodejs\\node.exe', ['node.exe', '-v']);
child.stdout.str = ''; child.stdout.str = '';
child.stdout.on('data', function (chunk) { child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
sendConsoleText(chunk, sessionid);
//this.str += chunk.toString();
});
child.waitExit(); child.waitExit();
response = 'Response: ' + child.stdout.str; response = 'Response: ' + child.stdout.str;
//exec('npm -v', function (error, stdout, stderr) { console.log('stdout: ', stdout); });
break; break;
} }
*/ */

8
agents/meshcore.min.js vendored
View File

@ -1672,15 +1672,11 @@ function createMeshCore(agent)
} }
/* /*
case 'npm': { case 'npm': {
var child = require('child_process').execFile('C:\\Program Files\\nodejs\\node.exe', ['-v']); var child = require('child_process').execFile('C:\\Program Files\\nodejs\\node.exe', ['node.exe', '-v']);
child.stdout.str = ''; child.stdout.str = '';
child.stdout.on('data', function (chunk) { child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
sendConsoleText(chunk, sessionid);
//this.str += chunk.toString();
});
child.waitExit(); child.waitExit();
response = 'Response: ' + child.stdout.str; response = 'Response: ' + child.stdout.str;
//exec('npm -v', function (error, stdout, stderr) { console.log('stdout: ', stdout); });
break; break;
} }
*/ */

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.4.0-p", "version": "0.4.0-q",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",

2
views/default-min.handlebars
View File

File diff suppressed because one or more lines are too long

2
views/default.handlebars
View File

@ -4230,7 +4230,7 @@
refreshDeviceEvents(); refreshDeviceEvents();
// Update the web page title // Update the web page title
if ((currentNode) && (xxcurrentView >= 10) && (xxcurrentView < 20)) { document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name; } else { document.title = decodeURIComponent("{{{extitle}}}"); } if ((currentNode) && (xxcurrentView >= 10) && (xxcurrentView < 20)) { document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name + ' - ' + mesh.name; } else { document.title = decodeURIComponent("{{{extitle}}}"); }
// Clear user consent status if present // Clear user consent status if present
p11clearConsoleMsg(); p11clearConsoleMsg();

7
webserver.js
View File

@ -1515,7 +1515,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
// Clean up the U2F challenge is needed // Clean up the U2F challenge is needed
if (req.session.u2fchallenge) { delete req.session.u2fchallenge; }; //if (req.session.u2fchallenge) { delete req.session.u2fchallenge; };
// Fetch the web state // Fetch the web state
parent.debug('web', 'handleRootRequestEx: success.'); parent.debug('web', 'handleRootRequestEx: success.');
@ -3160,7 +3160,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
// { 'Referrer-Policy': 'no-referrer', 'x-frame-options': 'SAMEORIGIN', 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'Content-Security-Policy': "default-src http: ws: data: 'self';script-src http: 'unsafe-inline';style-src http: 'unsafe-inline'" }; // { 'Referrer-Policy': 'no-referrer', 'x-frame-options': 'SAMEORIGIN', 'X-XSS-Protection': '1; mode=block', 'X-Content-Type-Options': 'nosniff', 'Content-Security-Policy': "default-src http: ws: data: 'self';script-src http: 'unsafe-inline';style-src http: 'unsafe-inline'" };
if ((domain != null) && (domain.httpheaders != null) && (typeof domain.httpheaders == 'object')) { if ((domain != null) && (domain.httpheaders != null) && (typeof domain.httpheaders == 'object')) {
res.set(domain.httpheaders); res.set(domain.httpheaders);
} else { }
/*
else {
// Use default security headers // Use default security headers
res.set({ res.set({
"X-Frame-Options": "sameorigin", "X-Frame-Options": "sameorigin",
@ -3170,6 +3172,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
"Content-Security-Policy": "default-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; frame-src 'self'; media-src 'self'" "Content-Security-Policy": "default-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; frame-src 'self'; media-src 'self'"
}); });
} }
*/
// Check the session if bound to the external IP address // Check the session if bound to the external IP address
if ((req.session.ip != null) && (req.session.ip == cleanRemoteAddr(req.ip))) { req.session = {}; } if ((req.session.ip != null) && (req.session.ip == cleanRemoteAddr(req.ip))) { req.session = {}; }