diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index df5c05a1..541f6a96 100644 Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index 4c966dcc..0a907224 100644 Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe index 3d071315..cd3c7037 100644 Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ diff --git a/agents/MeshService.exe b/agents/MeshService.exe index 1d99b000..38c7497c 100644 Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe index d8a96bd8..9be17df4 100644 Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ diff --git a/agents/MeshService64.exe b/agents/MeshService64.exe index a502b347..7b29fbb3 100644 Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ diff --git a/agents/new/MeshCmd-signed.exe b/agents/new/MeshCmd-signed.exe new file mode 100644 index 00000000..541f6a96 Binary files /dev/null and b/agents/new/MeshCmd-signed.exe differ diff --git a/agents/new/MeshCmd64-signed.exe b/agents/new/MeshCmd64-signed.exe new file mode 100644 index 00000000..0a907224 Binary files /dev/null and b/agents/new/MeshCmd64-signed.exe differ diff --git a/agents/new/MeshService-signed.exe b/agents/new/MeshService-signed.exe new file mode 100644 index 00000000..cd3c7037 Binary files /dev/null and b/agents/new/MeshService-signed.exe differ diff --git a/agents/new/MeshService.exe b/agents/new/MeshService.exe new file mode 100644 index 00000000..38c7497c Binary files /dev/null and b/agents/new/MeshService.exe differ diff --git a/agents/new/MeshService64-signed.exe b/agents/new/MeshService64-signed.exe new file mode 100644 index 00000000..9be17df4 Binary files /dev/null and b/agents/new/MeshService64-signed.exe differ diff --git a/agents/new/MeshService64.exe b/agents/new/MeshService64.exe new file mode 100644 index 00000000..7b29fbb3 Binary files /dev/null and b/agents/new/MeshService64.exe differ diff --git a/agents/old/MeshCmd-signed.exe b/agents/old/MeshCmd-signed.exe new file mode 100644 index 00000000..df5c05a1 Binary files /dev/null and b/agents/old/MeshCmd-signed.exe differ diff --git a/agents/old/MeshCmd64-signed.exe b/agents/old/MeshCmd64-signed.exe new file mode 100644 index 00000000..4c966dcc Binary files /dev/null and b/agents/old/MeshCmd64-signed.exe differ diff --git a/agents/old/MeshService-signed.exe b/agents/old/MeshService-signed.exe new file mode 100644 index 00000000..3d071315 Binary files /dev/null and b/agents/old/MeshService-signed.exe differ diff --git a/agents/old/MeshService.exe b/agents/old/MeshService.exe new file mode 100644 index 00000000..1d99b000 Binary files /dev/null and b/agents/old/MeshService.exe differ diff --git a/agents/old/MeshService64-signed.exe b/agents/old/MeshService64-signed.exe new file mode 100644 index 00000000..d8a96bd8 Binary files /dev/null and b/agents/old/MeshService64-signed.exe differ diff --git a/agents/old/MeshService64.exe b/agents/old/MeshService64.exe new file mode 100644 index 00000000..a502b347 Binary files /dev/null and b/agents/old/MeshService64.exe differ diff --git a/agents/meshagent_aarch64 b/agents/old/meshagent_aarch64 similarity index 100% rename from agents/meshagent_aarch64 rename to agents/old/meshagent_aarch64 diff --git a/agents/meshagent_aarch64-cortex-a53 b/agents/old/meshagent_aarch64-cortex-a53 similarity index 100% rename from agents/meshagent_aarch64-cortex-a53 rename to agents/old/meshagent_aarch64-cortex-a53 diff --git a/agents/meshagent_arm b/agents/old/meshagent_arm similarity index 100% rename from agents/meshagent_arm rename to agents/old/meshagent_arm diff --git a/agents/meshagent_arm-linaro b/agents/old/meshagent_arm-linaro similarity index 100% rename from agents/meshagent_arm-linaro rename to agents/old/meshagent_arm-linaro diff --git a/agents/meshagent_armhf b/agents/old/meshagent_armhf similarity index 100% rename from agents/meshagent_armhf rename to agents/old/meshagent_armhf diff --git a/agents/meshagent_armhf2 b/agents/old/meshagent_armhf2 similarity index 100% rename from agents/meshagent_armhf2 rename to agents/old/meshagent_armhf2 diff --git a/agents/meshagent_freebsd_x86-64 b/agents/old/meshagent_freebsd_x86-64 similarity index 100% rename from agents/meshagent_freebsd_x86-64 rename to agents/old/meshagent_freebsd_x86-64 diff --git a/agents/meshagent_linux-armada370-hf b/agents/old/meshagent_linux-armada370-hf similarity index 100% rename from agents/meshagent_linux-armada370-hf rename to agents/old/meshagent_linux-armada370-hf diff --git a/agents/meshagent_mips b/agents/old/meshagent_mips similarity index 100% rename from agents/meshagent_mips rename to agents/old/meshagent_mips diff --git a/agents/meshagent_mips24kc b/agents/old/meshagent_mips24kc similarity index 100% rename from agents/meshagent_mips24kc rename to agents/old/meshagent_mips24kc diff --git a/agents/meshagent_mipsel24kc b/agents/old/meshagent_mipsel24kc similarity index 100% rename from agents/meshagent_mipsel24kc rename to agents/old/meshagent_mipsel24kc diff --git a/agents/meshagent_openbsd_x86-64 b/agents/old/meshagent_openbsd_x86-64 similarity index 100% rename from agents/meshagent_openbsd_x86-64 rename to agents/old/meshagent_openbsd_x86-64 diff --git a/agents/meshagent_openwrt_x86_64 b/agents/old/meshagent_openwrt_x86_64 similarity index 100% rename from agents/meshagent_openwrt_x86_64 rename to agents/old/meshagent_openwrt_x86_64 diff --git a/agents/meshagent_osx-arm-64 b/agents/old/meshagent_osx-arm-64 similarity index 100% rename from agents/meshagent_osx-arm-64 rename to agents/old/meshagent_osx-arm-64 diff --git a/agents/meshagent_osx-universal-64 b/agents/old/meshagent_osx-universal-64 similarity index 100% rename from agents/meshagent_osx-universal-64 rename to agents/old/meshagent_osx-universal-64 diff --git a/agents/meshagent_osx-x86-64 b/agents/old/meshagent_osx-x86-64 similarity index 100% rename from agents/meshagent_osx-x86-64 rename to agents/old/meshagent_osx-x86-64 diff --git a/agents/meshagent_pogo b/agents/old/meshagent_pogo similarity index 100% rename from agents/meshagent_pogo rename to agents/old/meshagent_pogo diff --git a/agents/meshagent_poky b/agents/old/meshagent_poky similarity index 100% rename from agents/meshagent_poky rename to agents/old/meshagent_poky diff --git a/agents/meshagent_poky64 b/agents/old/meshagent_poky64 similarity index 100% rename from agents/meshagent_poky64 rename to agents/old/meshagent_poky64 diff --git a/agents/meshagent_x86 b/agents/old/meshagent_x86 similarity index 100% rename from agents/meshagent_x86 rename to agents/old/meshagent_x86 diff --git a/agents/meshagent_x86-64 b/agents/old/meshagent_x86-64 similarity index 100% rename from agents/meshagent_x86-64 rename to agents/old/meshagent_x86-64 diff --git a/agents/meshagent_x86-64_nokvm b/agents/old/meshagent_x86-64_nokvm similarity index 100% rename from agents/meshagent_x86-64_nokvm rename to agents/old/meshagent_x86-64_nokvm diff --git a/agents/meshagent_x86_nokvm b/agents/old/meshagent_x86_nokvm similarity index 100% rename from agents/meshagent_x86_nokvm rename to agents/old/meshagent_x86_nokvm diff --git a/webserver.js b/webserver.js index a1d22f49..3d7f43e3 100644 --- a/webserver.js +++ b/webserver.js @@ -6069,8 +6069,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { var options = { entryPoint: domain.authstrategies.saml.idpurl, issuer: 'meshcentral' }; if (typeof domain.authstrategies.saml.callbackurl == 'string') { options.callbackUrl = domain.authstrategies.saml.callbackurl; } else { options.callbackUrl = url + 'auth-saml-callback'; } if (domain.authstrategies.saml.disablerequestedauthncontext != null) { options.disableRequestedAuthnContext = domain.authstrategies.saml.disablerequestedauthncontext; } - parent.debug('web', 'Adding SAML SSO with options: ' + JSON.stringify(options)); if (typeof domain.authstrategies.saml.entityid == 'string') { options.issuer = domain.authstrategies.saml.entityid; } + parent.debug('web', 'Adding SAML SSO with options: ' + JSON.stringify(options)); options.cert = cert.toString().split('-----BEGIN CERTIFICATE-----').join('').split('-----END CERTIFICATE-----').join(''); const SamlStrategy = require('passport-saml').Strategy; passport.use(new SamlStrategy(options, @@ -6109,8 +6109,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { var options = { entryPoint: domain.authstrategies.intel.idpurl, issuer: 'meshcentral' }; if (typeof domain.authstrategies.intel.callbackurl == 'string') { options.callbackUrl = domain.authstrategies.intel.callbackurl; } else { options.callbackUrl = url + 'auth-intel-callback'; } if (domain.authstrategies.intel.disablerequestedauthncontext != null) { options.disableRequestedAuthnContext = domain.authstrategies.intel.disablerequestedauthncontext; } - parent.debug('web', 'Adding Intel SSO with options: ' + JSON.stringify(options)); if (typeof domain.authstrategies.intel.entityid == 'string') { options.issuer = domain.authstrategies.intel.entityid; } + parent.debug('web', 'Adding Intel SSO with options: ' + JSON.stringify(options)); options.cert = cert.toString().split('-----BEGIN CERTIFICATE-----').join('').split('-----END CERTIFICATE-----').join(''); const SamlStrategy = require('passport-saml').Strategy; passport.use(new SamlStrategy(options, @@ -6150,8 +6150,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { } else { var options = { entryPoint: domain.authstrategies.jumpcloud.idpurl, issuer: 'meshcentral' }; if (typeof domain.authstrategies.jumpcloud.callbackurl == 'string') { options.callbackUrl = domain.authstrategies.jumpcloud.callbackurl; } else { options.callbackUrl = url + 'auth-jumpcloud-callback'; } - parent.debug('web', 'Adding JumpCloud SSO with options: ' + JSON.stringify(options)); if (typeof domain.authstrategies.jumpcloud.entityid == 'string') { options.issuer = domain.authstrategies.jumpcloud.entityid; } + parent.debug('web', 'Adding JumpCloud SSO with options: ' + JSON.stringify(options)); options.cert = cert.toString().split('-----BEGIN CERTIFICATE-----').join('').split('-----END CERTIFICATE-----').join(''); const SamlStrategy = require('passport-saml').Strategy; passport.use(new SamlStrategy(options,