Improved MeshCtrl.js error message.
Ylian Saint-Hilaire committed
May 27, 2020 at 01:17 UTC
d8bebb719e42a8b2df2d4f17ff6d0b2dcd5faab9
2 files changed
+13
-9
meshctrl.js
+6
-2
@@ -569,7 +569,7 @@ function serverConnect() {
569
var keydata = fs.readFileSync(args.loginkeyfile, 'utf8').split(' ').join('').split('\r').join('').split('\n').join('');
570
ckey = Buffer.from(keydata, 'hex');
571
if (ckey.length != 80) { console.log("Invalid login key file."); process.exit(); return; }
572
- } catch (ex) { console.log(ex); process.exit(); return; }
572
+ } catch (ex) { console.log(ex.message); process.exit(); return; }
573
}
574
575
if (ckey != null) {
@@ -961,7 +961,11 @@ function serverConnect() {
961
if (data.msg == 'tokenrequired') {
962
console.log('Authentication token required, use --token [number].');
963
} else {
964
- console.log('Invalid login.');
964
+ if ((args.loginkeyfile != null) || (args.loginkey != null)) {
965
+ console.log('Invalid login, check the login key and that this computer has the correct time.');
966
+ } else {
967
+ console.log('Invalid login.');
968
+ }
969
}
970
}
971
process.exit();
sample-config-advanced.json
+7
-7
@@ -162,45 +162,45 @@
162
"_authStrategies": {
163
"__comment__" : "This section is used to allow users to login using other accounts. You will need to get an API key from the services and register callback URL's",
164
"twitter": {
165
- "__callbackurl": "https://server/auth-twitter-callback",
165
+ "_callbackurl": "https://server/auth-twitter-callback",
166
"newAccounts": true,
167
"clientid": "xxxxxxxxxxxxxxxxxxxxxxx",
168
"clientsecret": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
169
},
170
"google": {
171
- "__callbackurl": "https://server/auth-google-callback",
171
+ "_callbackurl": "https://server/auth-google-callback",
172
"newAccounts": true,
173
"clientid": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.apps.googleusercontent.com",
174
"clientsecret": "xxxxxxxxxxxxxxxxxxxxxxx"
175
},
176
"github": {
177
- "__callbackurl": "https://server/auth-github-callback",
177
+ "_callbackurl": "https://server/auth-github-callback",
178
"newAccounts": true,
179
"clientid": "xxxxxxxxxxxxxxxxxxxxxxx",
180
"clientsecret": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
181
},
182
"reddit": {
183
- "__callbackurl": "https://server/auth-reddit-callback",
183
+ "_callbackurl": "https://server/auth-reddit-callback",
184
"newAccounts": true,
185
"clientid": "xxxxxxxxxxxxxxxxxxxxxxx",
186
"clientsecret": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
187
},
188
"azure": {
189
- "__callbackurl": "https://server/auth-azure-callback",
189
+ "_callbackurl": "https://server/auth-azure-callback",
190
"newAccounts": true,
191
"clientid": "00000000-0000-0000-0000-000000000000",
192
"clientsecret": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
193
"tenantid": "00000000-0000-0000-0000-000000000000"
194
},
195
"jumpcloud": {
196
- "__callbackurl": "https://server/auth-jumpcloud-callback",
196
+ "_callbackurl": "https://server/auth-jumpcloud-callback",
197
"newAccounts": true,
198
"entityid": "meshcentral",
199
"idpurl": "https://sso.jumpcloud.com/saml2/saml2",
200
"cert": "jumpcloud-saml.pem"
201
},
202
"saml": {
203
- "__callbackurl": "https://server/auth-saml-callback",
203
+ "_callbackurl": "https://server/auth-saml-callback",
204
"newAccounts": true,
205
"entityid": "meshcentral",
206
"idpurl": "https://server/saml2",