@peculiar/certificates-viewer 4.2.1 → 4.3.0

package/hydrate/index.js

@@ -14749,14 +14749,6 @@ const isHex = (value) => (/^\s*(?:[0-9A-Fa-f][0-9A-Fa-f]\s*)+$/
     .test(value));
 const isPem = (value) => (/-----BEGIN [^-]+-----([A-Za-z0-9+\/=\s]+)-----END [^-]+-----|begin-base64[^\n]+\n([A-Za-z0-9+\/=\s]+)====/
     .test(value));
-const isX509Pem = (value) => (/-----BEGIN CERTIFICATE-----([A-Za-z0-9+\/=\s]+)-----END CERTIFICATE-----/
-    .test(value));
-const isX509CRLPem = (value) => (/-----BEGIN X509 CRL-----([A-Za-z0-9+\/=\s]+)-----END X509 CRL-----/
-    .test(value));
-const isPkcs10Pem = (value) => (/-----BEGIN CERTIFICATE REQUEST-----([A-Za-z0-9+\/=\s]+)-----END CERTIFICATE REQUEST-----/
-    .test(value));
-const isX509AttributePem = (value) => (/-----BEGIN ATTRIBUTE CERTIFICATE-----([A-Za-z0-9+\/=\s]+)-----END ATTRIBUTE CERTIFICATE-----/
-    .test(value));
 const isBase64 = (value) => {
     try {
         window.atob(value);
@@ -15029,32 +15021,32 @@ Download.cert = {
     asPEM: (pem, name) => {
         downloadFromBuffer(Convert_1.FromString(pem), name, 'cer', 'application/pkix-cert');
     },
-    asDER: (hex, name) => {
-        downloadFromBuffer(Convert_1.FromString(hex), name, 'cer', 'application/pkix-cert');
+    asDER: (raw, name) => {
+        downloadFromBuffer(raw, name, 'cer', 'application/pkix-cert');
     },
 };
 Download.attrCert = {
     asPEM: (pem, name) => {
         downloadFromBuffer(Convert_1.FromString(pem), name, 'cer', 'application/pkix-attr-cert');
     },
-    asDER: (hex, name) => {
-        downloadFromBuffer(Convert_1.FromString(hex), name, 'cer', 'application/pkix-attr-cert');
+    asDER: (raw, name) => {
+        downloadFromBuffer(raw, name, 'cer', 'application/pkix-attr-cert');
     },
 };
 Download.csr = {
     asPEM: (pem, name) => {
         downloadFromBuffer(Convert_1.FromString(pem), name, 'csr', 'application/pkcs10');
     },
-    asDER: (hex, name) => {
-        downloadFromBuffer(Convert_1.FromString(hex), name, 'csr', 'application/pkcs10');
+    asDER: (raw, name) => {
+        downloadFromBuffer(raw, name, 'csr', 'application/pkcs10');
     },
 };
 Download.crl = {
     asPEM: (pem, name) => {
         downloadFromBuffer(Convert_1.FromString(pem), name, 'crl', 'application/pkix-crl');
     },
-    asDER: (hex, name) => {
-        downloadFromBuffer(Convert_1.FromString(hex), name, 'crl', 'application/pkix-crl');
+    asDER: (raw, name) => {
+        downloadFromBuffer(raw, name, 'crl', 'application/pkix-crl');
     },
 };
 
@@ -16042,6 +16034,7 @@ const OIDs = {
     '1.2.840.113635.100.4.6.3': 'Apple Crypto Tier2 QoS',
     '1.2.840.113635.100.4.6.4': 'Apple Crypto Tier3 QoS',
     '1.2.840.113635.100.4.7': 'Apple ID Sharing Certificate',
+    '1.2.840.113635.100.4.13': 'Apple Extended Key Usage Developer ID Installer',
     '1.2.840.113635.100.5': 'Apple Certificate Policies',
     '1.2.840.113635.100.5.1': 'Apple Certificate Policy ID',
     '1.2.840.113635.100.5.2': 'Apple Dot Mac Certificate Policy ID',
@@ -16053,6 +16046,8 @@ const OIDs = {
     '1.2.840.113635.100.6.1.2': 'Apple Certificate Extension ADC Developer Signing',
     '1.2.840.113635.100.6.1.3': 'Apple Certificate Extension ADC Apple Signing',
     '1.2.840.113635.100.6.2.3': 'Apple Application Integration',
+    '1.2.840.113635.100.6.1.33': 'Apple Certificate Extension Developer ID Date',
+    '1.2.840.113635.100.6.1.14': 'Apple Certificate Extension Developer ID Installer',
     '1.2.840.114021.1.6.1': 'Identrus unknown policy Identifier',
     '1.2.840.114021.4.1': 'Identrus OCSP',
     '1.3.6.1.4.1.188.7.1.1': 'Ascom',
@@ -19116,6 +19111,7 @@ class X509Certificate extends AsnData {
         super(certificateRawToBuffer(raw), Certificate);
         this.thumbprints = {};
         this.type = 'X.509 Certificate';
+        this.tag = 'CERTIFICATE';
         const { tbsCertificate } = this.asn;
         this.serialNumber = Convert_1.ToHex(tbsCertificate.serialNumber);
         this.subject = new Name(tbsCertificate.subject).toJSON();
@@ -19179,15 +19175,6 @@ class X509Certificate extends AsnData {
             algorithm: signatureAlgorithm.algorithm,
         };
     }
-    exportAsBase64() {
-        return Convert_1.ToBase64(this.raw);
-    }
-    exportAsHexFormatted() {
-        return hexFormat(Convert_1.ToHex(this.raw));
-    }
-    exportAsPemFormatted() {
-        return `-----BEGIN CERTIFICATE-----\n${base64Format(this.exportAsBase64())}\n-----END CERTIFICATE-----`;
-    }
     async getThumbprint(algorithm = 'SHA-1') {
         try {
             const thumbprint = await getCertificateThumbprint(algorithm, this.raw);
@@ -19245,11 +19232,21 @@ class X509Certificate extends AsnData {
             .map((name) => (`${name.shortName}=${name.value}`))
             .join(', ');
     }
+    toString(format = 'pem') {
+        switch (format) {
+            case 'hex':
+                return hexFormat(Convert_1.ToHex(this.raw));
+            case 'pem':
+                return `-----BEGIN ${this.tag}-----\n${base64Format(this.toString('base64'))}\n-----END ${this.tag}-----`;
+            default:
+                return Convert_1.ToBase64(this.raw);
+        }
+    }
     downloadAsPEM(name) {
-        Download.cert.asPEM(this.exportAsPemFormatted(), name || this.commonName);
+        Download.cert.asPEM(this.toString('pem'), name || this.commonName);
     }
     downloadAsDER(name) {
-        Download.cert.asDER(this.exportAsHexFormatted(), name || this.commonName);
+        Download.cert.asDER(this.raw, name || this.commonName);
     }
 }
 
@@ -20852,6 +20849,7 @@ class X509AttributeCertificate extends AsnData {
         super(certificateRawToBuffer(raw), AttributeCertificate);
         this.thumbprints = {};
         this.type = 'X.509 Attribute Certificate';
+        this.tag = 'ATTRIBUTE CERTIFICATE';
         const { acinfo } = this.asn;
         this.serialNumber = Convert_1.ToHex(acinfo.serialNumber);
         this.version = acinfo.version;
@@ -20901,23 +20899,24 @@ class X509AttributeCertificate extends AsnData {
             console.error('Error thumbprint get:', error);
         }
     }
-    exportAsBase64() {
-        return Convert_1.ToBase64(this.raw);
-    }
-    exportAsHexFormatted() {
-        return hexFormat(Convert_1.ToHex(this.raw));
-    }
-    exportAsPemFormatted() {
-        return `-----BEGIN ATTRIBUTE CERTIFICATE-----\n${base64Format(this.exportAsBase64())}\n-----END ATTRIBUTE CERTIFICATE-----`;
-    }
     get commonName() {
         return `attribute-certificate-${this.thumbprints['SHA-1']}`;
     }
+    toString(format = 'pem') {
+        switch (format) {
+            case 'hex':
+                return hexFormat(Convert_1.ToHex(this.raw));
+            case 'pem':
+                return `-----BEGIN ${this.tag}-----\n${base64Format(this.toString('base64'))}\n-----END ${this.tag}-----`;
+            default:
+                return Convert_1.ToBase64(this.raw);
+        }
+    }
     downloadAsPEM(name) {
-        Download.attrCert.asPEM(this.exportAsPemFormatted(), name || this.commonName);
+        Download.attrCert.asPEM(this.toString('pem'), name || this.commonName);
     }
     downloadAsDER(name) {
-        Download.attrCert.asDER(this.exportAsHexFormatted(), name || this.commonName);
+        Download.attrCert.asDER(this.raw, name || this.commonName);
     }
 }
 
@@ -20979,11 +20978,12 @@ __decorate$1([
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-class CSR extends AsnData {
+class Pkcs10CertificateRequest extends AsnData {
     constructor(raw) {
         super(certificateRawToBuffer(raw), CertificationRequest);
         this.thumbprints = {};
         this.type = 'PKCS#10 Certificate Request';
+        this.tag = 'CERTIFICATE REQUEST';
         const { certificationRequestInfo } = this.asn;
         this.subject = new Name(certificationRequestInfo.subject).toJSON();
         this.version = certificationRequestInfo.version;
@@ -21046,20 +21046,21 @@ class CSR extends AsnData {
             }
         }
     }
-    exportAsBase64() {
-        return Convert_1.ToBase64(this.raw);
-    }
-    exportAsHexFormatted() {
-        return hexFormat(Convert_1.ToHex(this.raw));
-    }
-    exportAsPemFormatted() {
-        return `-----BEGIN CERTIFICATE REQUEST-----\n${base64Format(this.exportAsBase64())}\n-----END CERTIFICATE REQUEST-----`;
+    toString(format = 'pem') {
+        switch (format) {
+            case 'hex':
+                return hexFormat(Convert_1.ToHex(this.raw));
+            case 'pem':
+                return `-----BEGIN ${this.tag}-----\n${base64Format(this.toString('base64'))}\n-----END ${this.tag}-----`;
+            default:
+                return Convert_1.ToBase64(this.raw);
+        }
     }
     downloadAsPEM(name) {
-        Download.csr.asPEM(this.exportAsPemFormatted(), name || this.commonName);
+        Download.csr.asPEM(this.toString('pem'), name || this.commonName);
     }
     downloadAsDER(name) {
-        Download.csr.asDER(this.exportAsHexFormatted(), name || this.commonName);
+        Download.csr.asDER(this.raw, name || this.commonName);
     }
 }
 
@@ -21070,11 +21071,12 @@ class CSR extends AsnData {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-class CRL extends AsnData {
+class X509Crl extends AsnData {
     constructor(raw) {
         super(certificateRawToBuffer(raw), CertificateList);
         this.thumbprints = {};
         this.type = 'X.509 Certificate Revocation List';
+        this.tag = 'X509 CRL';
         const { tbsCertList } = this.asn;
         this.issuer = new Name(tbsCertList.issuer).toJSON();
         this.version = tbsCertList.version + 1;
@@ -21127,20 +21129,21 @@ class CRL extends AsnData {
                 .map((e) => new Extension(AsnConvert.serialize(e)));
         }
     }
-    exportAsBase64() {
-        return Convert_1.ToBase64(this.raw);
-    }
-    exportAsHexFormatted() {
-        return hexFormat(Convert_1.ToHex(this.raw));
-    }
-    exportAsPemFormatted() {
-        return `-----BEGIN X509 CRL-----\n${base64Format(this.exportAsBase64())}\n-----END X509 CRL-----`;
+    toString(format = 'pem') {
+        switch (format) {
+            case 'hex':
+                return hexFormat(Convert_1.ToHex(this.raw));
+            case 'pem':
+                return `-----BEGIN ${this.tag}-----\n${base64Format(this.toString('base64'))}\n-----END ${this.tag}-----`;
+            default:
+                return Convert_1.ToBase64(this.raw);
+        }
     }
     downloadAsPEM(name) {
-        Download.crl.asPEM(this.exportAsPemFormatted(), name || this.commonName);
+        Download.crl.asPEM(this.toString('pem'), name || this.commonName);
     }
     downloadAsDER(name) {
-        Download.crl.asDER(this.exportAsHexFormatted(), name || this.commonName);
+        Download.crl.asDER(this.raw, name || this.commonName);
     }
 }
 
@@ -23230,83 +23233,26 @@ class CertificateDecoder {
     }
     setValue(value) {
         this.certificateDecoded = value;
-        this.inputPaste.value = value.exportAsPemFormatted();
-        this.successParse.emit(value.exportAsBase64());
+        this.inputPaste.value = value.toString('pem');
+        this.successParse.emit(value.toString('base64'));
     }
     decode(certificate) {
-        const isPem$1 = isPem(certificate);
-        const isX509Pem$1 = isX509Pem(certificate);
-        const isPkcs10Pem$1 = isPkcs10Pem(certificate);
-        const isX509AttributePem$1 = isX509AttributePem(certificate);
-        const isX509CRLPem$1 = isX509CRLPem(certificate);
-        let decoded;
-        let decodeError;
-        if (isPem$1 && !(isX509Pem$1 || isX509AttributePem$1 || isPkcs10Pem$1 || isX509CRLPem$1)) {
+        new Promise((resolve) => {
+            resolve(new X509Certificate(certificate));
+        })
+            .catch(() => new X509AttributeCertificate(certificate))
+            .catch(() => new Pkcs10CertificateRequest(certificate))
+            .catch(() => new X509Crl(certificate))
+            .then((res) => this.setValue(res))
+            .catch((err) => {
             this.clearValue();
-            alert('Unsupported file type. Please try to use Certificate/AttributeCertificate/CertificateRequest/CRL.');
-            return;
-        }
-        try {
-            if (isX509Pem$1) {
-                decoded = new X509Certificate(certificate);
-            }
-            if (isX509AttributePem$1) {
-                decoded = new X509AttributeCertificate(certificate);
-            }
-            if (isPkcs10Pem$1) {
-                decoded = new CSR(certificate);
-            }
-            if (isX509CRLPem$1) {
-                decoded = new CRL(certificate);
-            }
-        }
-        catch (error) {
-            decodeError = error;
-        }
-        if (!decoded) {
-            try {
-                decoded = new X509Certificate(certificate);
-            }
-            catch (error) {
-                decodeError = error;
-            }
-        }
-        if (!decoded) {
-            try {
-                decoded = new X509AttributeCertificate(certificate);
-            }
-            catch (error) {
-                decodeError = error;
-            }
-        }
-        if (!decoded) {
-            try {
-                decoded = new CSR(certificate);
-            }
-            catch (error) {
-                decodeError = error;
-            }
-        }
-        if (!decoded) {
-            try {
-                decoded = new CRL(certificate);
-            }
-            catch (error) {
-                decodeError = error;
-            }
-        }
-        if (!decoded) {
-            this.clearValue();
-            console.log(decodeError);
+            console.log(err);
             alert('Error decoding file. Please try to use Certificate/AttributeCertificate/CertificateRequest/CRL.');
-        }
-        else {
-            this.setValue(decoded);
-        }
+        });
     }
     render() {
         var _a;
-        return (hAsync(Host, { key: 'b10e5ce1d2efe26bbe7e0daafb3bbaf5a9f73a62' }, hAsync("textarea", { key: '581e7c2eadf2fe33876106b2fdc90bdc9fb92096', placeholder: "Certificate DER or PEM", class: "textarea t-b2 c-black", ref: (el) => { this.inputPaste = el; }, onDrop: this.handleDropFile }), hAsync("div", { key: '71f93ecef6e3571d3ca795be1b53e1b19c4881d3', class: "controls" }, hAsync("div", { key: 'b2f2dfbe0637d3119bbb2dbf622f7614685f5cb5', class: "control_row" }, hAsync(Typography, { key: 'c639c7c696d589ef1035ca8c0f910ce5456e83cf', variant: "b3", color: "secondary-tint-2" }, "Drag or load file:"), hAsync("input", { key: 'c8acf8a1620a802fbcf9afe6b52d8bed1e90bd23', type: "file", accept: "application/pkix-cert,application/x-x509-ca-cert,application/x-x509-user-cert,application/pkcs10,application/pkix-crl,.csr,.req,.crl", onChange: this.handleChangeInputFile, value: "" })), ((_a = this.certificateExamples) === null || _a === void 0 ? void 0 : _a.length) && (hAsync("div", { class: "control_row" }, hAsync(Typography, { variant: "b3", color: "secondary-tint-2" }, "Load examples:"), hAsync("select", { onChange: this.handleChangeExample }, hAsync("option", { value: "" }, "None"), this.certificateExamples.map((example) => (hAsync("option", { value: example.value }, example.title)))))), hAsync("div", { key: '051ce823203fa7bf2a5f4e2c85b121017fdd8651', class: "control_row" }, hAsync(Button, { key: '405a0894a87ab000e3717cecd7d3fa34620c26a9', onClick: this.handleClickDecode }, "Decode"), hAsync(Button, { key: '34282cb209b5fb99a29b2b415435d31646fe0e7e', onClick: this.handleClickClear }, "Clear"))), this.certificateDecoded instanceof X509Certificate && (hAsync("peculiar-certificate-viewer", { certificate: this.certificateDecoded, class: "viewer", download: true })), this.certificateDecoded instanceof X509AttributeCertificate && (hAsync("peculiar-attribute-certificate-viewer", { certificate: this.certificateDecoded, class: "viewer", download: true })), this.certificateDecoded instanceof CSR && (hAsync("peculiar-csr-viewer", { certificate: this.certificateDecoded, class: "viewer", download: true })), this.certificateDecoded instanceof CRL && (hAsync("peculiar-crl-viewer", { certificate: this.certificateDecoded, class: "viewer", download: true }))));
+        return (hAsync(Host, { key: '7c3bfca68882e39705e9640f76754cce2e5d6c6a' }, hAsync("textarea", { key: '4d24f4b914f7f118efde2144e7597e0767d59ce8', placeholder: "Certificate DER or PEM", class: "textarea t-b2 c-black", ref: (el) => { this.inputPaste = el; }, onDrop: this.handleDropFile }), hAsync("div", { key: '06ba6e2b5658225a585ec9711e6f3f945ef3a840', class: "controls" }, hAsync("div", { key: 'df2e115ea04d4eae7985f6ee57bfe47354f50240', class: "control_row" }, hAsync(Typography, { key: '05c30b2956055455cdb1f52b40995752dd0d7da4', variant: "b3", color: "secondary-tint-2" }, "Drag or load file:"), hAsync("input", { key: 'cca59d7c59d9917e728f9795bcfbd546d4cf75b8', type: "file", accept: "application/pkix-cert,application/x-x509-ca-cert,application/x-x509-user-cert,application/pkcs10,application/pkix-crl,.csr,.req,.crl", onChange: this.handleChangeInputFile, value: "" })), ((_a = this.certificateExamples) === null || _a === void 0 ? void 0 : _a.length) && (hAsync("div", { class: "control_row" }, hAsync(Typography, { variant: "b3", color: "secondary-tint-2" }, "Load examples:"), hAsync("select", { onChange: this.handleChangeExample }, hAsync("option", { value: "" }, "None"), this.certificateExamples.map((example) => (hAsync("option", { value: example.value }, example.title)))))), hAsync("div", { key: '6d1f010e03d7836459214e5c0abe1af7fbbe2a10', class: "control_row" }, hAsync(Button, { key: '4038db36b62ff11f592f380f5c98bebb0014585e', onClick: this.handleClickDecode }, "Decode"), hAsync(Button, { key: 'fb7c30e61b10194b5f02a2cefa06191904f5ce46', onClick: this.handleClickClear }, "Clear"))), this.certificateDecoded instanceof X509Certificate && (hAsync("peculiar-certificate-viewer", { certificate: this.certificateDecoded, class: "viewer", download: true })), this.certificateDecoded instanceof X509AttributeCertificate && (hAsync("peculiar-attribute-certificate-viewer", { certificate: this.certificateDecoded, class: "viewer", download: true })), this.certificateDecoded instanceof Pkcs10CertificateRequest && (hAsync("peculiar-csr-viewer", { certificate: this.certificateDecoded, class: "viewer", download: true })), this.certificateDecoded instanceof X509Crl && (hAsync("peculiar-crl-viewer", { certificate: this.certificateDecoded, class: "viewer", download: true }))));
     }
     static get style() { return PeculiarCertificateDecoderStyle0; }
     static get cmpMeta() { return {
@@ -23808,11 +23754,11 @@ class CrlViewer {
     async decodeCertificate(certificate) {
         this.isDecodeInProcess = true;
         try {
-            if (certificate instanceof CRL) {
+            if (certificate instanceof X509Crl) {
                 this.certificateDecoded = certificate;
             }
             else if (typeof certificate === 'string') {
-                this.certificateDecoded = new CRL(certificate);
+                this.certificateDecoded = new X509Crl(certificate);
             }
             else {
                 return;
@@ -23840,8 +23786,8 @@ class CrlViewer {
             }
             return;
         }
-        if (newValue instanceof CRL
-            && oldValue instanceof CRL) {
+        if (newValue instanceof X509Crl
+            && oldValue instanceof X509Crl) {
             if (newValue.commonName !== oldValue.commonName) {
                 this.decodeCertificate(newValue);
             }
@@ -23925,11 +23871,11 @@ class CsrViewer {
     async decodeCertificate(certificate) {
         this.isDecodeInProcess = true;
         try {
-            if (certificate instanceof CSR) {
+            if (certificate instanceof Pkcs10CertificateRequest) {
                 this.certificateDecoded = certificate;
             }
             else if (typeof certificate === 'string') {
-                this.certificateDecoded = new CSR(certificate);
+                this.certificateDecoded = new Pkcs10CertificateRequest(certificate);
             }
             else {
                 return;
@@ -23954,8 +23900,8 @@ class CsrViewer {
             }
             return;
         }
-        if (newValue instanceof CSR
-            && oldValue instanceof CSR) {
+        if (newValue instanceof Pkcs10CertificateRequest
+            && oldValue instanceof Pkcs10CertificateRequest) {
             if (newValue.commonName !== oldValue.commonName) {
                 this.decodeCertificate(newValue);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peculiar/certificates-viewer",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "private": false,
   "description": "Peculiar Certificate Viewer web-components makes it easy for you to display certificate related details in your web application.",
   "keywords": [
@@ -58,14 +58,14 @@
     "@peculiar/asn1-x509-qualified": "^2.3.8",
     "@peculiar/asn1-x509-qualified-etsi": "^2.3.8",
     "@stencil/core": "^4.13.0",
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.11",
     "pvtsutils": "^1.3.5"
   },
   "devDependencies": {
     "@stencil/sass": "^3.0.11",
     "@types/jest": "27.0.3",
     "@types/jest-image-snapshot": "^6.2.3",
-    "gh-pages": "^4.0.0",
+    "gh-pages": "^5.0.0",
     "jest": "27.0.3",
     "jest-cli": "27.4.5",
     "jest-image-snapshot": "^6.2.0",
@@ -83,5 +83,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "789897725908382755196690a22dc3696fd1ac08"
+  "gitHead": "698cbf60141169b910f6fc64d275fdf5ca662983"
 }