Fixed certificate loading issue.
Ylian Saint-Hilaire committed
Aug 31, 2018 at 16:43 UTC
044ff67bc675c61ecafcf4f4c101f68c904f82d1
3 files changed
+4
-4
certoperations.js
+2
-2
@@ -187,7 +187,7 @@ module.exports.CertificateOperations = function () {
187
188
// Look for domains that have DNS names and load their certificates
189
r.dns = {};
190
- for (i = 0; i < config.domains.length; i++) {
190
+ for (i in config.domains) {
191
if ((i != "") && (config.domains[i] != null) && (config.domains[i].dns != null)) {
192
dnsname = config.domains[i].dns;
193
if (args.tlsoffload === true) {
@@ -353,7 +353,7 @@ module.exports.CertificateOperations = function () {
353
r = { root: { cert: rootCertificate, key: rootPrivateKey }, web: { cert: webCertificate, key: webPrivateKey, ca: [] }, mps: { cert: mpsCertificate, key: mpsPrivateKey }, agent: { cert: agentCertificate, key: agentPrivateKey }, console: { cert: consoleCertificate, key: consolePrivateKey }, ca: calist, CommonName: commonName, RootName: rootName, AmtConsoleName: amtConsoleName, AmtMpsName: mpsCommonName, dns: {}, WebIssuer: webIssuer };
354
355
// Look for domains with DNS names that have no certificates and generated them.
356
- for (i = 0; i < config.domains.length; i++) {
356
+ for (i in config.domains) {
357
if ((i != "") && (config.domains[i] != null) && (config.domains[i].dns != null)) {
358
dnsname = config.domains[i].dns;
359
if (args.tlsoffload != true) {
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.1.9-w",
3
+ "version": "0.1.9-z",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
webserver.js
+1
-1
@@ -104,7 +104,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
104
// Perform hash on web certificate and agent certificate
105
obj.webCertificateHash = parent.certificateOperations.forge.pki.getPublicKeyFingerprint(parent.certificateOperations.forge.pki.certificateFromPem(obj.certificates.web.cert).publicKey, { md: parent.certificateOperations.forge.md.sha384.create(), encoding: 'binary' });
106
obj.webCertificateHashs = { '': obj.webCertificateHash };
107
- for (i in obj.parent.config.domains) { if (obj.parent.config.domains[i].dns != null) { obj.webCertificateHashs[i] = parent.certificateOperations.forge.pki.getPublicKeyFingerprint(parent.certificateOperations.forge.pki.certificateFromPem(obj.parent.config.domains[i].certs.cert).publicKey, { md: parent.certificateOperations.forge.md.sha384.create(), encoding: 'binary' }); } }
107
+ for (var i in obj.parent.config.domains) { if (obj.parent.config.domains[i].dns != null) { obj.webCertificateHashs[i] = parent.certificateOperations.forge.pki.getPublicKeyFingerprint(parent.certificateOperations.forge.pki.certificateFromPem(obj.parent.config.domains[i].certs.cert).publicKey, { md: parent.certificateOperations.forge.md.sha384.create(), encoding: 'binary' }); } }
108
obj.webCertificateHashBase64 = new Buffer(parent.certificateOperations.forge.pki.getPublicKeyFingerprint(parent.certificateOperations.forge.pki.certificateFromPem(obj.certificates.web.cert).publicKey, { md: parent.certificateOperations.forge.md.sha384.create(), encoding: 'binary' }), 'binary').toString('base64').replace(/\+/g, '@').replace(/\//g, '$');
109
obj.agentCertificateHashHex = parent.certificateOperations.forge.pki.getPublicKeyFingerprint(parent.certificateOperations.forge.pki.certificateFromPem(obj.certificates.agent.cert).publicKey, { md: parent.certificateOperations.forge.md.sha384.create(), encoding: 'hex' });
110
obj.agentCertificateHashBase64 = new Buffer(parent.certificateOperations.forge.pki.getPublicKeyFingerprint(parent.certificateOperations.forge.pki.certificateFromPem(obj.certificates.agent.cert).publicKey, { md: parent.certificateOperations.forge.md.sha384.create(), encoding: 'binary' }), 'binary').toString('base64').replace(/\+/g, '@').replace(/\//g, '$');