external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-14 12:01:52 +00:00
Code Issues Releases Wiki Activity

Added warning if NodeJS version does not support OpenID.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2022-09-06 14:40:52 -07:00
parent e8187cb8e6
commit c8335f94d4
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
meshcentral.js
View file

@ -3860,7 +3860,12 @@ var ServerWarnings = {
17: "SendGrid server has limited use in LAN mode.", 17: "SendGrid server has limited use in LAN mode.",
18: "SMTP server has limited use in LAN mode.", 18: "SMTP server has limited use in LAN mode.",
19: "SMS gateway has limited use in LAN mode.", 19: "SMS gateway has limited use in LAN mode.",
20: "Invalid \"LoginCookieEncryptionKey\" in config.json." 20: "Invalid \"LoginCookieEncryptionKey\" in config.json.",
21: "Backup path can't be set within meshcentral-data folder, backup settings ignored.",
22: "Failed to sign agent {0}: {1}",
23: "Unable to load agent icon file: {0}.",
24: "Unable to load agent logo file: {0}.",
25: "This NodeJS version does not support OpenID."
}; };
*/ */
@ -3941,7 +3946,15 @@ function mainStart() {
if ((typeof config.domains[i].authstrategies.github == 'object') && (typeof config.domains[i].authstrategies.github.clientid == 'string') && (typeof config.domains[i].authstrategies.github.clientsecret == 'string') && (passport.indexOf('passport-github2') == -1)) { passport.push('passport-github2'); } if ((typeof config.domains[i].authstrategies.github == 'object') && (typeof config.domains[i].authstrategies.github.clientid == 'string') && (typeof config.domains[i].authstrategies.github.clientsecret == 'string') && (passport.indexOf('passport-github2') == -1)) { passport.push('passport-github2'); }
if ((typeof config.domains[i].authstrategies.reddit == 'object') && (typeof config.domains[i].authstrategies.reddit.clientid == 'string') && (typeof config.domains[i].authstrategies.reddit.clientsecret == 'string') && (passport.indexOf('passport-reddit') == -1)) { passport.push('passport-reddit'); } if ((typeof config.domains[i].authstrategies.reddit == 'object') && (typeof config.domains[i].authstrategies.reddit.clientid == 'string') && (typeof config.domains[i].authstrategies.reddit.clientsecret == 'string') && (passport.indexOf('passport-reddit') == -1)) { passport.push('passport-reddit'); }
if ((typeof config.domains[i].authstrategies.azure == 'object') && (typeof config.domains[i].authstrategies.azure.clientid == 'string') && (typeof config.domains[i].authstrategies.azure.clientsecret == 'string') && (typeof config.domains[i].authstrategies.azure.tenantid == 'string') && (passport.indexOf('passport-azure-oauth2') == -1)) { passport.push('passport-azure-oauth2'); passport.push('jwt-simple'); } if ((typeof config.domains[i].authstrategies.azure == 'object') && (typeof config.domains[i].authstrategies.azure.clientid == 'string') && (typeof config.domains[i].authstrategies.azure.clientsecret == 'string') && (typeof config.domains[i].authstrategies.azure.tenantid == 'string') && (passport.indexOf('passport-azure-oauth2') == -1)) { passport.push('passport-azure-oauth2'); passport.push('jwt-simple'); }
if ((typeof config.domains[i].authstrategies.oidc == 'object') && (typeof config.domains[i].authstrategies.oidc.clientid == 'string') && (typeof config.domains[i].authstrategies.oidc.clientsecret == 'string') && (typeof config.domains[i].authstrategies.oidc.issuer == 'string') && (passport.indexOf('@mstrhakr/passport-openidconnect') == -1)) { passport.push('@mstrhakr/passport-openidconnect'); passport.push('openid-client'); } if ((typeof config.domains[i].authstrategies.oidc == 'object') && (typeof config.domains[i].authstrategies.oidc.clientid == 'string') && (typeof config.domains[i].authstrategies.oidc.clientsecret == 'string') && (typeof config.domains[i].authstrategies.oidc.issuer == 'string') && (passport.indexOf('@mstrhakr/passport-openidconnect') == -1)) {
if ((nodeVersion >= 17) || ((Math.floor(nodeVersion) == 16) && (nodeVersion >= 16.13)) || ((Math.floor(nodeVersion) == 14) && (nodeVersion >= 14.15)) || ((Math.floor(nodeVersion) == 12) && (nodeVersion >= 12.19))) {
passport.push('@mstrhakr/passport-openidconnect');
passport.push('openid-client');
} else {
addServerWarning('This NodeJS version does not support OpenID.', 25);
delete config.domains[i].authstrategies.oidc;
}
}
if ((typeof config.domains[i].authstrategies.saml == 'object') || (typeof config.domains[i].authstrategies.jumpcloud == 'object')) { passport.push('passport-saml'); } if ((typeof config.domains[i].authstrategies.saml == 'object') || (typeof config.domains[i].authstrategies.jumpcloud == 'object')) { passport.push('passport-saml'); }
} }
if (config.domains[i].sessionrecording != null) { sessionRecording = true; } if (config.domains[i].sessionrecording != null) { sessionRecording = true; }

6
views/default.handlebars
View file

@ -2322,6 +2322,7 @@
break; break;
} }
case 'serverwarnings': { case 'serverwarnings': {
console.log(message);
if ((message.warnings != null) && (message.warnings.length > 0)) { if ((message.warnings != null) && (message.warnings.length > 0)) {
var ServerWarnings = { var ServerWarnings = {
1: "MeshCentral SSH support requires NodeJS 11 or higher.", 1: "MeshCentral SSH support requires NodeJS 11 or higher.",
@ -2347,7 +2348,8 @@
21: "Backup path can't be set within meshcentral-data folder, backup settings ignored.", 21: "Backup path can't be set within meshcentral-data folder, backup settings ignored.",
22: "Failed to sign agent {0}: {1}", 22: "Failed to sign agent {0}: {1}",
23: "Unable to load agent icon file: {0}.", 23: "Unable to load agent icon file: {0}.",
24: "Unable to load agent logo file: {0}." 24: "Unable to load agent logo file: {0}.",
25: "This NodeJS version does not support OpenID."
}; };
var x = ''; var x = '';
for (var i in message.warnings) { for (var i in message.warnings) {
@ -2356,7 +2358,7 @@
x += '<div style=color:red;padding-bottom:6px><b>' + "WARNING: " + y + '</b></div>'; x += '<div style=color:red;padding-bottom:6px><b>' + "WARNING: " + y + '</b></div>';
} else { } else {
var z = ServerWarnings[y.id]; var z = ServerWarnings[y.id];
if (z == null) { z = y.msg; } else { z = format(z, ...y.args); } if (z == null) { z = y.msg; } else { if (y.args != null) { z = format(z, ...y.args); } }
x += '<div style=color:red;padding-bottom:6px><b>' + "WARNING: " + z + '</b></div>'; x += '<div style=color:red;padding-bottom:6px><b>' + "WARNING: " + z + '</b></div>';
} }
} }