@super-protocol/sdk-js 3.12.1-beta.2 → 3.13.0-beta.2
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/binary-splitter.d.ts +26 -0
- package/dist/cjs/certificates/binary-splitter.js +269 -0
- package/dist/cjs/certificates/generator.d.ts +38 -0
- package/dist/cjs/certificates/generator.js +248 -0
- package/dist/cjs/certificates/helper.d.ts +8 -4
- package/dist/cjs/certificates/helper.js +45 -17
- package/dist/cjs/certificates/index.d.ts +1 -0
- package/dist/cjs/certificates/index.js +2 -1
- package/dist/cjs/certificates/ocsp.d.ts +6 -1
- package/dist/cjs/certificates/ocsp.js +179 -23
- package/dist/cjs/certificates/serializer.d.ts +5 -0
- package/dist/cjs/certificates/serializer.js +98 -2
- package/dist/cjs/certificates/setup-crypto.d.ts +3 -0
- package/dist/cjs/certificates/setup-crypto.js +51 -0
- 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 +107 -0
- package/dist/cjs/certificates/types.js +8 -1
- package/dist/cjs/connectors/BlockchainConnector.js +11 -8
- package/dist/cjs/connectors/BlockchainEventsListener.d.ts +4 -4
- package/dist/cjs/connectors/BlockchainEventsListener.js +9 -8
- package/dist/cjs/constants.d.ts +6 -1
- package/dist/cjs/constants.js +13 -5
- package/dist/cjs/index.d.ts +0 -2
- package/dist/cjs/index.js +3 -6
- package/dist/cjs/models/Offer.d.ts +1 -1
- package/dist/cjs/models/Offer.js +10 -3
- package/dist/cjs/models/Order.d.ts +1 -1
- package/dist/cjs/models/Order.js +21 -20
- package/dist/cjs/models/TeeOffer.d.ts +2 -2
- package/dist/cjs/models/TeeOffer.js +18 -3
- package/dist/cjs/proto/OrderReport.d.ts +206 -15
- package/dist/cjs/proto/OrderReport.js +169 -3
- package/dist/cjs/staticModels/ActiveOrders.d.ts +1 -1
- package/dist/cjs/staticModels/ActiveOrders.js +1 -1
- package/dist/cjs/staticModels/OfferResources.js +3 -4
- package/dist/cjs/staticModels/Offers.d.ts +3 -4
- package/dist/cjs/staticModels/Offers.js +16 -17
- package/dist/cjs/staticModels/OffersCommon.d.ts +18 -0
- package/dist/cjs/staticModels/OffersCommon.js +79 -0
- package/dist/cjs/staticModels/Orders.d.ts +6 -5
- package/dist/cjs/staticModels/Orders.js +96 -5
- package/dist/cjs/staticModels/SecretRequests.js +2 -3
- package/dist/cjs/staticModels/StaticModel.d.ts +14 -2
- package/dist/cjs/staticModels/StaticModel.js +90 -2
- package/dist/cjs/staticModels/SuperproToken.d.ts +26 -1
- package/dist/cjs/staticModels/SuperproToken.js +40 -1
- package/dist/cjs/staticModels/TeeOffers.d.ts +4 -4
- package/dist/cjs/staticModels/TeeOffers.js +17 -16
- package/dist/cjs/tee/OrderReportService.js +4 -2
- package/dist/cjs/tee/QuoteValidator.d.ts +3 -2
- package/dist/cjs/tee/QuoteValidator.js +5 -4
- package/dist/cjs/tee/TeeCertificateService.d.ts +1 -1
- package/dist/cjs/tee/TeeCertificateService.js +11 -14
- package/dist/cjs/tee/TeeSignatureVerifier.d.ts +6 -4
- package/dist/cjs/tee/TeeSignatureVerifier.js +60 -32
- package/dist/cjs/tee/types.d.ts +1 -1
- package/dist/cjs/types/Order.d.ts +28 -2
- package/dist/cjs/types/Order.js +23 -2
- package/dist/cjs/types/index.d.ts +0 -1
- package/dist/cjs/types/index.js +1 -2
- package/dist/cjs/utils/CryptoKeysTransformer.d.ts +4 -0
- package/dist/cjs/utils/CryptoKeysTransformer.js +50 -1
- package/dist/cjs/utils/NonceTracker.d.ts +1 -0
- package/dist/cjs/utils/NonceTracker.js +6 -2
- package/dist/cjs/utils/TxManager.d.ts +3 -0
- package/dist/cjs/utils/TxManager.js +88 -35
- package/dist/cjs/utils/helper.d.ts +11 -3
- package/dist/cjs/utils/helper.js +56 -12
- package/dist/cjs/utils/helpers/getRawRpc.d.ts +2 -0
- package/dist/cjs/utils/helpers/getRawRpc.js +19 -0
- package/dist/cjs/utils/helpers/index.d.ts +1 -0
- package/dist/cjs/utils/helpers/index.js +2 -1
- package/dist/cjs/utils/types.d.ts +14 -0
- package/dist/cjs/utils/types.js +3 -0
- package/dist/mjs/certificates/binary-splitter.d.ts +26 -0
- package/dist/mjs/certificates/binary-splitter.js +265 -0
- package/dist/mjs/certificates/generator.d.ts +38 -0
- package/dist/mjs/certificates/generator.js +241 -0
- package/dist/mjs/certificates/helper.d.ts +8 -4
- package/dist/mjs/certificates/helper.js +45 -17
- package/dist/mjs/certificates/index.d.ts +1 -0
- package/dist/mjs/certificates/index.js +2 -1
- package/dist/mjs/certificates/ocsp.d.ts +6 -1
- package/dist/mjs/certificates/ocsp.js +180 -24
- package/dist/mjs/certificates/serializer.d.ts +5 -0
- package/dist/mjs/certificates/serializer.js +94 -1
- package/dist/mjs/certificates/setup-crypto.d.ts +3 -0
- package/dist/mjs/certificates/setup-crypto.js +22 -0
- 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 +107 -0
- package/dist/mjs/certificates/types.js +7 -2
- package/dist/mjs/connectors/BlockchainConnector.js +11 -8
- package/dist/mjs/connectors/BlockchainEventsListener.d.ts +4 -4
- package/dist/mjs/connectors/BlockchainEventsListener.js +9 -8
- package/dist/mjs/constants.d.ts +6 -1
- package/dist/mjs/constants.js +12 -4
- package/dist/mjs/index.d.ts +0 -2
- package/dist/mjs/index.js +1 -3
- package/dist/mjs/models/Offer.d.ts +1 -1
- package/dist/mjs/models/Offer.js +10 -3
- package/dist/mjs/models/Order.d.ts +1 -1
- package/dist/mjs/models/Order.js +22 -21
- package/dist/mjs/models/TeeOffer.d.ts +2 -2
- package/dist/mjs/models/TeeOffer.js +18 -3
- package/dist/mjs/proto/OrderReport.d.ts +206 -15
- package/dist/mjs/proto/OrderReport.js +168 -2
- package/dist/mjs/staticModels/ActiveOrders.d.ts +1 -1
- package/dist/mjs/staticModels/ActiveOrders.js +1 -1
- package/dist/mjs/staticModels/OfferResources.js +4 -5
- package/dist/mjs/staticModels/Offers.d.ts +3 -4
- package/dist/mjs/staticModels/Offers.js +16 -17
- package/dist/mjs/staticModels/OffersCommon.d.ts +18 -0
- package/dist/mjs/staticModels/OffersCommon.js +73 -0
- package/dist/mjs/staticModels/Orders.d.ts +6 -5
- package/dist/mjs/staticModels/Orders.js +98 -7
- package/dist/mjs/staticModels/SecretRequests.js +3 -4
- package/dist/mjs/staticModels/StaticModel.d.ts +14 -2
- package/dist/mjs/staticModels/StaticModel.js +90 -2
- package/dist/mjs/staticModels/SuperproToken.d.ts +26 -1
- package/dist/mjs/staticModels/SuperproToken.js +40 -1
- package/dist/mjs/staticModels/TeeOffers.d.ts +4 -4
- package/dist/mjs/staticModels/TeeOffers.js +17 -16
- package/dist/mjs/tee/OrderReportService.js +4 -2
- package/dist/mjs/tee/QuoteValidator.d.ts +3 -2
- package/dist/mjs/tee/QuoteValidator.js +5 -4
- package/dist/mjs/tee/TeeCertificateService.d.ts +1 -1
- package/dist/mjs/tee/TeeCertificateService.js +12 -15
- package/dist/mjs/tee/TeeSignatureVerifier.d.ts +6 -4
- package/dist/mjs/tee/TeeSignatureVerifier.js +59 -31
- package/dist/mjs/tee/types.d.ts +1 -1
- package/dist/mjs/types/Order.d.ts +28 -2
- package/dist/mjs/types/Order.js +21 -1
- package/dist/mjs/types/index.d.ts +0 -1
- package/dist/mjs/types/index.js +1 -2
- package/dist/mjs/utils/CryptoKeysTransformer.d.ts +4 -0
- package/dist/mjs/utils/CryptoKeysTransformer.js +50 -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 +3 -0
- package/dist/mjs/utils/TxManager.js +89 -36
- package/dist/mjs/utils/helper.d.ts +11 -3
- package/dist/mjs/utils/helper.js +54 -12
- package/dist/mjs/utils/helpers/getRawRpc.d.ts +2 -0
- package/dist/mjs/utils/helpers/getRawRpc.js +15 -0
- package/dist/mjs/utils/helpers/index.d.ts +1 -0
- package/dist/mjs/utils/helpers/index.js +2 -1
- package/dist/mjs/utils/types.d.ts +14 -0
- package/dist/mjs/utils/types.js +2 -0
- package/package.json +7 -4
- package/readme.md +11 -0
- package/dist/cjs/contracts/Campaign.d.ts +0 -1036
- package/dist/cjs/contracts/Campaign.js +0 -1347
- package/dist/cjs/staticModels/Campaign.d.ts +0 -59
- package/dist/cjs/staticModels/Campaign.js +0 -248
- package/dist/cjs/types/Campaign.d.ts +0 -57
- package/dist/cjs/types/Campaign.js +0 -11
- package/dist/mjs/contracts/Campaign.d.ts +0 -1036
- package/dist/mjs/contracts/Campaign.js +0 -1344
- package/dist/mjs/staticModels/Campaign.d.ts +0 -59
- package/dist/mjs/staticModels/Campaign.js +0 -243
- package/dist/mjs/types/Campaign.d.ts +0 -57
- package/dist/mjs/types/Campaign.js +0 -8
|
@@ -31,29 +31,27 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
31
31
|
const axios_1 = __importDefault(require("axios"));
|
|
32
32
|
const node_forge_1 = __importDefault(require("node-forge"));
|
|
33
33
|
const pkijs = __importStar(require("pkijs"));
|
|
34
|
+
const x509_1 = require("@peculiar/x509");
|
|
34
35
|
const memory_js_1 = require("../utils/cache/memory.js");
|
|
35
36
|
const ocsp_js_1 = require("./ocsp.js");
|
|
36
37
|
const crl_js_1 = require("./crl.js");
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
pkijs.setEngine('Node', new pkijs.CryptoEngine({ name: 'Node', crypto: crypto_1.webcrypto }));
|
|
46
|
-
}
|
|
47
|
-
}
|
|
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
|
+
];
|
|
48
46
|
class CertificatesHelper {
|
|
49
47
|
static downloadedCertificateCache = (0, memory_js_1.createMemoryCache)();
|
|
50
|
-
static derToPem(data) {
|
|
48
|
+
static derToPem(data, type = 'CERTIFICATE') {
|
|
51
49
|
return node_forge_1.default.pem.encode({
|
|
52
50
|
contentDomain: null,
|
|
53
51
|
dekInfo: null,
|
|
54
52
|
headers: [],
|
|
55
53
|
procType: null,
|
|
56
|
-
type
|
|
54
|
+
type,
|
|
57
55
|
body: Buffer.from(data).toString('binary'),
|
|
58
56
|
});
|
|
59
57
|
}
|
|
@@ -85,12 +83,18 @@ class CertificatesHelper {
|
|
|
85
83
|
ca: toPemChain(splitCerts[1]),
|
|
86
84
|
};
|
|
87
85
|
}
|
|
86
|
+
static getIssuerBySubject(cert, certs) {
|
|
87
|
+
return certs.find((potentialIssuer) => cert.issuer.isEqual(potentialIssuer.subject));
|
|
88
|
+
}
|
|
88
89
|
static pemChainToDer(certsPem) {
|
|
89
90
|
const certs = CertificatesHelper.splitPemCerts(certsPem);
|
|
90
91
|
return certs.map((certPem) => CertificatesHelper.pemToDer(certPem));
|
|
91
92
|
}
|
|
92
93
|
static derChainToPem(certsDer) {
|
|
93
|
-
return certsDer
|
|
94
|
+
return certsDer
|
|
95
|
+
.map((cert) => CertificatesHelper.derToPem(cert))
|
|
96
|
+
.join('')
|
|
97
|
+
.trim();
|
|
94
98
|
}
|
|
95
99
|
static async downloadCertWithCache(url) {
|
|
96
100
|
const responseData = await CertificatesHelper.downloadedCertificateCache.wrap(url, async () => {
|
|
@@ -104,7 +108,9 @@ class CertificatesHelper {
|
|
|
104
108
|
return responseData;
|
|
105
109
|
}
|
|
106
110
|
static sortCertsFromLeafToRoot(certsPem) {
|
|
107
|
-
const allCerts =
|
|
111
|
+
const allCerts = typeof certsPem === 'string' || certsPem.every((cert) => typeof cert === 'string')
|
|
112
|
+
? CertificatesHelper.toPkiCerts(certsPem)
|
|
113
|
+
: certsPem;
|
|
108
114
|
const leafs = allCerts.filter((certToCheck) => !allCerts.some((certsToCheckWith) => certToCheck.subject.isEqual(certsToCheckWith.issuer)));
|
|
109
115
|
const buildChain = (leaf) => {
|
|
110
116
|
const chain = [leaf];
|
|
@@ -121,6 +127,16 @@ class CertificatesHelper {
|
|
|
121
127
|
const chains = leafs.map(buildChain).sort((one, two) => two.length - one.length);
|
|
122
128
|
return chains.flat();
|
|
123
129
|
}
|
|
130
|
+
static getCertPublicKeyAlgorithm(certPem) {
|
|
131
|
+
const cert = new x509_1.X509Certificate(certPem);
|
|
132
|
+
const publicKey = cert.publicKey;
|
|
133
|
+
return publicKey.algorithm;
|
|
134
|
+
}
|
|
135
|
+
static getCsrPublicKeyAlgorithm(csrPem) {
|
|
136
|
+
const csr = new x509_1.Pkcs10CertificateRequest(csrPem);
|
|
137
|
+
const publicKey = csr.publicKey;
|
|
138
|
+
return publicKey.algorithm;
|
|
139
|
+
}
|
|
124
140
|
static async validateCertChain(certsPem, caPem, options = {}) {
|
|
125
141
|
const { offline } = options;
|
|
126
142
|
// reverse() is needed because pkijs expects certificates to be ordered from root to leaf
|
|
@@ -130,7 +146,19 @@ class CertificatesHelper {
|
|
|
130
146
|
const crls = offline ? [] : await crl_js_1.CRLHelper.getCRLFromCerts(sortedCerts);
|
|
131
147
|
const ocspBaseResponses = offline
|
|
132
148
|
? []
|
|
133
|
-
: await ocsp_js_1.OCSPHelper.getOCSPResponseFromCerts(sortedCerts, ca);
|
|
149
|
+
: await ocsp_js_1.OCSPHelper.getOCSPResponseFromCerts(sortedCerts, ca, oidsForOcspCheck);
|
|
150
|
+
if (ocspBaseResponses.length) {
|
|
151
|
+
ocspBaseResponses.forEach((ocspResponse) => {
|
|
152
|
+
if (!ocspResponse.certs) {
|
|
153
|
+
throw new Error('OCSP response does not contain certs');
|
|
154
|
+
}
|
|
155
|
+
const ocspSigner = CertificatesHelper.sortCertsFromLeafToRoot(ocspResponse.certs)[0];
|
|
156
|
+
const isSignerValid = ocsp_js_1.OCSPHelper.canCertSignOCSPResponse(ocspSigner);
|
|
157
|
+
if (!isSignerValid) {
|
|
158
|
+
throw new Error('OCSP signer certificate does not have the OCSP signing extended key usage');
|
|
159
|
+
}
|
|
160
|
+
});
|
|
161
|
+
}
|
|
134
162
|
const chainEngine = new pkijs.CertificateChainValidationEngine({
|
|
135
163
|
certs: sortedCerts,
|
|
136
164
|
trustedCerts: ca,
|
|
@@ -174,4 +202,4 @@ class CertificatesHelper {
|
|
|
174
202
|
}
|
|
175
203
|
}
|
|
176
204
|
exports.CertificatesHelper = CertificatesHelper;
|
|
177
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
205
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/certificates/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__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
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2VydGlmaWNhdGVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4Q0FBNEI7QUFDNUIsNkNBQTJCO0FBQzNCLGtEQUFnQztBQUNoQyxpREFBK0IifQ==
|
|
@@ -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
|
+
static canCertSignOCSPResponse(cert: pkijs.Certificate): boolean;
|
|
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,21 +27,39 @@ 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);
|
|
@@ -50,6 +68,104 @@ class OCSPHelper {
|
|
|
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 { 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,28 +174,60 @@ 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
|
+
for (const { cert, issuerCert: issuerCertFromParams, issuerCertUrl } of certsWithIssuer) {
|
|
187
|
+
let issuerCertificate = issuerCertFromParams;
|
|
188
|
+
if (!issuerCertificate && issuerCertUrl) {
|
|
189
|
+
const issuerCertRaw = await helper_js_1.CertificatesHelper.downloadCertWithCache(issuerCertUrl);
|
|
190
|
+
issuerCertificate = pkijs.Certificate.fromBER(issuerCertRaw);
|
|
191
|
+
}
|
|
192
|
+
if (!issuerCertificate) {
|
|
193
|
+
throw new Error(`No issuer certificate found for OCSP request for ${cert.subject}`);
|
|
194
|
+
}
|
|
195
|
+
if (!issuerCertificates.some((cert) => cert.subject.isEqual(issuerCertificate.subject))) {
|
|
196
|
+
issuerCertificates.push(issuerCertificate);
|
|
197
|
+
}
|
|
198
|
+
const certID = new pkijs.CertID();
|
|
199
|
+
await certID.createForCertificate(cert, {
|
|
200
|
+
hashAlgorithm: 'SHA-256',
|
|
201
|
+
issuerCertificate,
|
|
202
|
+
});
|
|
203
|
+
const request = new asn1_ocsp_1.Request({
|
|
204
|
+
reqCert: new asn1_ocsp_1.CertID({
|
|
205
|
+
hashAlgorithm: new asn1_x509_1.AlgorithmIdentifier({
|
|
206
|
+
algorithm: certID.hashAlgorithm.algorithmId,
|
|
207
|
+
}),
|
|
208
|
+
issuerNameHash: new asn1_schema_1.OctetString().fromASN(certID.issuerNameHash),
|
|
209
|
+
issuerKeyHash: new asn1_schema_1.OctetString().fromASN(certID.issuerKeyHash),
|
|
210
|
+
serialNumber: certID.serialNumber.valueBlock.valueHex,
|
|
211
|
+
}),
|
|
212
|
+
});
|
|
213
|
+
const extensionsToCheck = OCSPHelper.getCertExtensionsToCheck(cert, oidsToCheck);
|
|
214
|
+
if (extensionsToCheck.length) {
|
|
215
|
+
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) })));
|
|
216
|
+
}
|
|
217
|
+
requestList.push(request);
|
|
218
|
+
}
|
|
76
219
|
const reqNonce = OCSPHelper.getNonceForRequest();
|
|
77
|
-
ocspReq
|
|
78
|
-
new
|
|
79
|
-
|
|
80
|
-
|
|
220
|
+
const ocspReq = new asn1_ocsp_1.OCSPRequest({
|
|
221
|
+
tbsRequest: new asn1_ocsp_1.TBSRequest({
|
|
222
|
+
requestList,
|
|
223
|
+
requestExtensions: new asn1_x509_1.Extensions([
|
|
224
|
+
new asn1_x509_1.Extension({
|
|
225
|
+
extnID: index_js_1.constants.OID_OCSP_NONCE,
|
|
226
|
+
extnValue: new asn1_schema_1.OctetString(reqNonce),
|
|
227
|
+
}),
|
|
228
|
+
]),
|
|
81
229
|
}),
|
|
82
|
-
|
|
230
|
+
});
|
|
83
231
|
const ocspBasicResp = await OCSPHelper.sendOCSPRequest(ocspUrl, ocspReq);
|
|
84
232
|
const respNonce = await OCSPHelper.getNonceFromResponse(ocspBasicResp);
|
|
85
233
|
if (respNonce && Buffer.compare(reqNonce, respNonce) !== 0) {
|
|
@@ -87,11 +235,11 @@ class OCSPHelper {
|
|
|
87
235
|
}
|
|
88
236
|
const trustedCerts = [];
|
|
89
237
|
if (!ocspBasicResp.certs) {
|
|
90
|
-
ocspBasicResp.certs =
|
|
238
|
+
ocspBasicResp.certs = issuerCertificates;
|
|
91
239
|
trustedCerts.push(...ca);
|
|
92
240
|
}
|
|
93
241
|
else {
|
|
94
|
-
trustedCerts.push(
|
|
242
|
+
trustedCerts.push(...issuerCertificates);
|
|
95
243
|
}
|
|
96
244
|
await ocspBasicResp.verify({ trustedCerts });
|
|
97
245
|
return ocspBasicResp;
|
|
@@ -103,7 +251,7 @@ class OCSPHelper {
|
|
|
103
251
|
'Content-Type': 'application/ocsp-request',
|
|
104
252
|
},
|
|
105
253
|
responseType: 'arraybuffer',
|
|
106
|
-
data:
|
|
254
|
+
data: asn1_schema_1.AsnSerializer.serialize(ocspReq),
|
|
107
255
|
});
|
|
108
256
|
const ocspRespSimpl = pkijs.OCSPResponse.fromBER(ocspResponse.data);
|
|
109
257
|
if (!ocspRespSimpl.responseBytes) {
|
|
@@ -117,8 +265,16 @@ class OCSPHelper {
|
|
|
117
265
|
}
|
|
118
266
|
static getNonceFromResponse(ocspBasicResp) {
|
|
119
267
|
const nonceExtension = ocspBasicResp.tbsResponseData?.responseExtensions?.find((extension) => extension.extnID === index_js_1.constants.OID_OCSP_NONCE);
|
|
120
|
-
return nonceExtension
|
|
268
|
+
return nonceExtension && Buffer.from(nonceExtension.parsedValue.valueBlock.valueHex);
|
|
269
|
+
}
|
|
270
|
+
static getCertExtensionsToCheck(cert, oidsToCheck) {
|
|
271
|
+
return oidsToCheck
|
|
272
|
+
.map((oid) => {
|
|
273
|
+
const value = helper_js_1.CertificatesHelper.getExtensionValue(cert, oid);
|
|
274
|
+
return { oid, value };
|
|
275
|
+
})
|
|
276
|
+
.filter((ext) => Boolean(ext.value));
|
|
121
277
|
}
|
|
122
278
|
}
|
|
123
279
|
exports.OCSPHelper = OCSPHelper;
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2NzcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jZXJ0aWZpY2F0ZXMvb2NzcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDZDQUErQjtBQUMvQiwrQ0FBaUM7QUFDakMsa0RBQTBCO0FBQzFCLGtEQUl5QjtBQUN6QiwyQ0FBaUQ7QUFDakQsMENBQWlEO0FBSWpELE1BQWEsVUFBVTtJQUNyQixNQUFNLENBQUMsS0FBSyxDQUFDLHdCQUF3QixDQUNuQyxLQUEwQixFQUMxQixFQUF1QjtRQUV2QixNQUFNLGdCQUFnQixHQUFHLEtBQUs7YUFDM0IsR0FBRyxDQUFDLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQzthQUNsQyxNQUFNLENBQUMsT0FBTyxDQUFzQixDQUFDO1FBRXhDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUM3QixPQUFPLEVBQUUsQ0FBQztRQUNaLENBQUM7UUFFRCxNQUFNLG1CQUFtQixHQUFHLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FDbEQsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUNuRixDQUFDO1FBRUYsTUFBTSxxQkFBcUIsR0FBRyxtQkFBbUI7YUFDOUMsTUFBTSxDQUFDLGtCQUFPLENBQUMsVUFBVSxDQUFDO2FBQzFCLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2xDLElBQUkscUJBQXFCLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDakMsTUFBTSxJQUFJLEtBQUssQ0FDYiwyREFBMkQscUJBQXFCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQ2hHLENBQUM7UUFDSixDQUFDO1FBRUQsT0FBTyxtQkFBbUIsQ0FB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
|
|
280
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ocsp.js","sourceRoot":"","sources":["../../../src/certificates/ocsp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
|
+
import { BlockchainCert } from './types.js';
|
|
2
|
+
export declare const BLOCKCHAIN_CERT_TBS_PARTS: string[];
|
|
1
3
|
export declare class CertificateSerializer {
|
|
2
4
|
static serializeCertChain(certChainPem: string): string;
|
|
3
5
|
static deserializeCertChain(input: string): string;
|
|
4
6
|
static isSerializedCertChain(certChainBase64: string): boolean;
|
|
7
|
+
static serializeForBlockchain(certPem: string): BlockchainCert;
|
|
8
|
+
static deserializeFromBlockchain(data: BlockchainCert): string;
|
|
9
|
+
private static getPart;
|
|
5
10
|
}
|
|
@@ -1,9 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CertificateSerializer = void 0;
|
|
6
|
+
exports.CertificateSerializer = exports.BLOCKCHAIN_CERT_TBS_PARTS = void 0;
|
|
7
|
+
const node_forge_1 = __importDefault(require("node-forge"));
|
|
8
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
+
const binary_splitter_js_1 = require("./binary-splitter.js");
|
|
4
10
|
const helper_js_1 = require("./helper.js");
|
|
11
|
+
const constants_js_1 = require("../constants.js");
|
|
12
|
+
const pki_common_1 = require("@super-protocol/pki-common");
|
|
5
13
|
const CERTS_CHAIN_DELIMITER = ';';
|
|
6
14
|
const CERTS_SERIALIZATION_PREFIX = 'certs:';
|
|
15
|
+
exports.BLOCKCHAIN_CERT_TBS_PARTS = [
|
|
16
|
+
'serialNumber',
|
|
17
|
+
'expirationDate',
|
|
18
|
+
'publicKey',
|
|
19
|
+
'ca',
|
|
20
|
+
'userData',
|
|
21
|
+
'mrEnclave',
|
|
22
|
+
'mrSigner',
|
|
23
|
+
];
|
|
7
24
|
class CertificateSerializer {
|
|
8
25
|
static serializeCertChain(certChainPem) {
|
|
9
26
|
const certsDer = helper_js_1.CertificatesHelper.pemChainToDer(certChainPem);
|
|
@@ -22,6 +39,85 @@ class CertificateSerializer {
|
|
|
22
39
|
static isSerializedCertChain(certChainBase64) {
|
|
23
40
|
return certChainBase64.startsWith(CERTS_SERIALIZATION_PREFIX);
|
|
24
41
|
}
|
|
42
|
+
static serializeForBlockchain(certPem) {
|
|
43
|
+
const certAlgorithm = helper_js_1.CertificatesHelper.getCertPublicKeyAlgorithm(certPem);
|
|
44
|
+
if (certAlgorithm.name !== 'ECDSA' || certAlgorithm.namedCurve !== 'K-256') {
|
|
45
|
+
throw new Error(`Unsupported certificate algorithm: ${certAlgorithm.name}${certAlgorithm.namedCurve ? `with curve ${certAlgorithm.namedCurve}` : ''}. Only ECDSA with secp256k1 curve is supported.`);
|
|
46
|
+
}
|
|
47
|
+
const certDer = helper_js_1.CertificatesHelper.pemToDer(certPem);
|
|
48
|
+
const parts = new binary_splitter_js_1.CertificateBinarySplitter(certDer).split([
|
|
49
|
+
binary_splitter_js_1.CertificateNonOidParts.SERIAL_NUMBER,
|
|
50
|
+
binary_splitter_js_1.CertificateNonOidParts.SIGNATURE,
|
|
51
|
+
binary_splitter_js_1.CertificateNonOidParts.NOT_AFTER,
|
|
52
|
+
binary_splitter_js_1.CertificateNonOidParts.SUBJECT_PUBLIC_KEY_INFO,
|
|
53
|
+
], [
|
|
54
|
+
node_forge_1.default.pki.oids['basicConstraints'],
|
|
55
|
+
constants_js_1.OID_CUSTOM_EXTENSION_USER_DATA,
|
|
56
|
+
pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_ID,
|
|
57
|
+
pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID,
|
|
58
|
+
]);
|
|
59
|
+
const [nonSerializedParts, serializedParts] = lodash_1.default.partition(parts, (part) => part instanceof Uint8Array);
|
|
60
|
+
const expirationDate = CertificateSerializer.getPart(serializedParts, 'notAfter');
|
|
61
|
+
const serial = CertificateSerializer.getPart(serializedParts, 'serialNumber');
|
|
62
|
+
const publicKey = CertificateSerializer.getPart(serializedParts, 'publicKey');
|
|
63
|
+
const ca = CertificateSerializer.getPart(serializedParts, node_forge_1.default.pki.oids['basicConstraints']);
|
|
64
|
+
const userData = CertificateSerializer.getPart(serializedParts, constants_js_1.OID_CUSTOM_EXTENSION_USER_DATA, false);
|
|
65
|
+
const mrEnclave = CertificateSerializer.getPart(serializedParts, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_ID, false);
|
|
66
|
+
const mrSigner = CertificateSerializer.getPart(serializedParts, pki_common_1.OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID, false);
|
|
67
|
+
const signature = CertificateSerializer.getPart(serializedParts, 'signature');
|
|
68
|
+
if (serializedParts.length !== 0) {
|
|
69
|
+
throw new Error(`Unexpected serialized parts found in certificate: ${serializedParts.map((part) => part.name || part.oid).join(', ')}`);
|
|
70
|
+
}
|
|
71
|
+
return {
|
|
72
|
+
nonSerializedParts,
|
|
73
|
+
expirationDate: expirationDate.value,
|
|
74
|
+
ca: ca.value,
|
|
75
|
+
userData: userData?.value,
|
|
76
|
+
serialNumber: serial.value,
|
|
77
|
+
signature: signature.value,
|
|
78
|
+
publicKey: publicKey.value,
|
|
79
|
+
mrEnclave: mrEnclave?.value,
|
|
80
|
+
mrSigner: mrSigner?.value,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
static deserializeFromBlockchain(data) {
|
|
84
|
+
const bufferParts = [];
|
|
85
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[0]));
|
|
86
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[1]));
|
|
87
|
+
let partIndex = 2;
|
|
88
|
+
for (const field of exports.BLOCKCHAIN_CERT_TBS_PARTS) {
|
|
89
|
+
const value = data[field];
|
|
90
|
+
if (value) {
|
|
91
|
+
bufferParts.push(Buffer.from(value));
|
|
92
|
+
if (partIndex < data.nonSerializedParts.length) {
|
|
93
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[partIndex++]));
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
// adding signature part
|
|
98
|
+
// if no custom extensions, it is needed to add additional block with keyUsage extension
|
|
99
|
+
// if custom extension present - keyUsage extension will be a part of block before this custom extension
|
|
100
|
+
// 3 - because asn1 bytes between r and s values are 2 or 3 bytes long (2 for positive value, 3 for negative value)
|
|
101
|
+
if (data.nonSerializedParts[partIndex]?.byteLength > 3) {
|
|
102
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[partIndex++]));
|
|
103
|
+
}
|
|
104
|
+
const rValue = data.signature.slice(0, 32);
|
|
105
|
+
bufferParts.push(Buffer.from(rValue));
|
|
106
|
+
if (partIndex < data.nonSerializedParts.length) {
|
|
107
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[partIndex++]));
|
|
108
|
+
}
|
|
109
|
+
const sValue = data.signature.slice(32, 64);
|
|
110
|
+
bufferParts.push(Buffer.from(sValue));
|
|
111
|
+
const certDer = Buffer.concat(bufferParts);
|
|
112
|
+
return helper_js_1.CertificatesHelper.derToPem(certDer);
|
|
113
|
+
}
|
|
114
|
+
static getPart(parts, nameOrOid, mandatory = true) {
|
|
115
|
+
const part = lodash_1.default.remove(parts, (part) => part.name === nameOrOid || part.oid === nameOrOid)[0];
|
|
116
|
+
if (!part && mandatory) {
|
|
117
|
+
throw new Error(`Part with name or OID "${nameOrOid}" not found in certificate`);
|
|
118
|
+
}
|
|
119
|
+
return part;
|
|
120
|
+
}
|
|
25
121
|
}
|
|
26
122
|
exports.CertificateSerializer = CertificateSerializer;
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VyaWFsaXplci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jZXJ0aWZpY2F0ZXMvc2VyaWFsaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw0REFBK0I7QUFDL0Isb0RBQXVCO0FBQ3ZCLDZEQUF5RjtBQUN6RiwyQ0FBaUQ7QUFDakQsa0RBQWlFO0FBQ2pFLDJEQUdvQztBQUdwQyxNQUFNLHFCQUFxQixHQUFHLEdBQUcsQ0FBQztBQUNsQyxNQUFNLDBCQUEwQixHQUFHLFFBQVEsQ0FBQztBQUUvQixRQUFBLHlCQUF5QixHQUFHO0lBQ3ZDLGNBQWM7SUFDZCxnQkFBZ0I7SUFDaEIsV0FBVztJQUNYLElBQUk7SUFDSixVQUFVO0lBQ1YsV0FBVztJQUNYLFVBQVU7Q0FDWCxDQUFDO0FBRUYsTUFBYSxxQkFBcUI7SUFDaEMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLFlBQW9CO1FBQzVDLE1BQU0sUUFBUSxHQUFHLDhCQUFrQixDQUFDLGFBQWEsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUVoRSxPQUFPLEdBQUcsMEJBQTBCLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsRUFBRSxDQUFDO0lBQ3BJLENBQUM7SUFFRCxNQUFNLENBQUMsb0JBQW9CLENBQUMsS0FBYTtRQUN2QyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQywwQkFBMEIsQ0FBQyxFQUFFLENBQUM7WUFDbEQsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsMEJBQTBCLFlBQVksQ0FBQyxDQUFDO1FBQzdFLENBQUM7UUFFRCxNQUFNLFFBQVEsR0FBRyxLQUFLO2FBQ25CLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZ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
|