@super-protocol/sdk-js 3.13.0-beta.0 → 3.13.0-beta.3
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 +15 -4
- package/dist/cjs/certificates/helper.d.ts +4 -2
- package/dist/cjs/certificates/helper.js +30 -16
- package/dist/cjs/certificates/ocsp.d.ts +6 -1
- package/dist/cjs/certificates/ocsp.js +203 -29
- package/dist/cjs/certificates/testing-generate.d.ts +1 -0
- package/dist/cjs/certificates/testing-generate.js +115 -0
- package/dist/cjs/certificates/types.d.ts +31 -1
- package/dist/cjs/certificates/types.js +8 -1
- package/dist/cjs/constants.d.ts +1 -0
- package/dist/cjs/constants.js +3 -2
- package/dist/cjs/utils/NonceTracker.d.ts +1 -0
- package/dist/cjs/utils/NonceTracker.js +6 -2
- package/dist/cjs/utils/TxManager.d.ts +1 -0
- package/dist/cjs/utils/TxManager.js +49 -27
- package/dist/mjs/certificates/generator.js +16 -5
- package/dist/mjs/certificates/helper.d.ts +4 -2
- package/dist/mjs/certificates/helper.js +30 -16
- package/dist/mjs/certificates/ocsp.d.ts +6 -1
- package/dist/mjs/certificates/ocsp.js +204 -30
- package/dist/mjs/certificates/testing-generate.d.ts +1 -0
- package/dist/mjs/certificates/testing-generate.js +110 -0
- package/dist/mjs/certificates/types.d.ts +31 -1
- package/dist/mjs/certificates/types.js +7 -2
- package/dist/mjs/constants.d.ts +1 -0
- package/dist/mjs/constants.js +2 -1
- package/dist/mjs/utils/NonceTracker.d.ts +1 -0
- package/dist/mjs/utils/NonceTracker.js +6 -2
- package/dist/mjs/utils/TxManager.d.ts +1 -0
- package/dist/mjs/utils/TxManager.js +50 -28
- package/package.json +4 -3
|
@@ -44,6 +44,13 @@ class CertificateGenerator {
|
|
|
44
44
|
if (params.ocspSigning) {
|
|
45
45
|
extendedKeyUsageItems.push(x509_1.ExtendedKeyUsage.ocspSigning);
|
|
46
46
|
}
|
|
47
|
+
if (params.ocspExtension) {
|
|
48
|
+
const { ocspUrl, issuerCertUrl } = params.ocspExtension;
|
|
49
|
+
extensions.push(new x509_1.AuthorityInfoAccessExtension({
|
|
50
|
+
ocsp: [ocspUrl],
|
|
51
|
+
...(issuerCertUrl ? { caIssuers: [issuerCertUrl] } : {}),
|
|
52
|
+
}));
|
|
53
|
+
}
|
|
47
54
|
if (extendedKeyUsageItems.length) {
|
|
48
55
|
extensions.push(new x509_1.ExtendedKeyUsageExtension(extendedKeyUsageItems, false));
|
|
49
56
|
}
|
|
@@ -133,7 +140,7 @@ class CertificateGenerator {
|
|
|
133
140
|
}
|
|
134
141
|
const publicKey = await setup_crypto_js_1.cryptoProvider.subtle.importKey('spki', cert.publicKey.rawData, Object.assign(cert.signatureAlgorithm, cert.publicKey.algorithm), true, ['verify']);
|
|
135
142
|
return {
|
|
136
|
-
|
|
143
|
+
serialNumberHex: cert.serialNumber,
|
|
137
144
|
publicKey,
|
|
138
145
|
subject: cert.subject,
|
|
139
146
|
issuer: cert.issuer,
|
|
@@ -187,8 +194,12 @@ class CertificateGenerator {
|
|
|
187
194
|
}
|
|
188
195
|
static generateSerialNumber() {
|
|
189
196
|
const uuid = (0, crypto_1.randomUUID)().replace(/-/g, '');
|
|
190
|
-
|
|
191
|
-
|
|
197
|
+
let serial = BigInt('0x' + uuid) % MAX_X509_SERIAL;
|
|
198
|
+
// Ensure the serial number is positive in ASN1
|
|
199
|
+
if (serial.toString(2)[0] === '1') {
|
|
200
|
+
serial = serial >> 1n;
|
|
201
|
+
}
|
|
202
|
+
return serial.toString(16);
|
|
192
203
|
}
|
|
193
204
|
static getPrincipalInfo(principal) {
|
|
194
205
|
if (typeof principal === 'string') {
|
|
@@ -234,4 +245,4 @@ class CertificateGenerator {
|
|
|
234
245
|
}
|
|
235
246
|
}
|
|
236
247
|
exports.CertificateGenerator = CertificateGenerator;
|
|
237
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/certificates/generator.ts"],"names":[],"mappings":"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"}
|
|
248
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/certificates/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,14 +13,16 @@ export declare class CertificatesHelper {
|
|
|
13
13
|
certs: string;
|
|
14
14
|
ca: string;
|
|
15
15
|
};
|
|
16
|
+
static getIssuerBySubject(cert: pkijs.Certificate, certs: pkijs.Certificate[]): pkijs.Certificate | undefined;
|
|
16
17
|
static pemChainToDer(certsPem: string): Uint8Array[];
|
|
17
18
|
static derChainToPem(certsDer: Uint8Array[]): string;
|
|
18
19
|
static downloadCertWithCache(url: string): Promise<Buffer>;
|
|
19
|
-
static
|
|
20
|
+
static buildChain(leaf: pkijs.Certificate, potentialIssuers: pkijs.Certificate[]): pkijs.Certificate[];
|
|
21
|
+
static sortCertsFromLeafToRoot(certsPem: string | string[] | pkijs.Certificate[]): pkijs.Certificate[];
|
|
20
22
|
static getCertPublicKeyAlgorithm(certPem: string): AlgorithmObj;
|
|
21
23
|
static getCsrPublicKeyAlgorithm(csrPem: string): AlgorithmObj;
|
|
22
24
|
static validateCertChain(certsPem: string | string[], caPem: string | string[], options?: {
|
|
23
25
|
offline?: boolean;
|
|
24
26
|
}): Promise<ValidateCertChainResult>;
|
|
25
|
-
|
|
27
|
+
static toPkiCerts(certs: string | string[]): pkijs.Certificate[];
|
|
26
28
|
}
|
|
@@ -36,6 +36,13 @@ const memory_js_1 = require("../utils/cache/memory.js");
|
|
|
36
36
|
const ocsp_js_1 = require("./ocsp.js");
|
|
37
37
|
const crl_js_1 = require("./crl.js");
|
|
38
38
|
require("./setup-crypto.js");
|
|
39
|
+
const pki_common_1 = require("@super-protocol/pki-common");
|
|
40
|
+
const oidsForOcspCheck = [
|
|
41
|
+
pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_ID,
|
|
42
|
+
pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID,
|
|
43
|
+
pki_common_1.OID_CUSTOM_EXTENSION_NVIDIA_INFO_GPU,
|
|
44
|
+
pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_CERTIFICATE_ID,
|
|
45
|
+
];
|
|
39
46
|
class CertificatesHelper {
|
|
40
47
|
static downloadedCertificateCache = (0, memory_js_1.createMemoryCache)();
|
|
41
48
|
static derToPem(data, type = 'CERTIFICATE') {
|
|
@@ -76,6 +83,9 @@ class CertificatesHelper {
|
|
|
76
83
|
ca: toPemChain(splitCerts[1]),
|
|
77
84
|
};
|
|
78
85
|
}
|
|
86
|
+
static getIssuerBySubject(cert, certs) {
|
|
87
|
+
return certs.find((potentialIssuer) => cert.issuer.isEqual(potentialIssuer.subject));
|
|
88
|
+
}
|
|
79
89
|
static pemChainToDer(certsPem) {
|
|
80
90
|
const certs = CertificatesHelper.splitPemCerts(certsPem);
|
|
81
91
|
return certs.map((certPem) => CertificatesHelper.pemToDer(certPem));
|
|
@@ -97,22 +107,26 @@ class CertificatesHelper {
|
|
|
97
107
|
});
|
|
98
108
|
return responseData;
|
|
99
109
|
}
|
|
110
|
+
static buildChain(leaf, potentialIssuers) {
|
|
111
|
+
const chain = [leaf];
|
|
112
|
+
let currentCert = leaf;
|
|
113
|
+
do {
|
|
114
|
+
currentCert = potentialIssuers.find((potentialIssuer) => currentCert?.issuer.isEqual(potentialIssuer.subject) &&
|
|
115
|
+
!currentCert.subject.isEqual(currentCert.issuer));
|
|
116
|
+
if (currentCert) {
|
|
117
|
+
chain.push(currentCert);
|
|
118
|
+
}
|
|
119
|
+
} while (currentCert);
|
|
120
|
+
return chain;
|
|
121
|
+
}
|
|
100
122
|
static sortCertsFromLeafToRoot(certsPem) {
|
|
101
|
-
const allCerts =
|
|
123
|
+
const allCerts = typeof certsPem === 'string' || certsPem.every((cert) => typeof cert === 'string')
|
|
124
|
+
? CertificatesHelper.toPkiCerts(certsPem)
|
|
125
|
+
: certsPem;
|
|
102
126
|
const leafs = allCerts.filter((certToCheck) => !allCerts.some((certsToCheckWith) => certToCheck.subject.isEqual(certsToCheckWith.issuer)));
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
do {
|
|
107
|
-
currentCert = allCerts.find((potentialIssuer) => currentCert?.issuer.isEqual(potentialIssuer.subject) &&
|
|
108
|
-
!currentCert.subject.isEqual(currentCert.issuer));
|
|
109
|
-
if (currentCert) {
|
|
110
|
-
chain.push(currentCert);
|
|
111
|
-
}
|
|
112
|
-
} while (currentCert);
|
|
113
|
-
return chain;
|
|
114
|
-
};
|
|
115
|
-
const chains = leafs.map(buildChain).sort((one, two) => two.length - one.length);
|
|
127
|
+
const chains = leafs
|
|
128
|
+
.map((leaf) => CertificatesHelper.buildChain(leaf, allCerts))
|
|
129
|
+
.sort((one, two) => two.length - one.length);
|
|
116
130
|
return chains.flat();
|
|
117
131
|
}
|
|
118
132
|
static getCertPublicKeyAlgorithm(certPem) {
|
|
@@ -134,7 +148,7 @@ class CertificatesHelper {
|
|
|
134
148
|
const crls = offline ? [] : await crl_js_1.CRLHelper.getCRLFromCerts(sortedCerts);
|
|
135
149
|
const ocspBaseResponses = offline
|
|
136
150
|
? []
|
|
137
|
-
: await ocsp_js_1.OCSPHelper.getOCSPResponseFromCerts(sortedCerts, ca);
|
|
151
|
+
: await ocsp_js_1.OCSPHelper.getOCSPResponseFromCerts(sortedCerts, ca, oidsForOcspCheck);
|
|
138
152
|
const chainEngine = new pkijs.CertificateChainValidationEngine({
|
|
139
153
|
certs: sortedCerts,
|
|
140
154
|
trustedCerts: ca,
|
|
@@ -178,4 +192,4 @@ class CertificatesHelper {
|
|
|
178
192
|
}
|
|
179
193
|
}
|
|
180
194
|
exports.CertificatesHelper = CertificatesHelper;
|
|
181
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
195
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/certificates/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import * as pkijs from 'pkijs';
|
|
2
|
+
import { GenerateOcspResponseParams, ParsedOcspRequest } from '../index.js';
|
|
2
3
|
export declare class OCSPHelper {
|
|
3
|
-
static getOCSPResponseFromCerts(certs: pkijs.Certificate[], ca: pkijs.Certificate[]): Promise<pkijs.BasicOCSPResponse[]>;
|
|
4
|
+
static getOCSPResponseFromCerts(certs: pkijs.Certificate[], ca: pkijs.Certificate[], oidsToCheck?: string[]): Promise<pkijs.BasicOCSPResponse[]>;
|
|
5
|
+
static generateOCSPResponse(params: GenerateOcspResponseParams): Promise<ArrayBuffer>;
|
|
6
|
+
static parseOCSPRequest(ocspRequestBinary: ArrayBuffer): ParsedOcspRequest;
|
|
7
|
+
private static canCertSignOCSPResponse;
|
|
4
8
|
private static getOCSPRequestData;
|
|
5
9
|
private static getOCSPResponse;
|
|
6
10
|
private static sendOCSPRequest;
|
|
7
11
|
private static getNonceForRequest;
|
|
8
12
|
private static getNonceFromResponse;
|
|
13
|
+
private static getCertExtensionsToCheck;
|
|
9
14
|
}
|
|
@@ -27,29 +27,145 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.OCSPHelper = void 0;
|
|
30
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
31
|
+
const node_forge_1 = __importDefault(require("node-forge"));
|
|
30
32
|
const pkijs = __importStar(require("pkijs"));
|
|
31
33
|
const asn1js = __importStar(require("asn1js"));
|
|
32
34
|
const axios_1 = __importDefault(require("axios"));
|
|
35
|
+
const asn1_ocsp_1 = require("@peculiar/asn1-ocsp");
|
|
36
|
+
const asn1_schema_1 = require("@peculiar/asn1-schema");
|
|
37
|
+
const asn1_x509_1 = require("@peculiar/asn1-x509");
|
|
33
38
|
const constants_js_1 = require("../constants.js");
|
|
34
39
|
const helper_js_1 = require("./helper.js");
|
|
35
40
|
const index_js_1 = require("../index.js");
|
|
41
|
+
const x509_1 = require("@peculiar/x509");
|
|
42
|
+
const DEFAULT_REVOCATION_DATE = new Date('1970-01-01T00:00:00Z');
|
|
36
43
|
class OCSPHelper {
|
|
37
|
-
static async getOCSPResponseFromCerts(certs, ca) {
|
|
44
|
+
static async getOCSPResponseFromCerts(certs, ca, oidsToCheck = []) {
|
|
38
45
|
const ocspRequestsData = certs
|
|
39
46
|
.map(OCSPHelper.getOCSPRequestData)
|
|
40
47
|
.filter(Boolean);
|
|
41
48
|
if (!ocspRequestsData.length) {
|
|
42
49
|
return [];
|
|
43
50
|
}
|
|
44
|
-
const
|
|
51
|
+
const groupByOcspUrl = lodash_1.default.groupBy(ocspRequestsData, 'ocspUrl');
|
|
52
|
+
const getOcspResponseParams = Object.entries(groupByOcspUrl).map(([ocspUrl, certParams]) => ({
|
|
53
|
+
ocspUrl,
|
|
54
|
+
certsWithIssuer: certParams.map(({ cert, issuerCertUrl }) => ({
|
|
55
|
+
cert,
|
|
56
|
+
issuerCertUrl,
|
|
57
|
+
issuerCert: helper_js_1.CertificatesHelper.getIssuerBySubject(cert, [...certs, ...ca]),
|
|
58
|
+
})),
|
|
59
|
+
ca,
|
|
60
|
+
oidsToCheck,
|
|
61
|
+
}));
|
|
62
|
+
const ocspResponseResults = await Promise.allSettled(getOcspResponseParams.map((params) => OCSPHelper.getOCSPResponse(params)));
|
|
45
63
|
const rejectedOCSPResponses = ocspResponseResults
|
|
46
64
|
.filter(index_js_1.helpers.isRejected)
|
|
47
65
|
.map((result) => result.reason);
|
|
48
66
|
if (rejectedOCSPResponses.length) {
|
|
49
|
-
throw new Error(`Can't get OCSP responses for some certificates (reasons=${rejectedOCSPResponses.join(';\n')})`);
|
|
67
|
+
throw new Error(`Can't get valid OCSP responses for some of certificates (reasons=${rejectedOCSPResponses.join(';\n')})`);
|
|
50
68
|
}
|
|
51
69
|
return ocspResponseResults.filter(index_js_1.helpers.isFulfilled).map((result) => result.value);
|
|
52
70
|
}
|
|
71
|
+
static async generateOCSPResponse(params) {
|
|
72
|
+
const ocspBasicResp = new pkijs.BasicOCSPResponse();
|
|
73
|
+
const { issuerPem: issuerCertPem, caCertsPem, certs, privateKey, nonce } = params;
|
|
74
|
+
const { certs: issuerCertsPem } = helper_js_1.CertificatesHelper.extractCAFromChain(`${issuerCertPem}\n${caCertsPem || ''}`);
|
|
75
|
+
const issuerCert = helper_js_1.CertificatesHelper.toPkiCerts(issuerCertPem)[0];
|
|
76
|
+
ocspBasicResp.tbsResponseData.responderID = issuerCert.subject;
|
|
77
|
+
ocspBasicResp.tbsResponseData.producedAt = new Date();
|
|
78
|
+
ocspBasicResp.certs = helper_js_1.CertificatesHelper.toPkiCerts(issuerCertsPem);
|
|
79
|
+
for (const certData of certs) {
|
|
80
|
+
const { serialNumber, status, issuerKeyHash, issuerNameHash, hashAlgorithm, revocationDate } = certData;
|
|
81
|
+
const certID = new pkijs.CertID({
|
|
82
|
+
hashAlgorithm: new pkijs.AlgorithmIdentifier({
|
|
83
|
+
algorithmId: hashAlgorithm,
|
|
84
|
+
algorithmParams: new asn1js.Null(),
|
|
85
|
+
}),
|
|
86
|
+
issuerNameHash: new asn1js.OctetString({ valueHex: issuerNameHash }),
|
|
87
|
+
issuerKeyHash: new asn1js.OctetString({ valueHex: issuerKeyHash }),
|
|
88
|
+
serialNumber: new asn1js.Integer({ valueHex: serialNumber }),
|
|
89
|
+
});
|
|
90
|
+
const response = new pkijs.SingleResponse({
|
|
91
|
+
certID,
|
|
92
|
+
});
|
|
93
|
+
switch (status) {
|
|
94
|
+
case index_js_1.OcspCertStatus.OK:
|
|
95
|
+
case index_js_1.OcspCertStatus.Unknown:
|
|
96
|
+
response.certStatus = new asn1js.Primitive({
|
|
97
|
+
idBlock: {
|
|
98
|
+
tagClass: 3,
|
|
99
|
+
tagNumber: status,
|
|
100
|
+
},
|
|
101
|
+
});
|
|
102
|
+
break;
|
|
103
|
+
case index_js_1.OcspCertStatus.Revoked:
|
|
104
|
+
response.certStatus = new asn1js.Constructed({
|
|
105
|
+
idBlock: {
|
|
106
|
+
tagClass: 3,
|
|
107
|
+
tagNumber: status,
|
|
108
|
+
isConstructed: true,
|
|
109
|
+
},
|
|
110
|
+
value: [
|
|
111
|
+
new asn1js.GeneralizedTime({
|
|
112
|
+
valueDate: revocationDate || DEFAULT_REVOCATION_DATE,
|
|
113
|
+
}),
|
|
114
|
+
],
|
|
115
|
+
});
|
|
116
|
+
break;
|
|
117
|
+
default:
|
|
118
|
+
throw new Error(`Unknown OCSP certificate status: ${status}`);
|
|
119
|
+
}
|
|
120
|
+
response.thisUpdate = new Date();
|
|
121
|
+
ocspBasicResp.tbsResponseData.responses.push(response);
|
|
122
|
+
}
|
|
123
|
+
if (nonce) {
|
|
124
|
+
ocspBasicResp.tbsResponseData.responseExtensions = [
|
|
125
|
+
new pkijs.Extension({
|
|
126
|
+
extnID: index_js_1.constants.OID_OCSP_NONCE,
|
|
127
|
+
extnValue: new asn1js.OctetString({ valueHex: nonce }).toBER(),
|
|
128
|
+
}),
|
|
129
|
+
];
|
|
130
|
+
}
|
|
131
|
+
const privateCryptoKey = await index_js_1.CryptoKeysTransformer.pkcs8PemToCryptoKey(privateKey);
|
|
132
|
+
await ocspBasicResp.sign(privateCryptoKey, 'SHA-256');
|
|
133
|
+
const ocspBasicRespRaw = ocspBasicResp.toSchema().toBER(false);
|
|
134
|
+
const ocspResp = new pkijs.OCSPResponse({
|
|
135
|
+
responseStatus: new asn1js.Enumerated({ value: 0 }), // success
|
|
136
|
+
responseBytes: new pkijs.ResponseBytes({
|
|
137
|
+
responseType: pkijs.id_PKIX_OCSP_Basic,
|
|
138
|
+
response: new asn1js.OctetString({ valueHex: ocspBasicRespRaw }),
|
|
139
|
+
}),
|
|
140
|
+
});
|
|
141
|
+
return ocspResp.toSchema().toBER();
|
|
142
|
+
}
|
|
143
|
+
static parseOCSPRequest(ocspRequestBinary) {
|
|
144
|
+
const ocspRequest = asn1_schema_1.AsnParser.parse(ocspRequestBinary, asn1_ocsp_1.OCSPRequest);
|
|
145
|
+
const certRequests = ocspRequest.tbsRequest.requestList.map((request) => {
|
|
146
|
+
const reqCert = {
|
|
147
|
+
hashAlgorithm: request.reqCert.hashAlgorithm.algorithm,
|
|
148
|
+
issuerNameHash: Buffer.from(request.reqCert.issuerNameHash.buffer),
|
|
149
|
+
issuerKeyHash: Buffer.from(request.reqCert.issuerKeyHash.buffer),
|
|
150
|
+
serialNumber: request.reqCert.serialNumber,
|
|
151
|
+
};
|
|
152
|
+
const extensionsToCheck = request.singleRequestExtensions?.map((ext) => ({
|
|
153
|
+
oid: ext.extnID,
|
|
154
|
+
value: Buffer.from(ext.extnValue.buffer),
|
|
155
|
+
})) || [];
|
|
156
|
+
return { ...reqCert, extensionsToCheck };
|
|
157
|
+
});
|
|
158
|
+
const nonceExtension = ocspRequest.tbsRequest.requestExtensions?.find((ext) => ext.extnID === index_js_1.constants.OID_OCSP_NONCE);
|
|
159
|
+
const nonce = nonceExtension && nonceExtension.extnValue.buffer;
|
|
160
|
+
return { certRequests, nonce };
|
|
161
|
+
}
|
|
162
|
+
static canCertSignOCSPResponse(cert) {
|
|
163
|
+
const extKeysUsage = cert.extensions?.find((ext) => ext.extnID === node_forge_1.default.pki.oids['extKeyUsage']);
|
|
164
|
+
if (!extKeysUsage) {
|
|
165
|
+
return false;
|
|
166
|
+
}
|
|
167
|
+
return Boolean(extKeysUsage.parsedValue.keyPurposes.find((usage) => usage === x509_1.ExtendedKeyUsage.ocspSigning));
|
|
168
|
+
}
|
|
53
169
|
static getOCSPRequestData(cert) {
|
|
54
170
|
const authorityExtension = helper_js_1.CertificatesHelper.getExtensionValue(cert, constants_js_1.OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION);
|
|
55
171
|
if (!authorityExtension) {
|
|
@@ -58,42 +174,92 @@ class OCSPHelper {
|
|
|
58
174
|
const extensionValue = pkijs.ExtensionValueFactory.fromBER(constants_js_1.OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION, authorityExtension);
|
|
59
175
|
const ocspUrl = extensionValue.accessDescriptions.find((desc) => desc.accessMethod === constants_js_1.OID_OCSP_ACCESS_METHOD)?.accessLocation.value;
|
|
60
176
|
const issuerCertUrl = extensionValue.accessDescriptions.find((desc) => desc.accessMethod === constants_js_1.OID_OCSP_ISSUER_ACCESS_METHOD)?.accessLocation.value;
|
|
61
|
-
if (!ocspUrl
|
|
62
|
-
// TODO: throw error?
|
|
177
|
+
if (!ocspUrl) {
|
|
63
178
|
return;
|
|
64
179
|
}
|
|
65
180
|
return { ocspUrl, issuerCertUrl, cert };
|
|
66
181
|
}
|
|
67
|
-
static async getOCSPResponse(
|
|
68
|
-
const { ocspUrl,
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
}
|
|
182
|
+
static async getOCSPResponse(params) {
|
|
183
|
+
const { ocspUrl, certsWithIssuer, ca, oidsToCheck } = params;
|
|
184
|
+
const requestList = [];
|
|
185
|
+
const issuerCertificates = [];
|
|
186
|
+
const addIssuerCertIfNotExists = (cert) => {
|
|
187
|
+
if (!issuerCertificates.some((c) => c.subject.isEqual(cert.subject))) {
|
|
188
|
+
issuerCertificates.push(cert);
|
|
189
|
+
}
|
|
190
|
+
};
|
|
191
|
+
for (const { cert, issuerCert: issuerCertFromParams, issuerCertUrl } of certsWithIssuer) {
|
|
192
|
+
let issuerCertificate = issuerCertFromParams;
|
|
193
|
+
if (!issuerCertificate && issuerCertUrl) {
|
|
194
|
+
const issuerCertRaw = await helper_js_1.CertificatesHelper.downloadCertWithCache(issuerCertUrl);
|
|
195
|
+
issuerCertificate = pkijs.Certificate.fromBER(issuerCertRaw);
|
|
196
|
+
}
|
|
197
|
+
if (!issuerCertificate) {
|
|
198
|
+
throw new Error(`No issuer certificate found for OCSP request for ${cert.subject}`);
|
|
199
|
+
}
|
|
200
|
+
addIssuerCertIfNotExists(issuerCertificate);
|
|
201
|
+
addIssuerCertIfNotExists(cert);
|
|
202
|
+
const certID = new pkijs.CertID();
|
|
203
|
+
await certID.createForCertificate(cert, {
|
|
204
|
+
hashAlgorithm: 'SHA-256',
|
|
205
|
+
issuerCertificate,
|
|
206
|
+
});
|
|
207
|
+
const request = new asn1_ocsp_1.Request({
|
|
208
|
+
reqCert: new asn1_ocsp_1.CertID({
|
|
209
|
+
hashAlgorithm: new asn1_x509_1.AlgorithmIdentifier({
|
|
210
|
+
algorithm: certID.hashAlgorithm.algorithmId,
|
|
211
|
+
}),
|
|
212
|
+
issuerNameHash: new asn1_schema_1.OctetString().fromASN(certID.issuerNameHash),
|
|
213
|
+
issuerKeyHash: new asn1_schema_1.OctetString().fromASN(certID.issuerKeyHash),
|
|
214
|
+
serialNumber: certID.serialNumber.valueBlock.valueHex,
|
|
215
|
+
}),
|
|
216
|
+
});
|
|
217
|
+
const extensionsToCheck = OCSPHelper.getCertExtensionsToCheck(cert, oidsToCheck);
|
|
218
|
+
if (extensionsToCheck.length) {
|
|
219
|
+
request.singleRequestExtensions = new asn1_x509_1.Extensions(extensionsToCheck.map((ext) => new asn1_x509_1.Extension({ extnID: ext.oid, extnValue: new asn1_schema_1.OctetString(ext.value) })));
|
|
220
|
+
}
|
|
221
|
+
requestList.push(request);
|
|
222
|
+
}
|
|
76
223
|
const reqNonce = OCSPHelper.getNonceForRequest();
|
|
77
|
-
ocspReq
|
|
78
|
-
new
|
|
79
|
-
|
|
80
|
-
|
|
224
|
+
const ocspReq = new asn1_ocsp_1.OCSPRequest({
|
|
225
|
+
tbsRequest: new asn1_ocsp_1.TBSRequest({
|
|
226
|
+
requestList,
|
|
227
|
+
requestExtensions: new asn1_x509_1.Extensions([
|
|
228
|
+
new asn1_x509_1.Extension({
|
|
229
|
+
extnID: index_js_1.constants.OID_OCSP_NONCE,
|
|
230
|
+
extnValue: new asn1_schema_1.OctetString(reqNonce),
|
|
231
|
+
}),
|
|
232
|
+
]),
|
|
81
233
|
}),
|
|
82
|
-
|
|
234
|
+
});
|
|
83
235
|
const ocspBasicResp = await OCSPHelper.sendOCSPRequest(ocspUrl, ocspReq);
|
|
84
236
|
const respNonce = await OCSPHelper.getNonceFromResponse(ocspBasicResp);
|
|
85
237
|
if (respNonce && Buffer.compare(reqNonce, respNonce) !== 0) {
|
|
86
238
|
throw new Error(`OCSP nonces from request and response do not match`);
|
|
87
239
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
ocspBasicResp.certs = [issuerCertificate];
|
|
91
|
-
trustedCerts.push(...ca);
|
|
240
|
+
if (!ocspBasicResp.certs?.length) {
|
|
241
|
+
ocspBasicResp.certs = issuerCertificates;
|
|
92
242
|
}
|
|
93
|
-
|
|
94
|
-
|
|
243
|
+
const signers = ocspBasicResp.certs.filter((cert) => cert.subject.isEqual(ocspBasicResp.tbsResponseData.responderID));
|
|
244
|
+
if (!signers.length) {
|
|
245
|
+
throw new Error('No OCSP signer certificate found');
|
|
246
|
+
}
|
|
247
|
+
if (signers.length > 1) {
|
|
248
|
+
throw new Error('Prohibited attempt to replace OCSP signer');
|
|
249
|
+
}
|
|
250
|
+
const signerChain = helper_js_1.CertificatesHelper.buildChain(signers[0], [
|
|
251
|
+
...ocspBasicResp.certs,
|
|
252
|
+
...issuerCertificates,
|
|
253
|
+
]);
|
|
254
|
+
ocspBasicResp.certs = signerChain;
|
|
255
|
+
const isValid = await ocspBasicResp.verify({ trustedCerts: ca });
|
|
256
|
+
if (!isValid) {
|
|
257
|
+
throw new Error('OCSP response verification failed');
|
|
258
|
+
}
|
|
259
|
+
const isSignerValid = OCSPHelper.canCertSignOCSPResponse(signers[0]);
|
|
260
|
+
if (!isSignerValid) {
|
|
261
|
+
throw new Error('OCSP signer certificate does not have the OCSP signing extended key usage');
|
|
95
262
|
}
|
|
96
|
-
await ocspBasicResp.verify({ trustedCerts });
|
|
97
263
|
return ocspBasicResp;
|
|
98
264
|
}
|
|
99
265
|
static async sendOCSPRequest(ocspUrl, ocspReq) {
|
|
@@ -103,7 +269,7 @@ class OCSPHelper {
|
|
|
103
269
|
'Content-Type': 'application/ocsp-request',
|
|
104
270
|
},
|
|
105
271
|
responseType: 'arraybuffer',
|
|
106
|
-
data:
|
|
272
|
+
data: asn1_schema_1.AsnSerializer.serialize(ocspReq),
|
|
107
273
|
});
|
|
108
274
|
const ocspRespSimpl = pkijs.OCSPResponse.fromBER(ocspResponse.data);
|
|
109
275
|
if (!ocspRespSimpl.responseBytes) {
|
|
@@ -117,8 +283,16 @@ class OCSPHelper {
|
|
|
117
283
|
}
|
|
118
284
|
static getNonceFromResponse(ocspBasicResp) {
|
|
119
285
|
const nonceExtension = ocspBasicResp.tbsResponseData?.responseExtensions?.find((extension) => extension.extnID === index_js_1.constants.OID_OCSP_NONCE);
|
|
120
|
-
return nonceExtension
|
|
286
|
+
return nonceExtension && Buffer.from(nonceExtension.parsedValue.valueBlock.valueHex);
|
|
287
|
+
}
|
|
288
|
+
static getCertExtensionsToCheck(cert, oidsToCheck) {
|
|
289
|
+
return oidsToCheck
|
|
290
|
+
.map((oid) => {
|
|
291
|
+
const value = helper_js_1.CertificatesHelper.getExtensionValue(cert, oid);
|
|
292
|
+
return { oid, value };
|
|
293
|
+
})
|
|
294
|
+
.filter((ext) => Boolean(ext.value));
|
|
121
295
|
}
|
|
122
296
|
}
|
|
123
297
|
exports.OCSPHelper = OCSPHelper;
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2NzcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jZXJ0aWZpY2F0ZXMvb2NzcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDZDQUErQjtBQUMvQiwrQ0FBaUM7QUFDakMsa0RBQTBCO0FBQzFCLGtEQUl5QjtBQUN6QiwyQ0FBaUQ7QUFDakQsMENBQWlEO0FBSWpELE1BQWEsVUFBVTtJQUNyQixNQUFNLENBQUMsS0FBSyxDQUFDLHdCQUF3QixDQUNuQyxLQUEwQixFQUMxQixFQUF1QjtRQUV2QixNQUFNLGdCQUFnQixHQUFHLEtBQUs7YUFDM0IsR0FBRyxDQUFDLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQzthQUNsQyxNQUFNLENBQUMsT0FBTyxDQUFzQixDQUFDO1FBRXhDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUM3QixPQUFPLEVBQUUsQ0FBQztRQUNaLENBQUM7UUFFRCxNQUFNLG1CQUFtQixHQUFHLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FDbEQsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUNuRixDQUFDO1FBRUYsTUFBTSxxQkFBcUIsR0FBRyxtQkFBbUI7YUFDOUMsTUFBTSxDQUFDLGtCQUFPLENBQUMsVUFBVSxDQUFDO2FBQzFCLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2xDLElBQUkscUJBQXFCLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDakMsTUFBTSxJQUFJLEtBQUssQ0FDYiwyREFBMkQscUJBQXFCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQ2hHLENBQUM7UUFDSixDQUFDO1FBRUQsT0FBTyxtQkFBbUIsQ0FB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
|
|
298
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ocsp.js","sourceRoot":"","sources":["../../../src/certificates/ocsp.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|