Minor authStrategy logging fix.
Ylian Saint-Hilaire committed
Nov 24, 2021 at 12:54 UTC
1522526512f67496c2123d92e70670f86f0f2dbd
42 files changed
+3
-3
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/MeshService-signed.exe
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
agents/MeshService.exe
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
agents/MeshService64-signed.exe
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
agents/MeshService64.exe
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
agents/new/MeshCmd-signed.exe
Binary files /dev/null and b/agents/new/MeshCmd-signed.exe differ
agents/new/MeshCmd64-signed.exe
Binary files /dev/null and b/agents/new/MeshCmd64-signed.exe differ
agents/new/MeshService-signed.exe
Binary files /dev/null and b/agents/new/MeshService-signed.exe differ
agents/new/MeshService.exe
Binary files /dev/null and b/agents/new/MeshService.exe differ
agents/new/MeshService64-signed.exe
Binary files /dev/null and b/agents/new/MeshService64-signed.exe differ
agents/new/MeshService64.exe
Binary files /dev/null and b/agents/new/MeshService64.exe differ
agents/old/MeshCmd-signed.exe
Binary files /dev/null and b/agents/old/MeshCmd-signed.exe differ
agents/old/MeshCmd64-signed.exe
Binary files /dev/null and b/agents/old/MeshCmd64-signed.exe differ
agents/old/MeshService-signed.exe
Binary files /dev/null and b/agents/old/MeshService-signed.exe differ
agents/old/MeshService.exe
Binary files /dev/null and b/agents/old/MeshService.exe differ
agents/old/MeshService64-signed.exe
Binary files /dev/null and b/agents/old/MeshService64-signed.exe differ
agents/old/MeshService64.exe
Binary files /dev/null and b/agents/old/MeshService64.exe differ
agents/old/meshagent_aarch64
renamed
agents/old/meshagent_aarch64-cortex-a53
renamed
agents/old/meshagent_arm
renamed
agents/old/meshagent_arm-linaro
renamed
agents/old/meshagent_armhf
renamed
agents/old/meshagent_armhf2
renamed
agents/old/meshagent_freebsd_x86-64
renamed
agents/old/meshagent_linux-armada370-hf
renamed
agents/old/meshagent_mips
renamed
agents/old/meshagent_mips24kc
renamed
agents/old/meshagent_mipsel24kc
renamed
agents/old/meshagent_openbsd_x86-64
renamed
agents/old/meshagent_openwrt_x86_64
renamed
agents/old/meshagent_osx-arm-64
renamed
agents/old/meshagent_osx-universal-64
renamed
agents/old/meshagent_osx-x86-64
renamed
agents/old/meshagent_pogo
renamed
agents/old/meshagent_poky
renamed
agents/old/meshagent_poky64
renamed
agents/old/meshagent_x86
renamed
agents/old/meshagent_x86-64
renamed
agents/old/meshagent_x86-64_nokvm
renamed
agents/old/meshagent_x86_nokvm
renamed
webserver.js
+3
-3
@@ -6069,8 +6069,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
6069
var options = { entryPoint: domain.authstrategies.saml.idpurl, issuer: 'meshcentral' };
6070
if (typeof domain.authstrategies.saml.callbackurl == 'string') { options.callbackUrl = domain.authstrategies.saml.callbackurl; } else { options.callbackUrl = url + 'auth-saml-callback'; }
6071
if (domain.authstrategies.saml.disablerequestedauthncontext != null) { options.disableRequestedAuthnContext = domain.authstrategies.saml.disablerequestedauthncontext; }
6072
- parent.debug('web', 'Adding SAML SSO with options: ' + JSON.stringify(options));
6072
if (typeof domain.authstrategies.saml.entityid == 'string') { options.issuer = domain.authstrategies.saml.entityid; }
6073
+ parent.debug('web', 'Adding SAML SSO with options: ' + JSON.stringify(options));
6074
options.cert = cert.toString().split('-----BEGIN CERTIFICATE-----').join('').split('-----END CERTIFICATE-----').join('');
6075
const SamlStrategy = require('passport-saml').Strategy;
6076
passport.use(new SamlStrategy(options,
@@ -6109,8 +6109,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
6109
var options = { entryPoint: domain.authstrategies.intel.idpurl, issuer: 'meshcentral' };
6110
if (typeof domain.authstrategies.intel.callbackurl == 'string') { options.callbackUrl = domain.authstrategies.intel.callbackurl; } else { options.callbackUrl = url + 'auth-intel-callback'; }
6111
if (domain.authstrategies.intel.disablerequestedauthncontext != null) { options.disableRequestedAuthnContext = domain.authstrategies.intel.disablerequestedauthncontext; }
6112
- parent.debug('web', 'Adding Intel SSO with options: ' + JSON.stringify(options));
6112
if (typeof domain.authstrategies.intel.entityid == 'string') { options.issuer = domain.authstrategies.intel.entityid; }
6113
+ parent.debug('web', 'Adding Intel SSO with options: ' + JSON.stringify(options));
6114
options.cert = cert.toString().split('-----BEGIN CERTIFICATE-----').join('').split('-----END CERTIFICATE-----').join('');
6115
const SamlStrategy = require('passport-saml').Strategy;
6116
passport.use(new SamlStrategy(options,
@@ -6150,8 +6150,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
6150
} else {
6151
var options = { entryPoint: domain.authstrategies.jumpcloud.idpurl, issuer: 'meshcentral' };
6152
if (typeof domain.authstrategies.jumpcloud.callbackurl == 'string') { options.callbackUrl = domain.authstrategies.jumpcloud.callbackurl; } else { options.callbackUrl = url + 'auth-jumpcloud-callback'; }
6153
- parent.debug('web', 'Adding JumpCloud SSO with options: ' + JSON.stringify(options));
6153
if (typeof domain.authstrategies.jumpcloud.entityid == 'string') { options.issuer = domain.authstrategies.jumpcloud.entityid; }
6154
+ parent.debug('web', 'Adding JumpCloud SSO with options: ' + JSON.stringify(options));
6155
options.cert = cert.toString().split('-----BEGIN CERTIFICATE-----').join('').split('-----END CERTIFICATE-----').join('');
6156
const SamlStrategy = require('passport-saml').Strategy;
6157
passport.use(new SamlStrategy(options,