Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-23 05:42:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed certificate creation bug

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2018-09-01 13:00:53 -07:00
parent 044ff67bc6
commit 8bf307ec98
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
certoperations.js
View File

@ -33,7 +33,7 @@ module.exports.CertificateOperations = function () {
// Create a self-signed certificate // Create a self-signed certificate
obj.GenerateRootCertificate = function (addThumbPrintToName, commonName, country, organization, strong) { obj.GenerateRootCertificate = function (addThumbPrintToName, commonName, country, organization, strong) {
var keys = obj.pki.rsa.generateKeyPair((strong === true) ? 3072 : 2048); var keys = obj.pki.rsa.generateKeyPair((strong == true) ? 3072 : 2048);
var cert = obj.pki.createCertificate(); var cert = obj.pki.createCertificate();
cert.publicKey = keys.publicKey; cert.publicKey = keys.publicKey;
cert.serialNumber = String(Math.floor((Math.random() * 100000) + 1)); cert.serialNumber = String(Math.floor((Math.random() * 100000) + 1));
@ -42,8 +42,8 @@ module.exports.CertificateOperations = function () {
cert.validity.notAfter = new Date(); cert.validity.notAfter = new Date();
cert.validity.notAfter.setFullYear(cert.validity.notAfter.getFullYear() + 30); cert.validity.notAfter.setFullYear(cert.validity.notAfter.getFullYear() + 30);
if (addThumbPrintToName === true) { commonName += "-" + obj.pki.getPublicKeyFingerprint(cert.publicKey, { encoding: "hex" }).substring(0, 6); } if (addThumbPrintToName === true) { commonName += "-" + obj.pki.getPublicKeyFingerprint(cert.publicKey, { encoding: "hex" }).substring(0, 6); }
if (country === undefined) { country = "unknown"; } if (country == null) { country = "unknown"; }
if (organization === undefined) { organization = "unknown"; } if (organization == null) { organization = "unknown"; }
var attrs = [{ name: "commonName", value: commonName }, { name: "organizationName", value: organization }, { name: "countryName", value: country }]; var attrs = [{ name: "commonName", value: commonName }, { name: "organizationName", value: organization }, { name: "countryName", value: country }];
cert.setSubject(attrs); cert.setSubject(attrs);
cert.setIssuer(attrs); cert.setIssuer(attrs);
@ -56,7 +56,7 @@ module.exports.CertificateOperations = function () {
// Issue a certificate from a root // Issue a certificate from a root
obj.IssueWebServerCertificate = function (rootcert, addThumbPrintToName, commonName, country, organization, extKeyUsage, strong) { obj.IssueWebServerCertificate = function (rootcert, addThumbPrintToName, commonName, country, organization, extKeyUsage, strong) {
var keys = obj.pki.rsa.generateKeyPair((strong === true) ? 3072 : 2048); var keys = obj.pki.rsa.generateKeyPair((strong == true) ? 3072 : 2048);
var cert = obj.pki.createCertificate(); var cert = obj.pki.createCertificate();
cert.publicKey = keys.publicKey; cert.publicKey = keys.publicKey;
cert.serialNumber = String(Math.floor((Math.random() * 100000) + 1)); cert.serialNumber = String(Math.floor((Math.random() * 100000) + 1));
@ -66,8 +66,8 @@ module.exports.CertificateOperations = function () {
cert.validity.notAfter.setFullYear(cert.validity.notAfter.getFullYear() + 30); cert.validity.notAfter.setFullYear(cert.validity.notAfter.getFullYear() + 30);
if (addThumbPrintToName === true) { commonName += "-" + obj.pki.getPublicKeyFingerprint(cert.publicKey, { encoding: "hex" }).substring(0, 6); } if (addThumbPrintToName === true) { commonName += "-" + obj.pki.getPublicKeyFingerprint(cert.publicKey, { encoding: "hex" }).substring(0, 6); }
var attrs = [{ name: "commonName", value: commonName }]; var attrs = [{ name: "commonName", value: commonName }];
if (country != undefined) { attrs.push({ name: "countryName", value: country }); } if (country != null) { attrs.push({ name: "countryName", value: country }); }
if (organization != undefined) { attrs.push({ name: "organizationName", value: organization }); } if (organization != null) { attrs.push({ name: "organizationName", value: organization }); }
cert.setSubject(attrs); cert.setSubject(attrs);
cert.setIssuer(rootcert.cert.subject.attributes); cert.setIssuer(rootcert.cert.subject.attributes);
@ -268,7 +268,7 @@ module.exports.CertificateOperations = function () {
} }
var rootCertAndKey, rootCertificate, rootPrivateKey, rootName; var rootCertAndKey, rootCertificate, rootPrivateKey, rootName;
if (r.root === undefined) { if (r.root == null) {
// If the root certificate does not exist, create one // If the root certificate does not exist, create one
console.log("Generating root certificate..."); console.log("Generating root certificate...");
rootCertAndKey = obj.GenerateRootCertificate(true, "MeshCentralRoot", null, null, strongCertificate); rootCertAndKey = obj.GenerateRootCertificate(true, "MeshCentralRoot", null, null, strongCertificate);

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.1.9-z", "version": "0.2.0-a",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",