mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2025-03-13 21:12:53 -04:00
Fixed #2376. Certificate altNames exception.
This commit is contained in:
parent
c6f93b5ae4
commit
b68afcde6a
@ -734,10 +734,12 @@ module.exports.CertificateOperations = function (parent) {
|
|||||||
var altNames = webCertificate.getExtension('subjectAltName');
|
var altNames = webCertificate.getExtension('subjectAltName');
|
||||||
if (altNames) {
|
if (altNames) {
|
||||||
for (i = 0; i < altNames.altNames.length; i++) {
|
for (i = 0; i < altNames.altNames.length; i++) {
|
||||||
|
if ((altNames.altNames[i] != null) && (altNames.altNames[i].type === 2) && (typeof altNames.altNames[i].value === 'string')) {
|
||||||
var acn = altNames.altNames[i].value.toLowerCase();
|
var acn = altNames.altNames[i].value.toLowerCase();
|
||||||
if (r.CommonNames.indexOf(acn) == -1) { r.CommonNames.push(acn); }
|
if (r.CommonNames.indexOf(acn) == -1) { r.CommonNames.push(acn); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
var rootCertificate = obj.pki.certificateFromPem(r.root.cert);
|
var rootCertificate = obj.pki.certificateFromPem(r.root.cert);
|
||||||
r.RootName = rootCertificate.subject.getField('CN').value;
|
r.RootName = rootCertificate.subject.getField('CN').value;
|
||||||
}
|
}
|
||||||
@ -900,7 +902,14 @@ module.exports.CertificateOperations = function (parent) {
|
|||||||
}
|
}
|
||||||
r.CommonNames = [r.CommonName.toLowerCase()];
|
r.CommonNames = [r.CommonName.toLowerCase()];
|
||||||
var altNames = webCertificate.getExtension('subjectAltName');
|
var altNames = webCertificate.getExtension('subjectAltName');
|
||||||
if (altNames) { for (i = 0; i < altNames.altNames.length; i++) { r.CommonNames.push(altNames.altNames[i].value.toLowerCase()); } }
|
if (altNames) {
|
||||||
|
for (i = 0; i < altNames.altNames.length; i++) {
|
||||||
|
if ((altNames.altNames[i] != null) && (altNames.altNames[i].type === 2) && (typeof altNames.altNames[i].value === 'string')) {
|
||||||
|
var acn = altNames.altNames[i].value.toLowerCase();
|
||||||
|
if (r.CommonNames.indexOf(acn) == -1) { r.CommonNames.push(acn); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
var rootCertificate = obj.pki.certificateFromPem(r.root.cert);
|
var rootCertificate = obj.pki.certificateFromPem(r.root.cert);
|
||||||
r.RootName = rootCertificate.subject.getField('CN').value;
|
r.RootName = rootCertificate.subject.getField('CN').value;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user