Fixed usernames that include a dot (.)
Ylian Saint-Hilaire committed
Jul 13, 2018 at 19:18 UTC
81ccbae15cfddeaef6c3cea1f84f0e807847a580
16 files changed
+139
-91
agents/MeshCmd-signed.exe
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
agents/MeshCmd64-signed.exe
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
agents/meshcmd.js
+5
@@ -1095,6 +1095,11 @@ function kvmCtrlData(channel, cmd) {
1095
try { cmd = JSON.parse(cmd); } catch (ex) { console.error('Invalid JSON: ' + cmd); return; }
1096
if ((cmd.path != null) && (process.platform != 'win32') && (cmd.path[0] != '/')) { cmd.path = '/' + cmd.path; } // Add '/' to paths on non-windows
1097
switch (cmd.action) {
1098
+ case 'ping': {
1099
+ // This is a keep alive
1100
+ channel.write({ action: 'pong' });
1101
+ break;
1102
+ }
1103
case 'ls': {
1104
/*
1105
// Close the watcher if required
agents/meshcore.js
+5
@@ -1518,6 +1518,11 @@ function createMeshCore(agent) {
1518
try { cmd = JSON.parse(cmd); } catch (ex) { console.error('Invalid JSON: ' + cmd); return; }
1519
if ((cmd.path != null) && (process.platform != 'win32') && (cmd.path[0] != '/')) { cmd.path = '/' + cmd.path; } // Add '/' to paths on non-windows
1520
switch (cmd.action) {
1521
+ case 'ping': {
1522
+ // This is a keep alive
1523
+ channel.write({ action: 'pong' });
1524
+ break;
1525
+ }
1526
case 'ls': {
1527
/*
1528
// Close the watcher if required
certoperations.js
+54
-54
@@ -130,7 +130,7 @@ module.exports.CertificateOperations = function () {
130
}
131
132
// Returns the web server TLS certificate and private key, if not present, create demonstration ones.
133
- obj.GetMeshServerCertificate = function (directory, args, config, parent, func) {
133
+ obj.GetMeshServerCertificate = function (parent, args, config, func) {
134
var certargs = args.cert;
135
var mpscertargs = args.mpscert;
136
var strongCertificate = (args.fastcert ? false : true);
@@ -138,68 +138,68 @@ module.exports.CertificateOperations = function () {
138
// commonName, country, organization
139
140
// If the certificates directory does not exist, create it.
141
- if (!obj.dirExists(directory)) { obj.fs.mkdirSync(directory); }
141
+ if (!obj.dirExists(parent.datapath)) { obj.fs.mkdirSync(parent.datapath); }
142
var r = {}, rcount = 0;
143
144
// If the root certificate already exist, load it
145
- if (obj.fileExists(directory + '/root-cert-public.crt') && obj.fileExists(directory + '/root-cert-private.key')) {
146
- var rootCertificate = obj.fs.readFileSync(directory + '/root-cert-public.crt', 'utf8');
147
- var rootPrivateKey = obj.fs.readFileSync(directory + '/root-cert-private.key', 'utf8');
145
+ if (obj.fileExists(parent.getConfigFilePath('root-cert-public.crt')) && obj.fileExists(parent.getConfigFilePath('root-cert-private.key'))) {
146
+ var rootCertificate = obj.fs.readFileSync(parent.getConfigFilePath('root-cert-public.crt'), 'utf8');
147
+ var rootPrivateKey = obj.fs.readFileSync(parent.getConfigFilePath('root-cert-private.key'), 'utf8');
148
r.root = { cert: rootCertificate, key: rootPrivateKey };
149
rcount++;
150
}
151
152
if (args.tlsoffload == true) {
153
// If the web certificate already exist, load it. Load just the certificate since we are in TLS offload situation
154
- if (obj.fileExists(directory + '/webserver-cert-public.crt')) {
155
- var webCertificate = obj.fs.readFileSync(directory + '/webserver-cert-public.crt', 'utf8');
154
+ if (obj.fileExists(parent.getConfigFilePath('webserver-cert-public.crt'))) {
155
+ var webCertificate = obj.fs.readFileSync(parent.getConfigFilePath('webserver-cert-public.crt'), 'utf8');
156
r.web = { cert: webCertificate };
157
rcount++;
158
}
159
} else {
160
// If the web certificate already exist, load it. Load both certificate and private key
161
- if (obj.fileExists(directory + '/webserver-cert-public.crt') && obj.fileExists(directory + '/webserver-cert-private.key')) {
162
- var webCertificate = obj.fs.readFileSync(directory + '/webserver-cert-public.crt', 'utf8');
163
- var webPrivateKey = obj.fs.readFileSync(directory + '/webserver-cert-private.key', 'utf8');
161
+ if (obj.fileExists(parent.getConfigFilePath('webserver-cert-public.crt')) && obj.fileExists(parent.getConfigFilePath('webserver-cert-private.key'))) {
162
+ var webCertificate = obj.fs.readFileSync(parent.getConfigFilePath('webserver-cert-public.crt'), 'utf8');
163
+ var webPrivateKey = obj.fs.readFileSync(parent.getConfigFilePath('webserver-cert-private.key'), 'utf8');
164
r.web = { cert: webCertificate, key: webPrivateKey };
165
rcount++;
166
}
167
}
168
169
// If the mps certificate already exist, load it
170
- if (obj.fileExists(directory + '/mpsserver-cert-public.crt') && obj.fileExists(directory + '/mpsserver-cert-private.key')) {
171
- var mpsCertificate = obj.fs.readFileSync(directory + '/mpsserver-cert-public.crt', 'utf8');
172
- var mpsPrivateKey = obj.fs.readFileSync(directory + '/mpsserver-cert-private.key', 'utf8');
170
+ if (obj.fileExists(parent.getConfigFilePath('mpsserver-cert-public.crt')) && obj.fileExists(parent.getConfigFilePath('mpsserver-cert-private.key'))) {
171
+ var mpsCertificate = obj.fs.readFileSync(parent.getConfigFilePath('mpsserver-cert-public.crt'), 'utf8');
172
+ var mpsPrivateKey = obj.fs.readFileSync(parent.getConfigFilePath('mpsserver-cert-private.key'), 'utf8');
173
r.mps = { cert: mpsCertificate, key: mpsPrivateKey };
174
rcount++;
175
}
176
177
// If the agent certificate already exist, load it
178
- if (obj.fileExists(directory + '/agentserver-cert-public.crt') && obj.fileExists(directory + '/agentserver-cert-private.key')) {
179
- var agentCertificate = obj.fs.readFileSync(directory + '/agentserver-cert-public.crt', 'utf8');
180
- var agentPrivateKey = obj.fs.readFileSync(directory + '/agentserver-cert-private.key', 'utf8');
178
+ if (obj.fileExists(parent.getConfigFilePath('agentserver-cert-public.crt')) && obj.fileExists(parent.getConfigFilePath('agentserver-cert-private.key'))) {
179
+ var agentCertificate = obj.fs.readFileSync(parent.getConfigFilePath('agentserver-cert-public.crt'), 'utf8');
180
+ var agentPrivateKey = obj.fs.readFileSync(parent.getConfigFilePath('agentserver-cert-private.key'), 'utf8');
181
r.agent = { cert: agentCertificate, key: agentPrivateKey };
182
rcount++;
183
}
184
185
// If the console certificate already exist, load it
186
- if (obj.fileExists(directory + '/amtconsole-cert-public.crt') && obj.fileExists(directory + '/agentserver-cert-private.key')) {
187
- var amtConsoleCertificate = obj.fs.readFileSync(directory + '/amtconsole-cert-public.crt', 'utf8');
188
- var amtConsolePrivateKey = obj.fs.readFileSync(directory + '/amtconsole-cert-private.key', 'utf8');
186
+ if (obj.fileExists(parent.getConfigFilePath('amtconsole-cert-public.crt')) && obj.fileExists(parent.getConfigFilePath('agentserver-cert-private.key'))) {
187
+ var amtConsoleCertificate = obj.fs.readFileSync(parent.getConfigFilePath('amtconsole-cert-public.crt'), 'utf8');
188
+ var amtConsolePrivateKey = obj.fs.readFileSync(parent.getConfigFilePath('amtconsole-cert-private.key'), 'utf8');
189
r.console = { cert: amtConsoleCertificate, key: amtConsolePrivateKey };
190
rcount++;
191
}
192
193
// If the swarm server certificate exist, load it (This is an optional certificate)
194
- if (obj.fileExists(directory + '/swarmserver-cert-public.crt') && obj.fileExists(directory + '/swarmserver-cert-private.key')) {
195
- var swarmServerCertificate = obj.fs.readFileSync(directory + '/swarmserver-cert-public.crt', 'utf8');
196
- var swarmServerPrivateKey = obj.fs.readFileSync(directory + '/swarmserver-cert-private.key', 'utf8');
194
+ if (obj.fileExists(parent.getConfigFilePath('swarmserver-cert-public.crt')) && obj.fileExists(parent.getConfigFilePath('swarmserver-cert-private.key'))) {
195
+ var swarmServerCertificate = obj.fs.readFileSync(parent.getConfigFilePath('swarmserver-cert-public.crt'), 'utf8');
196
+ var swarmServerPrivateKey = obj.fs.readFileSync(parent.getConfigFilePath('swarmserver-cert-private.key'), 'utf8');
197
r.swarmserver = { cert: swarmServerCertificate, key: swarmServerPrivateKey };
198
}
199
200
// If the swarm server root certificate exist, load it (This is an optional certificate)
201
- if (obj.fileExists(directory + '/swarmserverroot-cert-public.crt')) {
202
- var swarmServerRootCertificate = obj.fs.readFileSync(directory + '/swarmserverroot-cert-public.crt', 'utf8');
201
+ if (obj.fileExists(parent.getConfigFilePath('swarmserverroot-cert-public.crt'))) {
202
+ var swarmServerRootCertificate = obj.fs.readFileSync(parent.getConfigFilePath('swarmserverroot-cert-public.crt'), 'utf8');
203
r.swarmserverroot = { cert: swarmServerRootCertificate };
204
}
205
@@ -208,8 +208,8 @@ module.exports.CertificateOperations = function () {
208
var caok, caindex = 1, calist = [];
209
do {
210
caok = false;
211
- if (obj.fileExists(directory + '/webserver-cert-chain' + caindex + '.crt')) {
212
- var caCertificate = obj.fs.readFileSync(directory + '/webserver-cert-chain' + caindex + '.crt', 'utf8');
211
+ if (obj.fileExists(parent.getConfigFilePath('webserver-cert-chain' + caindex + '.crt'))) {
212
+ var caCertificate = obj.fs.readFileSync(parent.getConfigFilePath('webserver-cert-chain' + caindex + '.crt'), 'utf8');
213
calist.push(caCertificate);
214
caok = true;
215
}
@@ -243,23 +243,23 @@ module.exports.CertificateOperations = function () {
243
var dnsname = config.domains[i].dns;
244
if (args.tlsoffload == true) {
245
// If the web certificate already exist, load it. Load just the certificate since we are in TLS offload situation
246
- if (obj.fileExists(directory + '/webserver-' + i + '-cert-public.crt')) {
247
- r.dns[i] = { cert: obj.fs.readFileSync(directory + '/webserver-' + i + '-cert-public.crt', 'utf8') };
246
+ if (obj.fileExists(parent.getConfigFilePath('webserver-' + i + '-cert-public.crt'))) {
247
+ r.dns[i] = { cert: obj.fs.readFileSync(parent.getConfigFilePath('webserver-' + i + '-cert-public.crt'), 'utf8') };
248
config.domains[i].certs = r.dns[i];
249
} else {
250
console.log('WARNING: File "webserver-' + i + '-cert-public.crt" missing, domain "' + i + '" will not work correctly.');
251
}
252
} else {
253
// If the web certificate already exist, load it. Load both certificate and private key
254
- if (obj.fileExists(directory + '/webserver-' + i + '-cert-public.crt') && obj.fileExists(directory + '/webserver-' + i + '-cert-private.key')) {
255
- r.dns[i] = { cert: obj.fs.readFileSync(directory + '/webserver-' + i + '-cert-public.crt', 'utf8'), key: obj.fs.readFileSync(directory + '/webserver-' + i + '-cert-private.key', 'utf8') };
254
+ if (obj.fileExists(parent.getConfigFilePath('webserver-' + i + '-cert-public.crt')) && obj.fileExists(parent.getConfigFilePath('webserver-' + i + '-cert-private.key'))) {
255
+ r.dns[i] = { cert: obj.fs.readFileSync(parent.getConfigFilePath('webserver-' + i + '-cert-public.crt'), 'utf8'), key: obj.fs.readFileSync(parent.getConfigFilePath('webserver-' + i + '-cert-private.key'), 'utf8') };
256
config.domains[i].certs = r.dns[i];
257
// If CA certificates are present, load them
258
var caok, caindex = 1, calist = [];
259
do {
260
caok = false;
261
- if (obj.fileExists(directory + '/webserver-' + i + '-cert-chain' + caindex + '.crt')) {
262
- var caCertificate = obj.fs.readFileSync(directory + '/webserver-' + i + '-cert-chain' + caindex + '.crt', 'utf8');
261
+ if (obj.fileExists(parent.getConfigFilePath('webserver-' + i + '-cert-chain' + caindex + '.crt'))) {
262
+ var caCertificate = obj.fs.readFileSync(parent.getConfigFilePath('webserver-' + i + '-cert-chain' + caindex + '.crt'), 'utf8');
263
calist.push(caCertificate);
264
caok = true;
265
}
@@ -323,8 +323,8 @@ module.exports.CertificateOperations = function () {
323
rootCertAndKey = obj.GenerateRootCertificate(true, 'MeshCentralRoot', null, null, strongCertificate);
324
rootCertificate = obj.pki.certificateToPem(rootCertAndKey.cert);
325
rootPrivateKey = obj.pki.privateKeyToPem(rootCertAndKey.key);
326
- obj.fs.writeFileSync(directory + '/root-cert-public.crt', rootCertificate);
327
- obj.fs.writeFileSync(directory + '/root-cert-private.key', rootPrivateKey);
326
+ obj.fs.writeFileSync(parent.getConfigFilePath('root-cert-public.crt'), rootCertificate);
327
+ obj.fs.writeFileSync(parent.getConfigFilePath('root-cert-private.key'), rootPrivateKey);
328
} else {
329
// Keep the root certificate we have
330
rootCertAndKey = { cert: obj.pki.certificateFromPem(r.root.cert), key: obj.pki.privateKeyFromPem(r.root.key) };
@@ -340,8 +340,8 @@ module.exports.CertificateOperations = function () {
340
webCertAndKey = obj.IssueWebServerCertificate(rootCertAndKey, false, commonName, country, organization, null, strongCertificate);
341
webCertificate = obj.pki.certificateToPem(webCertAndKey.cert);
342
webPrivateKey = obj.pki.privateKeyToPem(webCertAndKey.key);
343
- obj.fs.writeFileSync(directory + '/webserver-cert-public.crt', webCertificate);
344
- obj.fs.writeFileSync(directory + '/webserver-cert-private.key', webPrivateKey);
343
+ obj.fs.writeFileSync(parent.getConfigFilePath('webserver-cert-public.crt'), webCertificate);
344
+ obj.fs.writeFileSync(parent.getConfigFilePath('webserver-cert-private.key'), webPrivateKey);
345
} else {
346
// Keep the console certificate we have
347
webCertAndKey = { cert: obj.pki.certificateFromPem(r.web.cert), key: obj.pki.privateKeyFromPem(r.web.key) };
@@ -356,8 +356,8 @@ module.exports.CertificateOperations = function () {
356
agentCertAndKey = obj.IssueWebServerCertificate(rootCertAndKey, true, 'MeshCentralAgentServer', null, strongCertificate);
357
agentCertificate = obj.pki.certificateToPem(agentCertAndKey.cert);
358
agentPrivateKey = obj.pki.privateKeyToPem(agentCertAndKey.key);
359
- obj.fs.writeFileSync(directory + '/agentserver-cert-public.crt', agentCertificate);
360
- obj.fs.writeFileSync(directory + '/agentserver-cert-private.key', agentPrivateKey);
359
+ obj.fs.writeFileSync(parent.getConfigFilePath('agentserver-cert-public.crt'), agentCertificate);
360
+ obj.fs.writeFileSync(parent.getConfigFilePath('agentserver-cert-private.key'), agentPrivateKey);
361
} else {
362
// Keep the mesh agent server certificate we have
363
agentCertAndKey = { cert: obj.pki.certificateFromPem(r.agent.cert), key: obj.pki.privateKeyFromPem(r.agent.key) };
@@ -372,8 +372,8 @@ module.exports.CertificateOperations = function () {
372
mpsCertAndKey = obj.IssueWebServerCertificate(rootCertAndKey, false, mpsCommonName, mpsCountry, mpsOrganization, null, false);
373
mpsCertificate = obj.pki.certificateToPem(mpsCertAndKey.cert);
374
mpsPrivateKey = obj.pki.privateKeyToPem(mpsCertAndKey.key);
375
- obj.fs.writeFileSync(directory + '/mpsserver-cert-public.crt', mpsCertificate);
376
- obj.fs.writeFileSync(directory + '/mpsserver-cert-private.key', mpsPrivateKey);
375
+ obj.fs.writeFileSync(parent.getConfigFilePath('mpsserver-cert-public.crt'), mpsCertificate);
376
+ obj.fs.writeFileSync(parent.getConfigFilePath('mpsserver-cert-private.key'), mpsPrivateKey);
377
} else {
378
// Keep the console certificate we have
379
mpsCertAndKey = { cert: obj.pki.certificateFromPem(r.mps.cert), key: obj.pki.privateKeyFromPem(r.mps.key) };
@@ -388,8 +388,8 @@ module.exports.CertificateOperations = function () {
388
consoleCertAndKey = obj.IssueWebServerCertificate(rootCertAndKey, false, amtConsoleName, country, organization, { name: 'extKeyUsage', clientAuth: true, '2.16.840.1.113741.1.2.1': true, '2.16.840.1.113741.1.2.2': true, '2.16.840.1.113741.1.2.3': true }, false); // Intel AMT Remote, Agent and Activation usages
389
consoleCertificate = obj.pki.certificateToPem(consoleCertAndKey.cert);
390
consolePrivateKey = obj.pki.privateKeyToPem(consoleCertAndKey.key);
391
- obj.fs.writeFileSync(directory + '/amtconsole-cert-public.crt', consoleCertificate);
392
- obj.fs.writeFileSync(directory + '/amtconsole-cert-private.key', consolePrivateKey);
391
+ obj.fs.writeFileSync(parent.getConfigFilePath('amtconsole-cert-public.crt'), consoleCertificate);
392
+ obj.fs.writeFileSync(parent.getConfigFilePath('amtconsole-cert-private.key'), consolePrivateKey);
393
} else {
394
// Keep the console certificate we have
395
consoleCertAndKey = { cert: obj.pki.certificateFromPem(r.console.cert), key: obj.pki.privateKeyFromPem(r.console.key) };
@@ -406,13 +406,13 @@ module.exports.CertificateOperations = function () {
406
var dnsname = config.domains[i].dns;
407
if (args.tlsoffload != true) {
408
// If the web certificate does not exist, create it
409
- if ((obj.fileExists(directory + '/webserver-' + i + '-cert-public.crt') == false) || (obj.fileExists(directory + '/webserver-' + i + '-cert-private.key') == false)) {
409
+ if ((obj.fileExists(parent.getConfigFilePath('webserver-' + i + '-cert-public.crt')) == false) || (obj.fileExists(parent.getConfigFilePath('webserver-' + i + '-cert-private.key')) == false)) {
410
console.log('Generating HTTPS certificate for ' + i + '...');
411
var xwebCertAndKey = obj.IssueWebServerCertificate(rootCertAndKey, false, dnsname, country, organization, null, strongCertificate);
412
var xwebCertificate = obj.pki.certificateToPem(xwebCertAndKey.cert);
413
var xwebPrivateKey = obj.pki.privateKeyToPem(xwebCertAndKey.key);
414
- obj.fs.writeFileSync(directory + '/webserver-' + i + '-cert-public.crt', xwebCertificate);
415
- obj.fs.writeFileSync(directory + '/webserver-' + i + '-cert-private.key', xwebPrivateKey);
414
+ obj.fs.writeFileSync(parent.getConfigFilePath('webserver-' + i + '-cert-public.crt'), xwebCertificate);
415
+ obj.fs.writeFileSync(parent.getConfigFilePath('webserver-' + i + '-cert-private.key'), xwebPrivateKey);
416
r.dns[i] = { cert: xwebCertificate, key: xwebPrivateKey };
417
config.domains[i].certs = r.dns[i];
418
@@ -420,8 +420,8 @@ module.exports.CertificateOperations = function () {
420
var caok, caindex = 1, calist = [];
421
do {
422
caok = false;
423
- if (obj.fileExists(directory + '/webserver-' + i + '-cert-chain' + caindex + '.crt')) {
424
- var caCertificate = obj.fs.readFileSync(directory + '/webserver-' + i + '-cert-chain' + caindex + '.crt', 'utf8');
423
+ if (obj.fileExists(parent.getConfigFilePath('webserver-' + i + '-cert-chain' + caindex + '.crt'))) {
424
+ var caCertificate = obj.fs.readFileSync(parent.getConfigFilePath('webserver-' + i + '-cert-chain' + caindex + '.crt'), 'utf8');
425
calist.push(caCertificate);
426
caok = true;
427
}
@@ -434,15 +434,15 @@ module.exports.CertificateOperations = function () {
434
}
435
436
// If the swarm server certificate exist, load it (This is an optional certificate)
437
- if (obj.fileExists(directory + '/swarmserver-cert-public.crt') && obj.fileExists(directory + '/swarmserver-cert-private.key')) {
438
- var swarmServerCertificate = obj.fs.readFileSync(directory + '/swarmserver-cert-public.crt', 'utf8');
439
- var swarmServerPrivateKey = obj.fs.readFileSync(directory + '/swarmserver-cert-private.key', 'utf8');
437
+ if (obj.fileExists(parent.getConfigFilePath('swarmserver-cert-public.crt')) && obj.fileExists(parent.getConfigFilePath('swarmserver-cert-private.key'))) {
438
+ var swarmServerCertificate = obj.fs.readFileSync(parent.getConfigFilePath('swarmserver-cert-public.crt'), 'utf8');
439
+ var swarmServerPrivateKey = obj.fs.readFileSync(parent.getConfigFilePath('swarmserver-cert-private.key'), 'utf8');
440
r.swarmserver = { cert: swarmServerCertificate, key: swarmServerPrivateKey };
441
}
442
443
// If the swarm server root certificate exist, load it (This is an optional certificate)
444
- if (obj.fileExists(directory + '/swarmserverroot-cert-public.crt')) {
445
- var swarmServerRootCertificate = obj.fs.readFileSync(directory + '/swarmserverroot-cert-public.crt', 'utf8');
444
+ if (obj.fileExists(parent.getConfigFilePath('swarmserverroot-cert-public.crt'))) {
445
+ var swarmServerRootCertificate = obj.fs.readFileSync(parent.getConfigFilePath('swarmserverroot-cert-public.crt'), 'utf8');
446
r.swarmserverroot = { cert: swarmServerRootCertificate };
447
}
448
@@ -451,8 +451,8 @@ module.exports.CertificateOperations = function () {
451
var caok, caindex = 1, calist = [];
452
do {
453
caok = false;
454
- if (obj.fileExists(directory + '/webserver-cert-chain' + caindex + '.crt')) {
455
- var caCertificate = obj.fs.readFileSync(directory + '/webserver-cert-chain' + caindex + '.crt', 'utf8');
454
+ if (obj.fileExists(parent.getConfigFilePath('webserver-cert-chain' + caindex + '.crt'))) {
455
+ var caCertificate = obj.fs.readFileSync(parent.getConfigFilePath('webserver-cert-chain' + caindex + '.crt'), 'utf8');
456
calist.push(caCertificate);
457
caok = true;
458
}
common.js
+10
@@ -127,6 +127,16 @@ module.exports.objKeysToLower = function (obj) {
127
return obj;
128
}
129
130
+// Escape and unexcape feild names so there are no invalid characters for MongoDB
131
+module.exports.escapeFieldName = function (name) { return name.split('%').join('%25').split('.').join('%2E').split('$').join('%24'); }
132
+module.exports.unEscapeFieldName = function (name) { return name.split('%2E').join('.').split('%24').join('$').split('%25').join('%'); }
133
+
134
+// Escape all links
135
+module.exports.escapeLinksFieldName = function (docx) { var doc = module.exports.Clone(docx); if (doc.links != null) { for (var j in doc.links) { var ue = module.exports.escapeFieldName(j); if (ue !== j) { doc.links[ue] = doc.links[j]; delete doc.links[j]; } } } return doc; }
136
+module.exports.unEscapeLinksFieldName = function (doc) { if (doc.links != null) { for (var j in doc.links) { var ue = module.exports.unEscapeFieldName(j); if (ue !== j) { doc.links[ue] = doc.links[j]; delete doc.links[j]; } } } return doc; }
137
+//module.exports.escapeAllLinksFieldName = function (docs) { for (var i in docs) { module.exports.escapeLinksFieldName(docs[i]); } }
138
+module.exports.unEscapeAllLinksFieldName = function (docs) { for (var i in docs) { docs[i] = module.exports.unEscapeLinksFieldName(docs[i]); } }
139
+
140
// Validation methods
141
module.exports.validateString = function(str, minlen, maxlen) { return ((str != null) && (typeof str == 'string') && ((minlen == null) || (str.length >= minlen)) && ((maxlen == null) || (str.length <= maxlen))); }
142
module.exports.validateInt = function(int, minval, maxval) { return ((int != null) && (typeof int == 'number') && ((minval == null) || (int >= minval)) && ((maxval == null) || (int <= maxval))); }
db.js
+6
-5
@@ -17,24 +17,25 @@
17
// Just run with --mongodb [connectionstring], where the connection string is documented here: https://docs.mongodb.com/manual/reference/connection-string/
18
// The default collection is "meshcentral", but you can override it using --mongodbcol [collection]
19
//
20
-module.exports.CreateDB = function (args, datapath) {
20
+module.exports.CreateDB = function (parent) {
21
var obj = {};
22
obj.path = require('path');
23
+ obj.parent = parent;
24
obj.identifier = null;
25
25
- if (args.mongodb) {
26
+ if (obj.parent.args.mongodb) {
27
// Use MongoDB
28
obj.databaseType = 2;
29
var Datastore = require('mongojs');
29
- var db = Datastore(args.mongodb);
30
+ var db = Datastore(obj.parent.args.mongodb);
31
var dbcollection = 'meshcentral';
31
- if (args.mongodbcol) { dbcollection = args.mongodbcol; }
32
+ if (obj.parent.args.mongodbcol) { dbcollection = obj.parent.args.mongodbcol; }
33
obj.file = db.collection(dbcollection);
34
} else {
35
// Use NeDB (The default)
36
obj.databaseType = 1;
37
var Datastore = require('nedb');
37
- obj.file = new Datastore({ filename: obj.path.join(datapath, 'meshcentral.db'), autoload: true });
38
+ obj.file = new Datastore({ filename: obj.parent.getConfigFilePath('meshcentral.db'), autoload: true });
39
obj.file.persistence.setAutocompactionInterval(3600);
40
}
41
meshcentral.js
+24
-11
@@ -99,6 +99,7 @@ function CreateMeshCentralServer(config, args) {
99
console.log(' --redirport [number] Creates an additional HTTP server to redirect users to the HTTPS server.');
100
console.log(' --exactports Server must run with correct ports or exit.');
101
console.log(' --noagentupdate Server will not update mesh agent native binaries.');
102
+ console.log(' --fastcert Generate weaker RSA2048 certificates.');
103
console.log(' --cert [name], (country), (org) Create a web server certificate with [name] server name.');
104
console.log(' country and organization can optionaly be set.');
105
return;
@@ -169,7 +170,7 @@ function CreateMeshCentralServer(config, args) {
170
xprocess.stdout.on('data', function (data) { if (data[data.length - 1] == '\n') { data = data.substring(0, data.length - 1); } if (data.indexOf('Updating settings folder...') >= 0) { xprocess.xrestart = 1; } else if (data.indexOf('Updating server certificates...') >= 0) { xprocess.xrestart = 1; } else if (data.indexOf('Server Ctrl-C exit...') >= 0) { xprocess.xrestart = 2; } else if (data.indexOf('Starting self upgrade...') >= 0) { xprocess.xrestart = 3; } console.log(data); });
171
xprocess.stderr.on('data', function (data) {
172
if (data.startsWith('le.challenges[tls-sni-01].loopback')) { return; } // Ignore this error output from GreenLock
172
- if (data[data.length - 1] == '\n') { data = data.substring(0, data.length - 1); } obj.fs.appendFileSync(obj.path.join(obj.datapath, 'mesherrors.txt'), '-------- ' + new Date().toLocaleString() + ' --------\r\n\r\n' + data + '\r\n\r\n\r\n');
173
+ if (data[data.length - 1] == '\n') { data = data.substring(0, data.length - 1); } obj.fs.appendFileSync(obj.getConfigFilePath('mesherrors.txt'), '-------- ' + new Date().toLocaleString() + ' --------\r\n\r\n' + data + '\r\n\r\n\r\n');
174
});
175
xprocess.on('close', function (code) { if ((code != 0) && (code != 123)) { /* console.log("Exited with code " + code); */ } });
176
}
@@ -237,7 +238,7 @@ function CreateMeshCentralServer(config, args) {
238
if (obj.args.notls == null && obj.args.redirport == null) obj.args.redirport = 80;
239
if (typeof obj.args.debug == 'number') obj.debugLevel = obj.args.debug;
240
if (obj.args.debug == true) obj.debugLevel = 1;
240
- obj.db = require('./db.js').CreateDB(obj.args, obj.datapath);
241
+ obj.db = require('./db.js').CreateDB(obj);
242
obj.db.SetupDatabase(function (dbversion) {
243
// See if any database operations needs to be completed
244
if (obj.args.deletedomain) { obj.db.DeleteDomain(obj.args.deletedomain, function () { console.log('Deleted domain ' + obj.args.deletedomain + '.'); process.exit(); }); return; }
@@ -254,7 +255,7 @@ function CreateMeshCentralServer(config, args) {
255
if (obj.args.logintokenkey) { obj.showLoginTokenKey(function (r) { console.log(r); process.exit(); }); return; }
256
if (obj.args.dbexport) {
257
// Export the entire database to a JSON file
257
- if (obj.args.dbexport == true) { obj.args.dbexport = obj.path.join(obj.datapath, 'meshcentral.db.json'); }
258
+ if (obj.args.dbexport == true) { obj.args.dbexport = obj.getConfigFilePath('meshcentral.db.json'); }
259
obj.db.GetAll(function (err, docs) {
260
obj.fs.writeFileSync(obj.args.dbexport, JSON.stringify(docs));
261
console.log('Exported ' + docs.length + ' objects(s) to ' + obj.args.dbexport + '.'); process.exit();
@@ -263,12 +264,14 @@ function CreateMeshCentralServer(config, args) {
264
}
265
if (obj.args.dbimport) {
266
// Import the entire database from a JSON file
266
- if (obj.args.dbimport == true) { obj.args.dbimport = obj.path.join(obj.datapath, 'meshcentral.db.json'); }
267
- var json = null;
267
+ if (obj.args.dbimport == true) { obj.args.dbimport = obj.getConfigFilePath('meshcentral.db.json'); }
268
+ var json = null, json2 = "";
269
try { json = obj.fs.readFileSync(obj.args.dbimport); } catch (e) { console.log('Invalid JSON file: ' + obj.args.dbimport + '.'); process.exit(); }
269
- try { json = JSON.parse(json); } catch (e) { console.log('Invalid JSON format: ' + obj.args.dbimport + '.'); process.exit(); }
270
+ for (var i = 0; i < json.length; i++) { if (json[i] >= 32) json2 += String.fromCharCode(json[i]); } // Remove all bad chars
271
+ try { json = JSON.parse(json2); } catch (e) { console.log('Invalid JSON format: ' + obj.args.dbimport + ': ' + e); process.exit(); }
272
if ((json == null) || (typeof json.length != 'number') || (json.length < 1)) { console.log('Invalid JSON format: ' + obj.args.dbimport + '.'); }
271
- obj.db.RemoveAll(function () { obj.db.InsertMany(json, function () { console.log('Imported ' + json.length + ' objects(s) from ' + obj.args.dbimport + '.'); process.exit(); }); });
273
+ for (var i in json) { if ((json[i].type == "mesh") && (json[i].links != null)) { for (var j in json[i].links) { var esc = obj.common.escapeFieldName(j); if (esc !== j) { json[i].links[esc] = json[i].links[j]; delete json[i].links[j]; } } } } // Escape MongoDB invalid field chars
274
+ obj.db.RemoveAll(function () { obj.db.InsertMany(json, function (err) { if (err != null) { console.log(err); } else { console.log('Imported ' + json.length + ' objects(s) from ' + obj.args.dbimport + '.'); } process.exit(); }); });
275
return;
276
}
277
@@ -330,7 +333,7 @@ function CreateMeshCentralServer(config, args) {
333
obj.StartEx2 = function () {
334
// Load server certificates
335
obj.certificateOperations = require('./certoperations.js').CertificateOperations()
333
- obj.certificateOperations.GetMeshServerCertificate(obj.datapath, obj.args, obj.config, obj, function (certs) {
336
+ obj.certificateOperations.GetMeshServerCertificate(obj, obj.args, obj.config, function (certs) {
337
if (obj.config.letsencrypt == null) {
338
obj.StartEx3(certs); // Just use the configured certificates
339
} else {
@@ -496,8 +499,8 @@ function CreateMeshCentralServer(config, args) {
499
zipfile.openReadStream(entry, function (err, readStream) {
500
if (err) throw err;
501
readStream.on("end", function () { zipfile.readEntry(); });
499
- // console.log('Extracting:', obj.path.join(obj.datapath, entry.fileName));
500
- readStream.pipe(obj.fs.createWriteStream(obj.path.join(obj.datapath, entry.fileName)));
502
+ // console.log('Extracting:', obj.getConfigFilePath(entry.fileName));
503
+ readStream.pipe(obj.fs.createWriteStream(obj.getConfigFilePath(entry.fileName)));
504
});
505
}
506
});
@@ -1044,7 +1047,7 @@ function CreateMeshCentralServer(config, args) {
1047
}
1048
r = 'time=' + Date.now() + '\r\n';
1049
for (var i in meshServerState) { r += (i + '=' + meshServerState[i] + '\r\n'); }
1047
- obj.fs.writeFileSync(obj.path.join(obj.datapath, 'serverstate.txt'), r);
1050
+ obj.fs.writeFileSync(obj.getConfigFilePath('serverstate.txt'), r);
1051
}
1052
1053
// Logging funtions
@@ -1074,6 +1077,16 @@ function CreateMeshCentralServer(config, args) {
1077
} catch (e) { console.log(e); if (called == false) { func(null); } }
1078
}
1079
1080
+ // Return the path of a file into the meshcentral-data path
1081
+ obj.getConfigFilePath = function (filename) {
1082
+ if ((obj.config != null) && (obj.config.configfiles != null) && (obj.config.configfiles[filename] != null) && (typeof obj.config.configfiles[filename] == 'string')) {
1083
+ //console.log('getConfigFilePath(\"' + filename + '\") = ' + obj.config.configfiles[filename]);
1084
+ return obj.config.configfiles[filename];
1085
+ }
1086
+ //console.log('getConfigFilePath(\"' + filename + '\") = ' + obj.path.join(obj.datapath, filename));
1087
+ return obj.path.join(obj.datapath, filename);
1088
+ }
1089
+
1090
return obj;
1091
}
1092
meshuser.js
+7
-6
@@ -111,6 +111,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
111
if ((user == null) || (obj.common.validateString(command.action, 3, 32) == false)) return; // User must be set and action must be a string between 3 and 32 chars
112
113
switch (command.action) {
114
+ case 'ping': { ws.send(JSON.stringify({ action: 'pong' })); break; }
115
case 'meshes':
116
{
117
// Request a list of all meshes this user as rights to
@@ -565,7 +566,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
566
var links = {}
567
links[user._id] = { name: user.name, rights: 0xFFFFFFFF };
568
var mesh = { type: 'mesh', _id: meshid, name: command.meshname, mtype: command.meshtype, desc: command.desc, domain: domain.id, links: links };
568
- obj.db.Set(mesh);
569
+ obj.db.Set(obj.common.escapeLinksFieldName(mesh));
570
obj.parent.meshes[meshid] = mesh;
571
obj.parent.parent.AddEventDispatch([meshid], ws);
572
if (user.links == null) user.links = {};
@@ -583,7 +584,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
584
if (obj.common.validateString(command.meshid, 1, 1024) == false) break; // Check the meshid
585
obj.db.Get(command.meshid, function (err, meshes) {
586
if (meshes.length != 1) return;
586
- var mesh = meshes[0];
587
+ var mesh = obj.common.unEscapeLinksFieldName(meshes[0]);
588
589
// Check if this user has rights to do this
590
if (mesh.links[user._id] == null || mesh.links[user._id].rights != 0xFFFFFFFF) return;
@@ -627,7 +628,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
628
629
if ((obj.common.validateString(command.meshname, 1, 64) == true) && (command.meshname != mesh.name)) { change = 'Mesh name changed from "' + mesh.name + '" to "' + command.meshname + '"'; mesh.name = command.meshname; }
630
if ((obj.common.validateString(command.desc, 0, 1024) == true) && (command.desc != mesh.desc)) { if (change != '') change += ' and description changed'; else change += 'Mesh "' + mesh.name + '" description changed'; mesh.desc = command.desc; }
630
- if (change != '') { obj.db.Set(mesh); obj.parent.parent.DispatchEvent(['*', mesh._id, user._id], obj, { etype: 'mesh', username: user.name, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, action: 'meshchange', links: mesh.links, msg: change, domain: domain.id }) }
631
+ if (change != '') { obj.db.Set(obj.common.escapeLinksFieldName(mesh)); obj.parent.parent.DispatchEvent(['*', mesh._id, user._id], obj, { etype: 'mesh', username: user.name, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, action: 'meshchange', links: mesh.links, msg: change, domain: domain.id }) }
632
}
633
break;
634
}
@@ -659,7 +660,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
660
661
// Add a user to the mesh
662
mesh.links[newuserid] = { name: newuser.name, rights: command.meshadmin };
662
- obj.db.Set(mesh);
663
+ obj.db.Set(obj.common.escapeLinksFieldName(mesh));
664
665
// Notify mesh change
666
var change = 'Added user ' + newuser.name + ' to mesh ' + mesh.name;
@@ -685,7 +686,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
686
// Remove mesh from user
687
if (deluser.links != null && deluser.links[command.meshid] != null) {
688
var delmeshrights = deluser.links[command.meshid].rights;
688
- if ((delmeshrights == 0xFFFFFFFF) && (mesh.links[user._id].rights != 0xFFFFFFFF)) return; // A non-admin can't kick out an admin
689
+ if ((delmeshrights == 0xFFFFFFFF) && (mesh.links[deluserid].rights != 0xFFFFFFFF)) return; // A non-admin can't kick out an admin
690
delete deluser.links[command.meshid];
691
obj.db.Set(deluser);
692
obj.parent.parent.DispatchEvent([deluser._id], obj, 'resubscribe');
@@ -695,7 +696,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
696
// Remove user from the mesh
697
if (mesh.links[command.userid] != null) {
698
delete mesh.links[command.userid];
698
- obj.db.Set(mesh);
699
+ obj.db.Set(obj.common.escapeLinksFieldName(mesh));
700
701
// Notify mesh change
702
var change = 'Removed user ' + deluser.name + ' from mesh ' + mesh.name;
mpsserver.js
-1
@@ -669,7 +669,6 @@ module.exports.CreateMpsServer = function (parent, db, args, certificates) {
669
var node = nodes[0];
670
671
// See if any changes need to be made
672
- console.log(node.intelamt);
672
if ((node.intelamt != undefined) && (node.intelamt.host == host) && (node.name != '') && (node.intelamt.state == 2)) return;
673
674
// Get the mesh for this device
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.1.8-m",
3
+ "version": "0.1.8-r",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
public/scripts/agent-desktop-0.0.2.js
+1
@@ -272,6 +272,7 @@ var CreateAgentRemoteDesktop = function (canvasid, scrolldiv) {
272
}
273
274
obj.SendKeyMsgKC = function (action, kc) {
275
+ console.log('SendKeyMsgKC', action, kc);
276
if (obj.State != 3) return;
277
if (typeof action == 'object') { for (var i in action) { obj.SendKeyMsgKC(action[i][0], action[i][1]); } }
278
else { obj.send(String.fromCharCode(0x00, obj.InputType.KEY, 0x00, 0x06, (action - 1), kc)); }
public/scripts/common-0.0.1.js
+1
-5
@@ -79,11 +79,7 @@ function hex2rstr(d) {
79
function char2hex(i) { return (i + 0x100).toString(16).substr(-2).toUpperCase(); }
80
81
// Convert a raw string to a hex string
82
-function rstr2hex(input) {
83
- var r = '', i;
84
- for (i = 0; i < input.length; i++) { r += char2hex(input.charCodeAt(i)); }
85
- return r;
86
-}
82
+function rstr2hex(input) { var r = '', i; for (i = 0; i < input.length; i++) { r += char2hex(input.charCodeAt(i)); } return r; }
83
84
// UTF-8 encoding & decoding functions
85
function encode_utf8(s) { return unescape(encodeURIComponent(s)); }
public/scripts/meshcentral.js
+5
@@ -8,6 +8,7 @@ var MeshServerCreateControl = function (domain) {
8
var obj = {};
9
obj.State = 0;
10
obj.connectstate = 0;
11
+ obj.pingTimer = null;
12
13
obj.xxStateChange = function (newstate) {
14
if (obj.State == newstate) return;
@@ -22,11 +23,14 @@ var MeshServerCreateControl = function (domain) {
23
obj.socket.onmessage = obj.xxOnMessage;
24
obj.socket.onclose = function () { obj.Stop(); }
25
obj.xxStateChange(1);
26
+ if (obj.pingTimer != null) { clearInterval(obj.pingTimer); }
27
+ obj.pingTimer = setInterval(function () { obj.send({ action: 'ping' }); }, 29000); // Ping the server every 29 seconds, stops corporate proxies from disconnecting.
28
}
29
30
obj.Stop = function () {
31
obj.connectstate = 0;
32
if (obj.socket) { obj.socket.close(); delete obj.socket; }
33
+ if (obj.pingTimer != null) { clearInterval(obj.pingTimer); obj.pingTimer = null; }
34
obj.xxStateChange(0);
35
}
36
@@ -34,6 +38,7 @@ var MeshServerCreateControl = function (domain) {
38
// console.log('xxOnMessage', e.data);
39
var message;
40
try { message = JSON.parse(e.data); } catch (e) { return; }
41
+ if (message.action == 'pong') { return; }
42
if (obj.onMessage) obj.onMessage(obj, message);
43
};
44
views/default.handlebars
+12
-1
@@ -391,6 +391,7 @@
391
</div>
392
<div>
393
<select style="margin-left:6px" id="deskkeys">
394
+ <option value=5>Win</option>
395
<option value=0>Win+Down</option>
396
<option value=1>Win+Up</option>
397
<option value=2>Win+L</option>
@@ -3598,7 +3599,11 @@
3599
if (desktop.contype == 2) {
3600
desktop.m.sendkey([[0xffe7,1],[0x6c,1],[0x6c,0],[0xffe7,0]]); // Intel AMT: Meta-left down, 'l' press, 'l' release, Meta-left release
3601
} else {
3601
- desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.EXDOWN,0x5B],[desktop.m.KeyAction.DOWN,76],[desktop.m.KeyAction.UP,76],[desktop.m.KeyAction.EXUP,0x5B]]); // MeshAgent: L-Winkey press, 'L' press, 'L' release, L-Winkey release
3602
+ //desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.EXDOWN,0x5B],[desktop.m.KeyAction.DOWN,76],[desktop.m.KeyAction.UP,76],[desktop.m.KeyAction.EXUP,0x5B]]); // MeshAgent: L-Winkey press, 'L' press, 'L' release, L-Winkey release
3603
+ desktop.m.SendKeyMsgKC(desktop.m.KeyAction.EXDOWN, 0x5B);
3604
+ //desktop.m.SendKeyMsgKC(desktop.m.KeyAction.DOWN, 76);
3605
+ //desktop.m.SendKeyMsgKC(desktop.m.KeyAction.UP, 76);
3606
+ desktop.m.SendKeyMsgKC(desktop.m.KeyAction.EXUP, 0x5B);
3607
}
3608
} else if (ks == 3) { // WIN+M arrow
3609
if (desktop.contype == 2) {
@@ -3612,6 +3617,12 @@
3617
} else {
3618
desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.DOWN,16],[desktop.m.KeyAction.EXDOWN,0x5B],[desktop.m.KeyAction.DOWN,77],[desktop.m.KeyAction.UP,77],[desktop.m.KeyAction.EXUP,0x5B],[desktop.m.KeyAction.UP, 16]]); // MeshAgent: L-shift press, L-Winkey press, 'M' press, 'M' release, L-Winkey release, L-shift release
3619
}
3620
+ } else if (ks == 5) { // WIN
3621
+ if (desktop.contype == 2) {
3622
+ desktop.m.sendkey([[0xffe7,1],[0xffe7,0]]); // Intel AMT: Meta-left down, Meta-left release
3623
+ } else {
3624
+ desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.EXDOWN,0x5B], [desktop.m.KeyAction.EXUP,0x5B]]); // MeshAgent: L-Winkey press, L-Winkey release
3625
+ }
3626
}
3627
}
3628
webserver.js
+8
-7
@@ -189,7 +189,7 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
189
});
190
191
// Fetch all meshes from the database, keep this in memory
192
- obj.db.GetAllType('mesh', function (err, docs) { for (var i in docs) { obj.meshes[docs[i]._id] = docs[i]; } });
192
+ obj.db.GetAllType('mesh', function (err, docs) { obj.common.unEscapeAllLinksFieldName(docs); for (var i in docs) { obj.meshes[docs[i]._id] = docs[i]; } });
193
194
// Authenticate the user
195
obj.authenticate = function (name, pass, domain, fn) {
@@ -550,7 +550,8 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
550
var mesh = obj.meshes[meshid];
551
if (mesh) {
552
// Remove user from the mesh
553
- if (mesh.links[userid] != null) { delete mesh.links[userid]; obj.db.Set(mesh); }
553
+ var escUserId = obj.common.escapeFieldName(userid);
554
+ if (mesh.links[escUserId] != null) { delete mesh.links[escUserId]; obj.db.Set(mesh); }
555
// Notify mesh change
556
var change = 'Removed user ' + user.name + ' from mesh ' + mesh.name;
557
obj.parent.DispatchEvent(['*', mesh._id, user._id, userid], obj, { etype: 'mesh', username: user.name, userid: userid, meshid: mesh._id, name: mesh.name, mtype: mesh.mtype, desc: mesh.desc, action: 'meshchange', links: mesh.links, msg: change, domain: domain.id })
@@ -997,9 +998,7 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
998
if (user.siteadmin == 0xFFFFFFFF) subscriptions.push('*');
999
if ((user.siteadmin & 2) != 0) subscriptions.push('server-users');
1000
}
1000
- if (user.links != null) {
1001
- for (var i in user.links) { subscriptions.push(i); }
1002
- }
1001
+ if (user.links != null) { for (var i in user.links) { subscriptions.push(i); } }
1002
obj.parent.RemoveAllEventDispatch(target);
1003
obj.parent.AddEventDispatch(subscriptions, target);
1004
return subscriptions;
@@ -1458,7 +1457,8 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
1457
// If required, check if this user has rights to do this
1458
if ((obj.parent.config.settings != null) && (obj.parent.config.settings.lockagentdownload == true)) {
1459
var user = obj.users[req.session.userid];
1461
- if ((user == null) || (mesh.links[user._id] == null) || ((mesh.links[user._id].rights & 1) == 0)) { res.sendStatus(401); return; }
1460
+ var escUserId = obj.common.escapeFieldName(user._id);
1461
+ if ((user == null) || (mesh.links[escUserId] == null) || ((mesh.links[escUserId].rights & 1) == 0)) { res.sendStatus(401); return; }
1462
if (domain.id != mesh.domain) { res.sendStatus(401); return; }
1463
}
1464
@@ -1591,7 +1591,8 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
1591
// If needed, check if this user has rights to do this
1592
if ((obj.parent.config.settings != null) && (obj.parent.config.settings.lockagentdownload == true)) {
1593
var user = obj.users[req.session.userid];
1594
- if ((user == null) || (mesh.links[user._id] == null) || ((mesh.links[user._id].rights & 1) == 0)) { res.sendStatus(401); return; }
1594
+ var escUserId = obj.common.escapeFieldName(user._id);
1595
+ if ((user == null) || (mesh.links[escUserId] == null) || ((mesh.links[escUserId].rights & 1) == 0)) { res.sendStatus(401); return; }
1596
if (domain.id != mesh.domain) { res.sendStatus(401); return; }
1597
}
1598