diff --git a/src/tools/certificate-key-parser/certificate-key-parser.infos.ts b/src/tools/certificate-key-parser/certificate-key-parser.infos.ts index 09042fbe..cad5d21a 100644 --- a/src/tools/certificate-key-parser/certificate-key-parser.infos.ts +++ b/src/tools/certificate-key-parser/certificate-key-parser.infos.ts @@ -102,7 +102,7 @@ export function getPrivateKeyLabelValues(privateKey: PrivateKey) { ] as LabelValue[]; } -export function getCertificateLabelValues(cert: Certificate) { +export function getCertificateLabelValues(cert: Certificate, forgeCertificate: forge.pki.Certificate | null) { return [ { label: 'Type:', @@ -162,7 +162,7 @@ export function getCertificateLabelValues(cert: Certificate) { value: cert.purposes?.join(', '), }, { - label: 'Extensions:', + label: 'Extensions (parsed):', value: JSON.stringify(cert.getExtensions().map(ext => ({ oid: (ext).oid, name: (ext).name || (oids)[(ext).oid], @@ -171,6 +171,15 @@ export function getCertificateLabelValues(cert: Certificate) { })), null, 2), multiline: true, }, + { + label: 'Extensions (raw):', + value: JSON.stringify(forgeCertificate?.extensions.map(ext => ({ + id: (ext).id, + name: (ext).id || (oids)[(ext).id], + ...ext, + })), null, 2), + multiline: true, + }, ...['sha1', 'sha256', 'sha512'].flatMap(algorithm => [ @@ -260,7 +269,7 @@ export async function getPGPPrivateKeyLabelValuesAsync(pgpPrivateKey: openpgp.Ke ] as LabelValue[]; } -export function getCSRLabelValues(csr: forge.pki.Certificate) { +export function getCSRLabelValues(csr: forge.pki.CertificateSigningRequest) { return [ { label: 'Type:', @@ -271,18 +280,14 @@ export function getCSRLabelValues(csr: forge.pki.Certificate) { value: csr.subject?.attributes?.map(a => JSON.stringify(a, null, 2)).join('\n'), multiline: true, }, - { - label: 'Issuer:', - value: csr.issuer?.toString(), - multiline: true, - }, - { - label: 'Validity:', - value: JSON.stringify(csr.validity, null, 2), - }, + // { + // label: 'Request Info:', + // value: JSON.stringify(csr.certificationRequestInfo, null, 2), + // multiline: true, + // }, { label: 'Signature:', - value: csr.signature, + value: csr.signature?.toString('hex'), }, { label: 'Signature Oid:', @@ -296,23 +301,19 @@ export function getCSRLabelValues(csr: forge.pki.Certificate) { label: 'Signing info:', value: JSON.stringify(csr.siginfo, null, 2), }, - { - label: 'Serial:', - value: csr.serialNumber?.toString(), - }, { label: 'Extensions:', - value: JSON.stringify(csr.extensions, null, 2), + value: JSON.stringify(csr.attributes, null, 2), multiline: true, }, { label: 'Public Key:', - value: onErrorReturnErrorMessage(() => forge.pki.publicKeyToPem(csr.publicKey)), + value: onErrorReturnErrorMessage(() => forge.pki.publicKeyToPem(csr.publicKey as never)), multiline: true, }, { label: 'Public Key Fingerprint:', - value: onErrorReturnErrorMessage(() => forge.pki.getPublicKeyFingerprint(csr.publicKey)?.toHex()), + value: onErrorReturnErrorMessage(() => forge.pki.getPublicKeyFingerprint(csr.publicKey as never)?.toHex()), multiline: true, }, ] as LabelValue[]; diff --git a/src/tools/certificate-key-parser/certificate-key-parser.service.ts b/src/tools/certificate-key-parser/certificate-key-parser.service.ts index 7113e225..fe90ea13 100644 --- a/src/tools/certificate-key-parser/certificate-key-parser.service.ts +++ b/src/tools/certificate-key-parser/certificate-key-parser.service.ts @@ -77,13 +77,24 @@ export async function getKeyOrCertificateInfosAsync(keyOrCertificateValue: strin certificateX509DER = Base64.fromUint8Array(cert.toBuffer('x509')); } catch {} + let forgeCertificate: forge.pki.Certificate | null = null; + try { + forgeCertificate = forge.pki.certificateFromPem(inputKeyOrCertificateValue?.toString(), false, false); + } + catch {} + if (!forgeCertificate) { + try { + forgeCertificate = forge.pki.certificateFromAsn1(inputKeyOrCertificateValue as never, false); + } + catch {} + } - return { values: getCertificateLabelValues(cert), certificateX509DER }; + return { values: getCertificateLabelValues(cert, forgeCertificate), certificateX509DER }; } const csr = canParse(inputKeyOrCertificateValue, (value) => { return forge.pki.certificationRequestFromPem(value.toString(), false, false); - }) as forge.pki.Certificate; + }) as forge.pki.CertificateSigningRequest; if (csr) { return { values: getCSRLabelValues(csr) }; }