Improved server recovery commands.
Ylian Saint-Hilaire committed
May 26, 2020 at 17:49 UTC
e4fffae5a2bdd9fcb9a578e86025dbb1881d8f42
1 file changed
+17
-7
meshcentral.js
+17
-7
@@ -151,12 +151,14 @@ function CreateMeshCentralServer(config, args) {
151
console.log(' --exactports Server must run with correct ports or exit.');
152
console.log(' --noagentupdate Server will not update mesh agent native binaries.');
153
console.log(' --listuserids Show a list of a user identifiers in the database.');
154
+ console.log(' --cert [name], (country), (org) Create a web server certificate with [name] server name.');
155
+ console.log(' country and organization can optionaly be set.');
156
+ console.log('');
157
+ console.log('Server recovery commands, use only when MeshCentral is offline.');
158
console.log(' --createaccount [userid] Create a new user account.');
159
console.log(' --resetaccount [userid] Unlock an account, disable 2FA and set a new account password.');
160
console.log(' --adminaccount [userid] Promote account to site administrator.');
161
console.log(' --removeaccount [userid] Remove a user account.');
158
- console.log(' --cert [name], (country), (org) Create a web server certificate with [name] server name.');
159
- console.log(' country and organization can optionaly be set.');
162
return;
163
}
164
@@ -673,13 +675,15 @@ function CreateMeshCentralServer(config, args) {
675
if (obj.args.recordencryptionrecode) { obj.db.performRecordEncryptionRecode(function (count) { console.log('Re-encoded ' + count + ' record(s).'); process.exit(); }); return; }
676
if (obj.args.dbstats) { obj.db.getDbStats(function (stats) { console.log(stats); process.exit(); }); return; }
677
if (obj.args.createaccount) { // Create a new user account
676
- if ((typeof obj.args.createaccount != 'string') || (obj.args.pass == null) || (obj.args.pass == '') || (obj.args.createaccount.indexOf(' ') >= 0) || (obj.args.createaccount.indexOf('/') >= 0)) { console.log("Usage: --createaccount [userid] --pass [password] --domain (domain) --email (email) --name (name)."); process.exit(); return; }
678
+ if ((typeof obj.args.createaccount != 'string') || (obj.args.pass == null) || (obj.args.pass == '') || (obj.args.createaccount.indexOf(' ') >= 0)) { console.log("Usage: --createaccount [userid] --pass [password] --domain (domain) --email (email) --name (name)."); process.exit(); return; }
679
var userid = 'user/' + (obj.args.domain ? obj.args.domain : '') + '/' + obj.args.createaccount.toLowerCase(), domainid = obj.args.domain ? obj.args.domain : '';
680
+ if (obj.args.createaccount.startsWith('user/')) { userid = obj.args.createaccount; domainid = obj.args.createaccount.split('/')[1]; }
681
+ if (userid.split('/').length != 3) { console.log("Invalid userid."); process.exit(); return; }
682
obj.db.Get(userid, function (err, docs) {
683
if (err != null) { console.log("Database error: " + err); process.exit(); return; }
684
if ((docs != null) && (docs.length != 0)) { console.log('User already exists.'); process.exit(); return; }
685
if ((domainid != '') && ((config.domains == null) || (config.domains[domainid] == null))) { console.log("Invalid domain."); process.exit(); return; }
682
- var user = { _id: userid, type: 'user', name: (typeof obj.args.name == 'string')?obj.args.name:obj.args.createaccount, domain: domainid, creation: Math.floor(Date.now() / 1000), links: {} };
686
+ var user = { _id: userid, type: 'user', name: (typeof obj.args.name == 'string') ? obj.args.name : (userid.split('/')[2]), domain: domainid, creation: Math.floor(Date.now() / 1000), links: {} };
687
if (typeof obj.args.email == 'string') { user.email = obj.args.email; user.emailVerified = true; }
688
require('./pass').hash(obj.args.pass, function (err, salt, hash, tag) { if (err) { console.log("Unable create account password: " + err); process.exit(); return; } user.salt = salt; user.hash = hash; obj.db.Set(user, function () { console.log("Done."); process.exit(); return; }); }, 0);
689
});
@@ -687,7 +691,9 @@ function CreateMeshCentralServer(config, args) {
691
}
692
if (obj.args.resetaccount) { // Unlock a user account, set a new password and remove 2FA
693
if ((typeof obj.args.resetaccount != 'string') || (obj.args.pass == null) || (obj.args.pass == '') || (obj.args.resetaccount.indexOf(' ') >= 0)) { console.log("Usage: --resetaccount [userid] --domain (domain) --pass [password]."); process.exit(); return; }
690
- var userid = 'user/' + (obj.args.domain ? obj.args.domain : '') + '/' + obj.args.resetaccount.toLowerCase(), domainid = obj.args.domain ? obj.args.domain : '';
694
+ var userid = 'user/' + (obj.args.domain ? obj.args.domain : '') + '/' + obj.args.resetaccount.toLowerCase();
695
+ if (obj.args.resetaccount.startsWith('user/')) { userid = obj.args.resetaccount; }
696
+ if (userid.split('/').length != 3) { console.log("Invalid userid."); process.exit(); return; }
697
obj.db.Get(userid, function (err, docs) {
698
if (err != null) { console.log("Database error: " + err); process.exit(); return; }
699
if ((docs == null) || (docs.length == 0)) { console.log("Unknown userid, usage: --resetaccount [userid] --domain (domain) --pass [password]."); process.exit(); return; }
@@ -699,7 +705,9 @@ function CreateMeshCentralServer(config, args) {
705
}
706
if (obj.args.adminaccount) { // Set a user account to server administrator
707
if ((typeof obj.args.adminaccount != 'string') || (obj.args.adminaccount.indexOf(' ') >= 0)) { console.log("Invalid userid, usage: --adminaccount [username] --domain (domain)."); process.exit(); return; }
702
- var userid = 'user/' + (obj.args.domain ? obj.args.domain : '') + '/' + obj.args.adminaccount.toLowerCase(), domainid = obj.args.domain ? obj.args.domain : '';
708
+ var userid = 'user/' + (obj.args.domain ? obj.args.domain : '') + '/' + obj.args.adminaccount.toLowerCase();
709
+ if (obj.args.adminaccount.startsWith('user/')) { userid = obj.args.adminaccount; }
710
+ if (userid.split('/').length != 3) { console.log("Invalid userid."); process.exit(); return; }
711
obj.db.Get(userid, function (err, docs) {
712
if (err != null) { console.log("Database error: " + err); process.exit(); return; }
713
if ((docs == null) || (docs.length == 0)) { console.log("Unknown userid, usage: --adminaccount [userid] --domain (domain)."); process.exit(); return; }
@@ -710,7 +718,9 @@ function CreateMeshCentralServer(config, args) {
718
}
719
if (obj.args.removeaccount) { // Remove a user account
720
if ((typeof obj.args.removeaccount != 'string') || (obj.args.removeaccount.indexOf(' ') >= 0)) { console.log("Invalid userid, usage: --removeaccount [username] --domain (domain)."); process.exit(); return; }
713
- var userid = 'user/' + (obj.args.domain ? obj.args.domain : '') + '/' + obj.args.removeaccount.toLowerCase(), domainid = obj.args.domain ? obj.args.domain : '';
721
+ var userid = 'user/' + (obj.args.domain ? obj.args.domain : '') + '/' + obj.args.removeaccount.toLowerCase();
722
+ if (obj.args.removeaccount.startsWith('user/')) { userid = obj.args.removeaccount; }
723
+ if (userid.split('/').length != 3) { console.log("Invalid userid."); process.exit(); return; }
724
obj.db.Get(userid, function (err, docs) {
725
if (err != null) { console.log("Database error: " + err); process.exit(); return; }
726
if ((docs == null) || (docs.length == 0)) { console.log("Unknown userid, usage: --removeaccount [userid] --domain (domain)."); process.exit(); return; }