external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

fix duo and package.json

Browse source 
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458 2024-12-23 13:13:37 +00:00
parent c92b88a374
commit 5cf468159d
6 changed files with 636 additions and 2043 deletions
Download patch file Download diff file Expand all files Collapse all files

2638
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

14
package.json
View file

@ -37,33 +37,19 @@
"sample-config-advanced.json"
],
"dependencies": {
"@duosecurity/duo_universal": "2.0.3",
"@seald-io/nedb": "4.0.4",
"archiver": "7.0.1",
"body-parser": "1.20.3",
"cbor": "5.2.0",
"compression": "1.7.5",
"connect-flash": "0.1.1",
"cookie-session": "2.1.0",
"express": "4.21.2",
"express-handlebars": "7.1.3",
"express-ws": "5.0.2",
"firebase-admin": "12.7.0",
"ipcheck": "0.1.0",
"jwt-simple": "0.5.6",
"loadavg-windows": "1.1.1",
"minimist": "1.2.8",
"multiparty": "4.2.3",
"node-forge": "1.3.1",
"node-windows": "0.1.14",
"otplib": "10.2.3",
"passport": "0.7.0",
"passport-azure-oauth2": "0.1.0",
"passport-github2": "0.1.12",
"passport-google-oauth20": "2.0.0",
"passport-saml": "3.2.4",
"passport-twitter": "1.0.4",
"ssh2": "1.16.0",
"ua-parser-js": "1.0.39",
"ws": "8.18.0",
"yauzl": "2.10.0"

3
public/styles/style-bootstrap.css
View file

@ -168,7 +168,6 @@ body {
height: 66px;
color: #c8c8c8;
padding-left: 14px;
padding-top: 7px;
font-size: 46px;
font-family: Arial,Helvetica,sans-serif;
font-weight: bold;
@ -180,7 +179,7 @@ body {
height: 66px;
color: #c8c8c8;
padding-left: 5px;
padding-top: 14px;
padding-top: 12px;
font-size: 14px;
font-family: Arial,Helvetica,sans-serif;
font-weight: bold;

13
translate/translate.json
View file

@ -91387,11 +91387,7 @@
]
},
{
"en": "When enabled, on each login, you will be given the option to login using Duo for added security.",
"xloc": [
"default.handlebars->47->1818",
"default3.handlebars->35->1667"
]
"en": "When enabled, on each login, you will be given the option to login using Duo for added security."
},
{
"bs": "Kada je omogućeno, pri svakom prijavljivanju, imat ćete mogućnost da dobijete token za prijavu na svoj račun e-pošte radi dodatne sigurnosti.",
@ -91424,6 +91420,13 @@
"default3.handlebars->35->1665"
]
},
{
"en": "When enabled, on each login, you will be given the option to use Duo for added security.",
"xloc": [
"default.handlebars->47->1818",
"default3.handlebars->35->1667"
]
},
{
"bs": "Kada se izabere ova politika, Intel&reg; AMT ne upravlja ovaj server. Intel AMT se i dalje može koristiti ručnim aktiviranjem i konfigurisanjem.",
"ca": "Quan se selecciona aquesta política, aquest servidor no gestiona Intel&reg; AMT. Intel AMT encara es pot utilitzar activant-lo i configurant-lo manualment.",

1
views/default.handlebars
View file

@ -2362,7 +2362,6 @@
QV('authAppSetupCheck', userinfo.otpsecret == 1);
QV('manageAuthApp', (serverinfo.lock2factor != true) && ((userinfo.otpsecret == 1) || ((features2 & 0x00020000) == 0)));
QV('manageDuoApp', (serverinfo.lock2factor != true) && ((features2 & 0x20000000) != 0));
console.log('duo', (serverinfo.lock2factor != true) && ((features2 & 0x20000000) != 0));
QV('authKeySetupCheck', userinfo.otphkeys > 0);
QV('authPushAuthDevCheck', (userinfo.otpdev > 0) && ((features2 & 0x40) != 0));
QV('authCodesSetupCheck', userinfo.otpkeys > 0);

10
views/default3.handlebars
View file

@ -2867,9 +2867,10 @@
QV('authPhoneNumberCheck', (userinfo.phone != null));
QV('authMessagingCheck', (userinfo.msghandle != null));
QV('authEmailSetupCheck', (userinfo.otpekey == 1) && (userinfo.email != null) && (userinfo.emailVerified == true));
QV('authDuoSetupCheck', (userinfo.otpduo == 1));
QV('authDuoSetupCheck', (userinfo.otpduo == 1) && ((features2 & 0x20000000) != 0));
QV('authAppSetupCheck', userinfo.otpsecret == 1);
QV('manageAuthApp', (serverinfo.lock2factor != true) && ((userinfo.otpsecret == 1) || ((features2 & 0x00020000) == 0)));
QV('manageDuoApp', (serverinfo.lock2factor != true) && ((features2 & 0x20000000) != 0));
QV('authKeySetupCheck', userinfo.otphkeys > 0);
QV('authPushAuthDevCheck', (userinfo.otpdev > 0) && ((features2 & 0x40) != 0));
QV('authCodesSetupCheck', userinfo.otpkeys > 0);
@ -13844,9 +13845,9 @@
}
function account_manageAuthDuo() {
if (xxdialogMode || ((features & 0x00800000) == 0)) return;
if (xxdialogMode || ((features2 & 0x20000000) == 0)) return;
var duoU2Fenabled = ((userinfo.otpduo == 1));
setModalContent('xxAddAgent', 'Duo Authentication', "When enabled, on each login, you will be given the option to login using Duo for added security." + '<br /><br /><label><input id=duo2facheck type=checkbox class="form-check-input me-2" ' + (duoU2Fenabled ? 'checked' : '') + '/>' + "Enable Duo two-factor authentication." + '</label>');
setModalContent('xxAddAgent', 'Duo Authentication', "When enabled, on each login, you will be given the option to use Duo for added security." + '<br /><br /><label><input id=duo2facheck type=checkbox class="form-check-input me-2" ' + (duoU2Fenabled ? 'checked' : '') + '/>' + "Enable Duo two-factor authentication." + '</label>');
showModal('xxAddAgentModal', 'idx_dlgOkButton', function () {
if (duoU2Fenabled != Q('duo2facheck').checked) { meshserver.send({ action: 'otpduo', enabled: Q('duo2facheck').checked }); }
});
@ -19790,7 +19791,8 @@
showModal('xxAddAgentModal', 'idx_dlgOkButton', setServerTracingEx);
}
function setServerTracingEx(b) {
function setServerTracingEx() {
var b = 1;
var sources = [], allsources = ['cookie', 'dispatch', 'main', 'peer', 'web', 'webrequest', 'relay', 'webrelaydata', 'webrelay', 'mps', 'mpscmd', 'swarm', 'swarmcmd', 'agentupdate', 'agent', 'cert', 'db', 'email', 'amt', 'httpheaders', 'authlog'];
if (b == 1) { for (var i = 1; i < 22; i++) { try { if (Q('p41c' + i).checked) { sources.push(allsources[i - 1]); } } catch (ex) { } } }
meshserver.send({ action: 'traceinfo', traceSources: sources });