@super-protocol/sdk-js 3.13.0-beta.3 → 3.13.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/certificates/generator.js +19 -6
- package/dist/cjs/certificates/helper.d.ts +5 -4
- package/dist/cjs/certificates/helper.js +32 -11
- package/dist/cjs/certificates/index.d.ts +1 -0
- package/dist/cjs/certificates/index.js +2 -1
- package/dist/cjs/certificates/ocsp.d.ts +2 -2
- package/dist/cjs/certificates/ocsp.js +29 -20
- package/dist/cjs/certificates/types.d.ts +11 -0
- package/dist/cjs/certificates/types.js +1 -1
- package/dist/cjs/tee/TeeCertificateService.js +2 -2
- package/dist/cjs/utils/CryptoKeysTransformer.d.ts +1 -0
- package/dist/cjs/utils/CryptoKeysTransformer.js +24 -1
- package/dist/mjs/certificates/generator.js +20 -7
- package/dist/mjs/certificates/helper.d.ts +5 -4
- package/dist/mjs/certificates/helper.js +32 -11
- package/dist/mjs/certificates/index.d.ts +1 -0
- package/dist/mjs/certificates/index.js +2 -1
- package/dist/mjs/certificates/ocsp.d.ts +2 -2
- package/dist/mjs/certificates/ocsp.js +29 -20
- package/dist/mjs/certificates/types.d.ts +11 -0
- package/dist/mjs/certificates/types.js +1 -1
- package/dist/mjs/tee/TeeCertificateService.js +2 -2
- package/dist/mjs/utils/CryptoKeysTransformer.d.ts +1 -0
- package/dist/mjs/utils/CryptoKeysTransformer.js +24 -1
- package/package.json +1 -1
- package/dist/cjs/certificates/testing-generate.d.ts +0 -1
- package/dist/cjs/certificates/testing-generate.js +0 -115
- package/dist/mjs/certificates/testing-generate.d.ts +0 -1
- package/dist/mjs/certificates/testing-generate.js +0 -110
|
@@ -29,8 +29,8 @@ class CertificateGenerator {
|
|
|
29
29
|
*/
|
|
30
30
|
static async generateCert(params) {
|
|
31
31
|
const ca = Boolean(params.ca);
|
|
32
|
-
const { publicKey, privateKey } = await CertificateGenerator.getCryptoKeys(params);
|
|
33
|
-
const signingAlgorithm =
|
|
32
|
+
const { publicKey: subjectPublicKey, privateKey: signerPrivateKey } = await CertificateGenerator.getCryptoKeys(params);
|
|
33
|
+
const signingAlgorithm = subjectPublicKey.algorithm;
|
|
34
34
|
const extensions = [new x509_1.BasicConstraintsExtension(ca, undefined, true)];
|
|
35
35
|
const extendedKeyUsageItems = [];
|
|
36
36
|
if (signingAlgorithm.namedCurve !== 'K-256' && params.dnsNames?.length) {
|
|
@@ -59,6 +59,11 @@ class CertificateGenerator {
|
|
|
59
59
|
keyUsageFlags |= x509_1.KeyUsageFlags.keyCertSign;
|
|
60
60
|
}
|
|
61
61
|
extensions.push(new x509_1.KeyUsagesExtension(keyUsageFlags, true));
|
|
62
|
+
const signerPublicKey = await CryptoKeysTransformer_js_1.CryptoKeysTransformer.cryptoPublicFromCryptoPrivate(signerPrivateKey);
|
|
63
|
+
extensions.push(...[
|
|
64
|
+
await x509_1.AuthorityKeyIdentifierExtension.create(signerPublicKey),
|
|
65
|
+
await x509_1.SubjectKeyIdentifierExtension.create(subjectPublicKey),
|
|
66
|
+
]);
|
|
62
67
|
if (params.customExtensions?.length) {
|
|
63
68
|
const filteredExtensions = params.customExtensions.filter((ext) => !notAllowedCertificateCustomExtensions.includes(ext.oid));
|
|
64
69
|
for (const customExtension of filteredExtensions) {
|
|
@@ -74,8 +79,8 @@ class CertificateGenerator {
|
|
|
74
79
|
subject: CertificateGenerator.getPrincipalInfo(params.subject),
|
|
75
80
|
notBefore: new Date(),
|
|
76
81
|
notAfter: params.notAfter,
|
|
77
|
-
publicKey,
|
|
78
|
-
signingKey:
|
|
82
|
+
publicKey: subjectPublicKey,
|
|
83
|
+
signingKey: signerPrivateKey,
|
|
79
84
|
signingAlgorithm,
|
|
80
85
|
extensions,
|
|
81
86
|
};
|
|
@@ -139,6 +144,10 @@ class CertificateGenerator {
|
|
|
139
144
|
}
|
|
140
145
|
}
|
|
141
146
|
const publicKey = await setup_crypto_js_1.cryptoProvider.subtle.importKey('spki', cert.publicKey.rawData, Object.assign(cert.signatureAlgorithm, cert.publicKey.algorithm), true, ['verify']);
|
|
147
|
+
const authorityKeyIdentifierExt = cert.extensions.find((ext) => ext instanceof x509_1.AuthorityKeyIdentifierExtension);
|
|
148
|
+
const authorityKeyIdentifier = authorityKeyIdentifierExt?.keyId;
|
|
149
|
+
const subjectKeyIdentifierExt = cert.extensions.find((ext) => ext instanceof x509_1.SubjectKeyIdentifierExtension);
|
|
150
|
+
const subjectKeyIdentifier = subjectKeyIdentifierExt?.keyId;
|
|
142
151
|
return {
|
|
143
152
|
serialNumberHex: cert.serialNumber,
|
|
144
153
|
publicKey,
|
|
@@ -147,6 +156,8 @@ class CertificateGenerator {
|
|
|
147
156
|
notBefore: cert.notBefore,
|
|
148
157
|
notAfter: cert.notAfter,
|
|
149
158
|
dnsNames: CertificateGenerator.extractDnsNamesFromExtensions(cert.extensions),
|
|
159
|
+
authorityKeyIdentifier,
|
|
160
|
+
subjectKeyIdentifier,
|
|
150
161
|
extensions: cert.extensions
|
|
151
162
|
.filter((ext) => ext.type !== node_forge_1.default.pki.oids['subjectAltName'])
|
|
152
163
|
.map((ext) => ({
|
|
@@ -196,7 +207,9 @@ class CertificateGenerator {
|
|
|
196
207
|
const uuid = (0, crypto_1.randomUUID)().replace(/-/g, '');
|
|
197
208
|
let serial = BigInt('0x' + uuid) % MAX_X509_SERIAL;
|
|
198
209
|
// Ensure the serial number is positive in ASN1
|
|
199
|
-
|
|
210
|
+
// 89abcdefABCDEF - set of all hex symbols that have 1 as first bit
|
|
211
|
+
const serialHex = serial.toString(16);
|
|
212
|
+
if (serialHex[0] && '89abcdefABCDEF'.includes(serialHex[0])) {
|
|
200
213
|
serial = serial >> 1n;
|
|
201
214
|
}
|
|
202
215
|
return serial.toString(16);
|
|
@@ -245,4 +258,4 @@ class CertificateGenerator {
|
|
|
245
258
|
}
|
|
246
259
|
}
|
|
247
260
|
exports.CertificateGenerator = CertificateGenerator;
|
|
248
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/certificates/generator.ts"],"names":[],"mappings":"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"}
|
|
261
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/certificates/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import * as pkijs from 'pkijs';
|
|
3
|
-
import { AlgorithmObj, ValidateCertChainResult } from './types.js';
|
|
3
|
+
import { AlgorithmObj, CertWithKeyIdentifiers, ValidateCertChainResult } from './types.js';
|
|
4
4
|
import './setup-crypto.js';
|
|
5
5
|
export declare class CertificatesHelper {
|
|
6
6
|
private static downloadedCertificateCache;
|
|
@@ -13,16 +13,17 @@ export declare class CertificatesHelper {
|
|
|
13
13
|
certs: string;
|
|
14
14
|
ca: string;
|
|
15
15
|
};
|
|
16
|
-
static
|
|
16
|
+
static getIssuer(certWithKeyIdent: CertWithKeyIdentifiers, potentialIssuersWithKeyIdent: CertWithKeyIdentifiers[]): CertWithKeyIdentifiers | undefined;
|
|
17
17
|
static pemChainToDer(certsPem: string): Uint8Array[];
|
|
18
18
|
static derChainToPem(certsDer: Uint8Array[]): string;
|
|
19
19
|
static downloadCertWithCache(url: string): Promise<Buffer>;
|
|
20
|
-
static buildChain(leaf: pkijs.Certificate, potentialIssuers: pkijs.Certificate[]):
|
|
21
|
-
static sortCertsFromLeafToRoot(certsPem: string | string[] | pkijs.Certificate[]):
|
|
20
|
+
static buildChain(leaf: pkijs.Certificate | CertWithKeyIdentifiers, potentialIssuers: pkijs.Certificate[] | CertWithKeyIdentifiers[]): CertWithKeyIdentifiers[];
|
|
21
|
+
static sortCertsFromLeafToRoot(certsPem: string | string[] | pkijs.Certificate[]): CertWithKeyIdentifiers[];
|
|
22
22
|
static getCertPublicKeyAlgorithm(certPem: string): AlgorithmObj;
|
|
23
23
|
static getCsrPublicKeyAlgorithm(csrPem: string): AlgorithmObj;
|
|
24
24
|
static validateCertChain(certsPem: string | string[], caPem: string | string[], options?: {
|
|
25
25
|
offline?: boolean;
|
|
26
26
|
}): Promise<ValidateCertChainResult>;
|
|
27
27
|
static toPkiCerts(certs: string | string[]): pkijs.Certificate[];
|
|
28
|
+
static addKeyIdentifiersToCerts(certs: Array<pkijs.Certificate | CertWithKeyIdentifiers>): CertWithKeyIdentifiers[];
|
|
28
29
|
}
|
|
@@ -83,8 +83,11 @@ class CertificatesHelper {
|
|
|
83
83
|
ca: toPemChain(splitCerts[1]),
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
|
-
static
|
|
87
|
-
return
|
|
86
|
+
static getIssuer(certWithKeyIdent, potentialIssuersWithKeyIdent) {
|
|
87
|
+
return potentialIssuersWithKeyIdent.find((potentialIssuer) => (certWithKeyIdent?.authorityKeyIdentifier && potentialIssuer.subjectKeyIdentifier
|
|
88
|
+
? certWithKeyIdent.authorityKeyIdentifier.isEqual(potentialIssuer.subjectKeyIdentifier)
|
|
89
|
+
: certWithKeyIdent?.cert.issuer.isEqual(potentialIssuer.cert.subject)) &&
|
|
90
|
+
!certWithKeyIdent?.cert.subject.isEqual(certWithKeyIdent?.cert.issuer));
|
|
88
91
|
}
|
|
89
92
|
static pemChainToDer(certsPem) {
|
|
90
93
|
const certs = CertificatesHelper.splitPemCerts(certsPem);
|
|
@@ -108,11 +111,11 @@ class CertificatesHelper {
|
|
|
108
111
|
return responseData;
|
|
109
112
|
}
|
|
110
113
|
static buildChain(leaf, potentialIssuers) {
|
|
111
|
-
const chain = [leaf];
|
|
112
|
-
|
|
114
|
+
const chain = CertificatesHelper.addKeyIdentifiersToCerts([leaf]);
|
|
115
|
+
const potentialIssuersWithKeyIdentifiers = CertificatesHelper.addKeyIdentifiersToCerts(potentialIssuers);
|
|
116
|
+
let currentCert = chain[0];
|
|
113
117
|
do {
|
|
114
|
-
currentCert =
|
|
115
|
-
!currentCert.subject.isEqual(currentCert.issuer));
|
|
118
|
+
currentCert = CertificatesHelper.getIssuer(currentCert, potentialIssuersWithKeyIdentifiers);
|
|
116
119
|
if (currentCert) {
|
|
117
120
|
chain.push(currentCert);
|
|
118
121
|
}
|
|
@@ -123,9 +126,12 @@ class CertificatesHelper {
|
|
|
123
126
|
const allCerts = typeof certsPem === 'string' || certsPem.every((cert) => typeof cert === 'string')
|
|
124
127
|
? CertificatesHelper.toPkiCerts(certsPem)
|
|
125
128
|
: certsPem;
|
|
126
|
-
const
|
|
129
|
+
const certsWithKeyIdentifiers = CertificatesHelper.addKeyIdentifiersToCerts(allCerts);
|
|
130
|
+
const leafs = certsWithKeyIdentifiers.filter((certToCheck) => !certsWithKeyIdentifiers.some((certsToCheckWith) => certToCheck.subjectKeyIdentifier && certsToCheckWith.authorityKeyIdentifier
|
|
131
|
+
? certToCheck.subjectKeyIdentifier.isEqual(certsToCheckWith.authorityKeyIdentifier)
|
|
132
|
+
: certToCheck.cert.subject.isEqual(certsToCheckWith.cert.issuer)));
|
|
127
133
|
const chains = leafs
|
|
128
|
-
.map((leaf) => CertificatesHelper.buildChain(leaf, allCerts))
|
|
134
|
+
.map((leaf) => CertificatesHelper.buildChain(leaf.cert, allCerts))
|
|
129
135
|
.sort((one, two) => two.length - one.length);
|
|
130
136
|
return chains.flat();
|
|
131
137
|
}
|
|
@@ -142,13 +148,14 @@ class CertificatesHelper {
|
|
|
142
148
|
static async validateCertChain(certsPem, caPem, options = {}) {
|
|
143
149
|
const { offline } = options;
|
|
144
150
|
// reverse() is needed because pkijs expects certificates to be ordered from root to leaf
|
|
145
|
-
const
|
|
151
|
+
const sortedCertsWithKeyIdent = CertificatesHelper.sortCertsFromLeafToRoot(certsPem).reverse();
|
|
152
|
+
const sortedCerts = sortedCertsWithKeyIdent.map((certWithKeyIdent) => certWithKeyIdent.cert);
|
|
146
153
|
const ca = CertificatesHelper.toPkiCerts(caPem);
|
|
147
154
|
try {
|
|
148
155
|
const crls = offline ? [] : await crl_js_1.CRLHelper.getCRLFromCerts(sortedCerts);
|
|
149
156
|
const ocspBaseResponses = offline
|
|
150
157
|
? []
|
|
151
|
-
: await ocsp_js_1.OCSPHelper.getOCSPResponseFromCerts(
|
|
158
|
+
: await ocsp_js_1.OCSPHelper.getOCSPResponseFromCerts(sortedCertsWithKeyIdent, CertificatesHelper.addKeyIdentifiersToCerts(ca), oidsForOcspCheck);
|
|
152
159
|
const chainEngine = new pkijs.CertificateChainValidationEngine({
|
|
153
160
|
certs: sortedCerts,
|
|
154
161
|
trustedCerts: ca,
|
|
@@ -190,6 +197,20 @@ class CertificatesHelper {
|
|
|
190
197
|
const certsArray = Array.isArray(certs) ? certs : CertificatesHelper.splitPemCerts(certs);
|
|
191
198
|
return certsArray.map((certPem) => pkijs.Certificate.fromBER(CertificatesHelper.pemToDer(certPem)));
|
|
192
199
|
}
|
|
200
|
+
static addKeyIdentifiersToCerts(certs) {
|
|
201
|
+
return certs.map((cert) => {
|
|
202
|
+
if ('cert' in cert) {
|
|
203
|
+
return cert;
|
|
204
|
+
}
|
|
205
|
+
const authorityKeyIdentifierExt = cert.extensions?.find((ext) => ext.extnID === node_forge_1.default.pki.oids['authorityKeyIdentifier'])?.parsedValue;
|
|
206
|
+
const subjectKeyIdentifierExt = cert.extensions?.find((ext) => ext.extnID === node_forge_1.default.pki.oids['subjectKeyIdentifier'])?.parsedValue;
|
|
207
|
+
return {
|
|
208
|
+
cert,
|
|
209
|
+
authorityKeyIdentifier: authorityKeyIdentifierExt?.keyIdentifier,
|
|
210
|
+
subjectKeyIdentifier: subjectKeyIdentifierExt,
|
|
211
|
+
};
|
|
212
|
+
});
|
|
213
|
+
}
|
|
193
214
|
}
|
|
194
215
|
exports.CertificatesHelper = CertificatesHelper;
|
|
195
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/certificates/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,4 +18,5 @@ __exportStar(require("./helper.js"), exports);
|
|
|
18
18
|
__exportStar(require("./types.js"), exports);
|
|
19
19
|
__exportStar(require("./serializer.js"), exports);
|
|
20
20
|
__exportStar(require("./generator.js"), exports);
|
|
21
|
-
|
|
21
|
+
__exportStar(require("./ocsp.js"), exports);
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2VydGlmaWNhdGVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4Q0FBNEI7QUFDNUIsNkNBQTJCO0FBQzNCLGtEQUFnQztBQUNoQyxpREFBK0I7QUFDL0IsNENBQTBCIn0=
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as pkijs from 'pkijs';
|
|
2
|
-
import { GenerateOcspResponseParams, ParsedOcspRequest } from '../index.js';
|
|
2
|
+
import { CertWithKeyIdentifiers, GenerateOcspResponseParams, ParsedOcspRequest } from '../index.js';
|
|
3
3
|
export declare class OCSPHelper {
|
|
4
|
-
static getOCSPResponseFromCerts(certs:
|
|
4
|
+
static getOCSPResponseFromCerts(certs: CertWithKeyIdentifiers[], ca: CertWithKeyIdentifiers[], oidsToCheck?: string[]): Promise<pkijs.BasicOCSPResponse[]>;
|
|
5
5
|
static generateOCSPResponse(params: GenerateOcspResponseParams): Promise<ArrayBuffer>;
|
|
6
6
|
static parseOCSPRequest(ocspRequestBinary: ArrayBuffer): ParsedOcspRequest;
|
|
7
7
|
private static canCertSignOCSPResponse;
|
|
@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.OCSPHelper = void 0;
|
|
30
30
|
const lodash_1 = __importDefault(require("lodash"));
|
|
31
|
+
const https_1 = __importDefault(require("https"));
|
|
31
32
|
const node_forge_1 = __importDefault(require("node-forge"));
|
|
32
33
|
const pkijs = __importStar(require("pkijs"));
|
|
33
34
|
const asn1js = __importStar(require("asn1js"));
|
|
@@ -39,6 +40,7 @@ const constants_js_1 = require("../constants.js");
|
|
|
39
40
|
const helper_js_1 = require("./helper.js");
|
|
40
41
|
const index_js_1 = require("../index.js");
|
|
41
42
|
const x509_1 = require("@peculiar/x509");
|
|
43
|
+
const tryWithInterval_js_1 = require("../utils/helpers/tryWithInterval.js");
|
|
42
44
|
const DEFAULT_REVOCATION_DATE = new Date('1970-01-01T00:00:00Z');
|
|
43
45
|
class OCSPHelper {
|
|
44
46
|
static async getOCSPResponseFromCerts(certs, ca, oidsToCheck = []) {
|
|
@@ -51,12 +53,12 @@ class OCSPHelper {
|
|
|
51
53
|
const groupByOcspUrl = lodash_1.default.groupBy(ocspRequestsData, 'ocspUrl');
|
|
52
54
|
const getOcspResponseParams = Object.entries(groupByOcspUrl).map(([ocspUrl, certParams]) => ({
|
|
53
55
|
ocspUrl,
|
|
54
|
-
certsWithIssuer: certParams.map(({
|
|
55
|
-
cert,
|
|
56
|
+
certsWithIssuer: certParams.map(({ certWithKeyIdent, issuerCertUrl }) => ({
|
|
57
|
+
cert: certWithKeyIdent.cert,
|
|
56
58
|
issuerCertUrl,
|
|
57
|
-
issuerCert: helper_js_1.CertificatesHelper.
|
|
59
|
+
issuerCert: helper_js_1.CertificatesHelper.getIssuer(certWithKeyIdent, [...certs, ...ca])?.cert,
|
|
58
60
|
})),
|
|
59
|
-
ca,
|
|
61
|
+
ca: ca.map((certWithKeyIdent) => certWithKeyIdent.cert),
|
|
60
62
|
oidsToCheck,
|
|
61
63
|
}));
|
|
62
64
|
const ocspResponseResults = await Promise.allSettled(getOcspResponseParams.map((params) => OCSPHelper.getOCSPResponse(params)));
|
|
@@ -124,7 +126,7 @@ class OCSPHelper {
|
|
|
124
126
|
ocspBasicResp.tbsResponseData.responseExtensions = [
|
|
125
127
|
new pkijs.Extension({
|
|
126
128
|
extnID: index_js_1.constants.OID_OCSP_NONCE,
|
|
127
|
-
extnValue:
|
|
129
|
+
extnValue: nonce,
|
|
128
130
|
}),
|
|
129
131
|
];
|
|
130
132
|
}
|
|
@@ -166,8 +168,8 @@ class OCSPHelper {
|
|
|
166
168
|
}
|
|
167
169
|
return Boolean(extKeysUsage.parsedValue.keyPurposes.find((usage) => usage === x509_1.ExtendedKeyUsage.ocspSigning));
|
|
168
170
|
}
|
|
169
|
-
static getOCSPRequestData(
|
|
170
|
-
const authorityExtension = helper_js_1.CertificatesHelper.getExtensionValue(cert, constants_js_1.OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION);
|
|
171
|
+
static getOCSPRequestData(certWithKeyIdent) {
|
|
172
|
+
const authorityExtension = helper_js_1.CertificatesHelper.getExtensionValue(certWithKeyIdent.cert, constants_js_1.OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION);
|
|
171
173
|
if (!authorityExtension) {
|
|
172
174
|
return;
|
|
173
175
|
}
|
|
@@ -177,7 +179,7 @@ class OCSPHelper {
|
|
|
177
179
|
if (!ocspUrl) {
|
|
178
180
|
return;
|
|
179
181
|
}
|
|
180
|
-
return { ocspUrl, issuerCertUrl,
|
|
182
|
+
return { ocspUrl, issuerCertUrl, certWithKeyIdent };
|
|
181
183
|
}
|
|
182
184
|
static async getOCSPResponse(params) {
|
|
183
185
|
const { ocspUrl, certsWithIssuer, ca, oidsToCheck } = params;
|
|
@@ -232,7 +234,7 @@ class OCSPHelper {
|
|
|
232
234
|
]),
|
|
233
235
|
}),
|
|
234
236
|
});
|
|
235
|
-
const ocspBasicResp = await OCSPHelper.sendOCSPRequest(ocspUrl, ocspReq);
|
|
237
|
+
const ocspBasicResp = await OCSPHelper.sendOCSPRequest(ocspUrl, ocspReq, ca);
|
|
236
238
|
const respNonce = await OCSPHelper.getNonceFromResponse(ocspBasicResp);
|
|
237
239
|
if (respNonce && Buffer.compare(reqNonce, respNonce) !== 0) {
|
|
238
240
|
throw new Error(`OCSP nonces from request and response do not match`);
|
|
@@ -251,7 +253,7 @@ class OCSPHelper {
|
|
|
251
253
|
...ocspBasicResp.certs,
|
|
252
254
|
...issuerCertificates,
|
|
253
255
|
]);
|
|
254
|
-
ocspBasicResp.certs = signerChain;
|
|
256
|
+
ocspBasicResp.certs = signerChain.map((certWithKeyIdentifiers) => certWithKeyIdentifiers.cert);
|
|
255
257
|
const isValid = await ocspBasicResp.verify({ trustedCerts: ca });
|
|
256
258
|
if (!isValid) {
|
|
257
259
|
throw new Error('OCSP response verification failed');
|
|
@@ -262,14 +264,21 @@ class OCSPHelper {
|
|
|
262
264
|
}
|
|
263
265
|
return ocspBasicResp;
|
|
264
266
|
}
|
|
265
|
-
static async sendOCSPRequest(ocspUrl, ocspReq) {
|
|
266
|
-
const ocspResponse = await (0,
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
267
|
+
static async sendOCSPRequest(ocspUrl, ocspReq, ca) {
|
|
268
|
+
const ocspResponse = await (0, tryWithInterval_js_1.tryWithInterval)({
|
|
269
|
+
handler: async () => await (0, axios_1.default)(ocspUrl, {
|
|
270
|
+
method: 'POST',
|
|
271
|
+
httpsAgent: new https_1.default.Agent({
|
|
272
|
+
ca: ca.map((cert) => helper_js_1.CertificatesHelper.derToPem(cert.toSchema().toBER())),
|
|
273
|
+
}),
|
|
274
|
+
headers: {
|
|
275
|
+
'Content-Type': 'application/ocsp-request',
|
|
276
|
+
},
|
|
277
|
+
responseType: 'arraybuffer',
|
|
278
|
+
data: asn1_schema_1.AsnSerializer.serialize(ocspReq),
|
|
279
|
+
}),
|
|
280
|
+
retryInterval: 1000,
|
|
281
|
+
retryMax: 3,
|
|
273
282
|
});
|
|
274
283
|
const ocspRespSimpl = pkijs.OCSPResponse.fromBER(ocspResponse.data);
|
|
275
284
|
if (!ocspRespSimpl.responseBytes) {
|
|
@@ -283,7 +292,7 @@ class OCSPHelper {
|
|
|
283
292
|
}
|
|
284
293
|
static getNonceFromResponse(ocspBasicResp) {
|
|
285
294
|
const nonceExtension = ocspBasicResp.tbsResponseData?.responseExtensions?.find((extension) => extension.extnID === index_js_1.constants.OID_OCSP_NONCE);
|
|
286
|
-
return nonceExtension && Buffer.from(nonceExtension.
|
|
295
|
+
return nonceExtension && Buffer.from(nonceExtension.extnValue.valueBlock.valueHex);
|
|
287
296
|
}
|
|
288
297
|
static getCertExtensionsToCheck(cert, oidsToCheck) {
|
|
289
298
|
return oidsToCheck
|
|
@@ -295,4 +304,4 @@ class OCSPHelper {
|
|
|
295
304
|
}
|
|
296
305
|
}
|
|
297
306
|
exports.OCSPHelper = OCSPHelper;
|
|
298
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ocsp.js","sourceRoot":"","sources":["../../../src/certificates/ocsp.ts"],"names":[],"mappings":"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"}
|
|
307
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ocsp.js","sourceRoot":"","sources":["../../../src/certificates/ocsp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
import type { Certificate } from 'pkijs';
|
|
2
3
|
export type ValidateCertChainResult = {
|
|
3
4
|
isValid: boolean;
|
|
4
5
|
errorMessage?: string;
|
|
@@ -66,6 +67,8 @@ export type ParsedCert = {
|
|
|
66
67
|
notAfter: Date;
|
|
67
68
|
extensions: CustomExtension[];
|
|
68
69
|
dnsNames?: string[];
|
|
70
|
+
authorityKeyIdentifier?: string;
|
|
71
|
+
subjectKeyIdentifier?: string;
|
|
69
72
|
};
|
|
70
73
|
export type BlockchainCert = {
|
|
71
74
|
nonSerializedParts: Uint8Array[];
|
|
@@ -109,3 +112,11 @@ export type GenerateOcspResponseParams = {
|
|
|
109
112
|
privateKey: string;
|
|
110
113
|
nonce?: ArrayBuffer;
|
|
111
114
|
};
|
|
115
|
+
export type KeyIdentifier = {
|
|
116
|
+
isEqual(other: KeyIdentifier): boolean;
|
|
117
|
+
};
|
|
118
|
+
export type CertWithKeyIdentifiers = {
|
|
119
|
+
cert: Certificate;
|
|
120
|
+
authorityKeyIdentifier?: KeyIdentifier;
|
|
121
|
+
subjectKeyIdentifier?: KeyIdentifier;
|
|
122
|
+
};
|
|
@@ -7,4 +7,4 @@ var OcspCertStatus;
|
|
|
7
7
|
OcspCertStatus[OcspCertStatus["Revoked"] = 1] = "Revoked";
|
|
8
8
|
OcspCertStatus[OcspCertStatus["Unknown"] = 2] = "Unknown";
|
|
9
9
|
})(OcspCertStatus || (exports.OcspCertStatus = OcspCertStatus = {}));
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2VydGlmaWNhdGVzL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQW9IQSxJQUFZLGNBSVg7QUFKRCxXQUFZLGNBQWM7SUFDeEIsK0NBQU0sQ0FBQTtJQUNOLHlEQUFXLENBQUE7SUFDWCx5REFBVyxDQUFBO0FBQ2IsQ0FBQyxFQUpXLGNBQWMsOEJBQWQsY0FBYyxRQUl6QiJ9
|
|
@@ -31,7 +31,7 @@ class TeeCertificateService {
|
|
|
31
31
|
}
|
|
32
32
|
// ROOT CA doesn't have challenge. but we trust it as it is in SUPERPROTOCOL_CA constant
|
|
33
33
|
const { certs } = index_js_1.CertificatesHelper.extractCAFromChain(certsPem);
|
|
34
|
-
const sortedCerts = index_js_1.CertificatesHelper.sortCertsFromLeafToRoot(certs);
|
|
34
|
+
const sortedCerts = index_js_1.CertificatesHelper.sortCertsFromLeafToRoot(certs).map((certWithKeyIdent) => certWithKeyIdent.cert);
|
|
35
35
|
try {
|
|
36
36
|
await Promise.all(sortedCerts.map((cert) => TeeCertificateService.validateChallenge(cert)));
|
|
37
37
|
const leafCert = sortedCerts[0];
|
|
@@ -137,4 +137,4 @@ class TeeCertificateService {
|
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
139
|
exports.TeeCertificateService = TeeCertificateService;
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlQ2VydGlmaWNhdGVTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RlZS9UZWVDZXJ0aWZpY2F0ZVNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsa0RBQW1EO0FBQ25ELDJEQVFvQztBQUNwQyx1RUFBaUU7QUFDakUsMkNBQThFO0FBQzlFLHVEQUE4RDtBQUM5RCxvREFBcUU7QUFHckUsSUFBWSw2QkFJWDtBQUpELFdBQVksNkJBQTZCO0lBQ3ZDLGdGQUErQyxDQUFBO0lBQy9DLGdGQUErQyxDQUFBO0lBQy9DLDhFQUE2QyxDQUFBO0FBQy9DLENBQUMsRUFKVyw2QkFBNkIsNkNBQTdCLDZCQUE2QixRQUl4QztBQU9ELE1BQWEscUJBQXFCO0lBQ2hDLE1BQU0sQ0FBQyxLQUFLLENBQUMsMEJBQTBCLENBQUMsUUFBZ0I7UUFDdEQsTUFBTSxNQUFNLEdBQUcsTUFBTSxxQkFBcUIsQ0FBQyxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUMxRSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3BCLE1BQU0sSUFBSSxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ3ZDLENBQUM7SUFDSCxDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxRQUFnQjtRQUNoRCxNQUFNLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxHQUFHLE1BQU0sNkJBQWtCLENBQUMsaUJBQWlCLENBQzFFLFFBQVEsRUFDUiwrQkFBZ0IsQ0FDakIsQ0FBQztRQUVGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNiLE9BQU87Z0JBQ0wsT0FBTyxFQUFFLEtBQUs7Z0JBQ2QsU0FBUyxFQUFFLDZCQUE2QixDQUFDLHFCQUFxQjtnQkFDOUQsWUFBWSxFQUFFLDJCQUEyQixZQUFZLEdBQUc7YUFDekQsQ0FBQztRQUNKLENBQUM7UUFFRCx3RkFBd0Y7UUFD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
|
|
@@ -37,5 +37,6 @@ export declare class CryptoKeysTransformer {
|
|
|
37
37
|
static spkiPemToCryptoKey(spkiPem: string): Promise<CryptoKey>;
|
|
38
38
|
static cryptoKeyToPkcs8Pem(privateKey: CryptoKey): Promise<string>;
|
|
39
39
|
static cryptoKeyToSpkiPem(publicKey: CryptoKey): Promise<string>;
|
|
40
|
+
static cryptoPublicFromCryptoPrivate(privateKey: CryptoKey): Promise<CryptoKey>;
|
|
40
41
|
}
|
|
41
42
|
export {};
|