@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
|
@@ -1,18 +1,36 @@
|
|
|
1
|
+
import _ from 'lodash';
|
|
2
|
+
import forge from 'node-forge';
|
|
1
3
|
import * as pkijs from 'pkijs';
|
|
2
4
|
import * as asn1js from 'asn1js';
|
|
3
5
|
import axios from 'axios';
|
|
6
|
+
import { CertID, OCSPRequest, Request, TBSRequest } from '@peculiar/asn1-ocsp';
|
|
7
|
+
import { OctetString, AsnSerializer, AsnParser } from '@peculiar/asn1-schema';
|
|
8
|
+
import { AlgorithmIdentifier, Extensions, Extension } from '@peculiar/asn1-x509';
|
|
4
9
|
import { OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION, OID_OCSP_ACCESS_METHOD, OID_OCSP_ISSUER_ACCESS_METHOD, } from '../constants.js';
|
|
5
10
|
import { CertificatesHelper } from './helper.js';
|
|
6
|
-
import { constants, helpers } from '../index.js';
|
|
11
|
+
import { CryptoKeysTransformer, OcspCertStatus, constants, helpers, } from '../index.js';
|
|
12
|
+
import { ExtendedKeyUsage } from '@peculiar/x509';
|
|
13
|
+
const DEFAULT_REVOCATION_DATE = new Date('1970-01-01T00:00:00Z');
|
|
7
14
|
export class OCSPHelper {
|
|
8
|
-
static async getOCSPResponseFromCerts(certs, ca) {
|
|
15
|
+
static async getOCSPResponseFromCerts(certs, ca, oidsToCheck = []) {
|
|
9
16
|
const ocspRequestsData = certs
|
|
10
17
|
.map(OCSPHelper.getOCSPRequestData)
|
|
11
18
|
.filter(Boolean);
|
|
12
19
|
if (!ocspRequestsData.length) {
|
|
13
20
|
return [];
|
|
14
21
|
}
|
|
15
|
-
const
|
|
22
|
+
const groupByOcspUrl = _.groupBy(ocspRequestsData, 'ocspUrl');
|
|
23
|
+
const getOcspResponseParams = Object.entries(groupByOcspUrl).map(([ocspUrl, certParams]) => ({
|
|
24
|
+
ocspUrl,
|
|
25
|
+
certsWithIssuer: certParams.map(({ cert, issuerCertUrl }) => ({
|
|
26
|
+
cert,
|
|
27
|
+
issuerCertUrl,
|
|
28
|
+
issuerCert: CertificatesHelper.getIssuerBySubject(cert, [...certs, ...ca]),
|
|
29
|
+
})),
|
|
30
|
+
ca,
|
|
31
|
+
oidsToCheck,
|
|
32
|
+
}));
|
|
33
|
+
const ocspResponseResults = await Promise.allSettled(getOcspResponseParams.map((params) => OCSPHelper.getOCSPResponse(params)));
|
|
16
34
|
const rejectedOCSPResponses = ocspResponseResults
|
|
17
35
|
.filter(helpers.isRejected)
|
|
18
36
|
.map((result) => result.reason);
|
|
@@ -21,6 +39,104 @@ export class OCSPHelper {
|
|
|
21
39
|
}
|
|
22
40
|
return ocspResponseResults.filter(helpers.isFulfilled).map((result) => result.value);
|
|
23
41
|
}
|
|
42
|
+
static async generateOCSPResponse(params) {
|
|
43
|
+
const ocspBasicResp = new pkijs.BasicOCSPResponse();
|
|
44
|
+
const { issuerCertPem, caCertsPem, certs, privateKey, nonce } = params;
|
|
45
|
+
const { certs: issuerCertsPem } = CertificatesHelper.extractCAFromChain(`${issuerCertPem}\n${caCertsPem}`);
|
|
46
|
+
const issuerCert = CertificatesHelper.toPkiCerts(issuerCertPem)[0];
|
|
47
|
+
ocspBasicResp.tbsResponseData.responderID = issuerCert.subject;
|
|
48
|
+
ocspBasicResp.tbsResponseData.producedAt = new Date();
|
|
49
|
+
ocspBasicResp.certs = CertificatesHelper.toPkiCerts(issuerCertsPem);
|
|
50
|
+
for (const certData of certs) {
|
|
51
|
+
const { serialNumber, status, issuerKeyHash, issuerNameHash, hashAlgorithm, revocationDate } = certData;
|
|
52
|
+
const certID = new pkijs.CertID({
|
|
53
|
+
hashAlgorithm: new pkijs.AlgorithmIdentifier({
|
|
54
|
+
algorithmId: hashAlgorithm,
|
|
55
|
+
algorithmParams: new asn1js.Null(),
|
|
56
|
+
}),
|
|
57
|
+
issuerNameHash: new asn1js.OctetString({ valueHex: issuerNameHash }),
|
|
58
|
+
issuerKeyHash: new asn1js.OctetString({ valueHex: issuerKeyHash }),
|
|
59
|
+
serialNumber: new asn1js.Integer({ valueHex: serialNumber }),
|
|
60
|
+
});
|
|
61
|
+
const response = new pkijs.SingleResponse({
|
|
62
|
+
certID,
|
|
63
|
+
});
|
|
64
|
+
switch (status) {
|
|
65
|
+
case OcspCertStatus.OK:
|
|
66
|
+
case OcspCertStatus.Unknown:
|
|
67
|
+
response.certStatus = new asn1js.Primitive({
|
|
68
|
+
idBlock: {
|
|
69
|
+
tagClass: 3,
|
|
70
|
+
tagNumber: status,
|
|
71
|
+
},
|
|
72
|
+
});
|
|
73
|
+
break;
|
|
74
|
+
case OcspCertStatus.Revoked:
|
|
75
|
+
response.certStatus = new asn1js.Constructed({
|
|
76
|
+
idBlock: {
|
|
77
|
+
tagClass: 3,
|
|
78
|
+
tagNumber: status,
|
|
79
|
+
isConstructed: true,
|
|
80
|
+
},
|
|
81
|
+
value: [
|
|
82
|
+
new asn1js.GeneralizedTime({
|
|
83
|
+
valueDate: revocationDate || DEFAULT_REVOCATION_DATE,
|
|
84
|
+
}),
|
|
85
|
+
],
|
|
86
|
+
});
|
|
87
|
+
break;
|
|
88
|
+
default:
|
|
89
|
+
throw new Error(`Unknown OCSP certificate status: ${status}`);
|
|
90
|
+
}
|
|
91
|
+
response.thisUpdate = new Date();
|
|
92
|
+
ocspBasicResp.tbsResponseData.responses.push(response);
|
|
93
|
+
}
|
|
94
|
+
if (nonce) {
|
|
95
|
+
ocspBasicResp.tbsResponseData.responseExtensions = [
|
|
96
|
+
new pkijs.Extension({
|
|
97
|
+
extnID: constants.OID_OCSP_NONCE,
|
|
98
|
+
extnValue: new asn1js.OctetString({ valueHex: nonce }).toBER(),
|
|
99
|
+
}),
|
|
100
|
+
];
|
|
101
|
+
}
|
|
102
|
+
const privateCryptoKey = await CryptoKeysTransformer.pkcs8PemToCryptoKey(privateKey);
|
|
103
|
+
await ocspBasicResp.sign(privateCryptoKey, 'SHA-256');
|
|
104
|
+
const ocspBasicRespRaw = ocspBasicResp.toSchema().toBER(false);
|
|
105
|
+
const ocspResp = new pkijs.OCSPResponse({
|
|
106
|
+
responseStatus: new asn1js.Enumerated({ value: 0 }), // success
|
|
107
|
+
responseBytes: new pkijs.ResponseBytes({
|
|
108
|
+
responseType: pkijs.id_PKIX_OCSP_Basic,
|
|
109
|
+
response: new asn1js.OctetString({ valueHex: ocspBasicRespRaw }),
|
|
110
|
+
}),
|
|
111
|
+
});
|
|
112
|
+
return ocspResp.toSchema().toBER();
|
|
113
|
+
}
|
|
114
|
+
static parseOCSPRequest(ocspRequestBinary) {
|
|
115
|
+
const ocspRequest = AsnParser.parse(ocspRequestBinary, OCSPRequest);
|
|
116
|
+
const certRequests = ocspRequest.tbsRequest.requestList.map((request) => {
|
|
117
|
+
const reqCert = {
|
|
118
|
+
hashAlgorithm: request.reqCert.hashAlgorithm.algorithm,
|
|
119
|
+
issuerNameHash: Buffer.from(request.reqCert.issuerNameHash.buffer),
|
|
120
|
+
issuerKeyHash: Buffer.from(request.reqCert.issuerKeyHash.buffer),
|
|
121
|
+
serialNumber: request.reqCert.serialNumber,
|
|
122
|
+
};
|
|
123
|
+
const extensionsToCheck = request.singleRequestExtensions?.map((ext) => ({
|
|
124
|
+
oid: ext.extnID,
|
|
125
|
+
value: Buffer.from(ext.extnValue.buffer),
|
|
126
|
+
})) || [];
|
|
127
|
+
return { ...reqCert, extensionsToCheck };
|
|
128
|
+
});
|
|
129
|
+
const nonceExtension = ocspRequest.tbsRequest.requestExtensions?.find((ext) => ext.extnID === constants.OID_OCSP_NONCE);
|
|
130
|
+
const nonce = nonceExtension && nonceExtension.extnValue.buffer;
|
|
131
|
+
return { certRequests, nonce };
|
|
132
|
+
}
|
|
133
|
+
static canCertSignOCSPResponse(cert) {
|
|
134
|
+
const extKeysUsage = cert.extensions?.find((ext) => ext.extnID === forge.pki.oids['extKeyUsage']);
|
|
135
|
+
if (!extKeysUsage) {
|
|
136
|
+
return false;
|
|
137
|
+
}
|
|
138
|
+
return Boolean(extKeysUsage.parsedValue.keyPurposes.find((usage) => usage === ExtendedKeyUsage.ocspSigning));
|
|
139
|
+
}
|
|
24
140
|
static getOCSPRequestData(cert) {
|
|
25
141
|
const authorityExtension = CertificatesHelper.getExtensionValue(cert, OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION);
|
|
26
142
|
if (!authorityExtension) {
|
|
@@ -29,28 +145,60 @@ export class OCSPHelper {
|
|
|
29
145
|
const extensionValue = pkijs.ExtensionValueFactory.fromBER(OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION, authorityExtension);
|
|
30
146
|
const ocspUrl = extensionValue.accessDescriptions.find((desc) => desc.accessMethod === OID_OCSP_ACCESS_METHOD)?.accessLocation.value;
|
|
31
147
|
const issuerCertUrl = extensionValue.accessDescriptions.find((desc) => desc.accessMethod === OID_OCSP_ISSUER_ACCESS_METHOD)?.accessLocation.value;
|
|
32
|
-
if (!ocspUrl
|
|
33
|
-
// TODO: throw error?
|
|
148
|
+
if (!ocspUrl) {
|
|
34
149
|
return;
|
|
35
150
|
}
|
|
36
151
|
return { ocspUrl, issuerCertUrl, cert };
|
|
37
152
|
}
|
|
38
|
-
static async getOCSPResponse(
|
|
39
|
-
const { ocspUrl,
|
|
40
|
-
const
|
|
41
|
-
const
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
153
|
+
static async getOCSPResponse(params) {
|
|
154
|
+
const { ocspUrl, certsWithIssuer, ca, oidsToCheck } = params;
|
|
155
|
+
const requestList = [];
|
|
156
|
+
const issuerCertificates = [];
|
|
157
|
+
for (const { cert, issuerCert: issuerCertFromParams, issuerCertUrl } of certsWithIssuer) {
|
|
158
|
+
let issuerCertificate = issuerCertFromParams;
|
|
159
|
+
if (!issuerCertificate && issuerCertUrl) {
|
|
160
|
+
const issuerCertRaw = await CertificatesHelper.downloadCertWithCache(issuerCertUrl);
|
|
161
|
+
issuerCertificate = pkijs.Certificate.fromBER(issuerCertRaw);
|
|
162
|
+
}
|
|
163
|
+
if (!issuerCertificate) {
|
|
164
|
+
throw new Error(`No issuer certificate found for OCSP request for ${cert.subject}`);
|
|
165
|
+
}
|
|
166
|
+
if (!issuerCertificates.some((cert) => cert.subject.isEqual(issuerCertificate.subject))) {
|
|
167
|
+
issuerCertificates.push(issuerCertificate);
|
|
168
|
+
}
|
|
169
|
+
const certID = new pkijs.CertID();
|
|
170
|
+
await certID.createForCertificate(cert, {
|
|
171
|
+
hashAlgorithm: 'SHA-256',
|
|
172
|
+
issuerCertificate,
|
|
173
|
+
});
|
|
174
|
+
const request = new Request({
|
|
175
|
+
reqCert: new CertID({
|
|
176
|
+
hashAlgorithm: new AlgorithmIdentifier({
|
|
177
|
+
algorithm: certID.hashAlgorithm.algorithmId,
|
|
178
|
+
}),
|
|
179
|
+
issuerNameHash: new OctetString().fromASN(certID.issuerNameHash),
|
|
180
|
+
issuerKeyHash: new OctetString().fromASN(certID.issuerKeyHash),
|
|
181
|
+
serialNumber: certID.serialNumber.valueBlock.valueHex,
|
|
182
|
+
}),
|
|
183
|
+
});
|
|
184
|
+
const extensionsToCheck = OCSPHelper.getCertExtensionsToCheck(cert, oidsToCheck);
|
|
185
|
+
if (extensionsToCheck.length) {
|
|
186
|
+
request.singleRequestExtensions = new Extensions(extensionsToCheck.map((ext) => new Extension({ extnID: ext.oid, extnValue: new OctetString(ext.value) })));
|
|
187
|
+
}
|
|
188
|
+
requestList.push(request);
|
|
189
|
+
}
|
|
47
190
|
const reqNonce = OCSPHelper.getNonceForRequest();
|
|
48
|
-
ocspReq
|
|
49
|
-
new
|
|
50
|
-
|
|
51
|
-
|
|
191
|
+
const ocspReq = new OCSPRequest({
|
|
192
|
+
tbsRequest: new TBSRequest({
|
|
193
|
+
requestList,
|
|
194
|
+
requestExtensions: new Extensions([
|
|
195
|
+
new Extension({
|
|
196
|
+
extnID: constants.OID_OCSP_NONCE,
|
|
197
|
+
extnValue: new OctetString(reqNonce),
|
|
198
|
+
}),
|
|
199
|
+
]),
|
|
52
200
|
}),
|
|
53
|
-
|
|
201
|
+
});
|
|
54
202
|
const ocspBasicResp = await OCSPHelper.sendOCSPRequest(ocspUrl, ocspReq);
|
|
55
203
|
const respNonce = await OCSPHelper.getNonceFromResponse(ocspBasicResp);
|
|
56
204
|
if (respNonce && Buffer.compare(reqNonce, respNonce) !== 0) {
|
|
@@ -58,11 +206,11 @@ export class OCSPHelper {
|
|
|
58
206
|
}
|
|
59
207
|
const trustedCerts = [];
|
|
60
208
|
if (!ocspBasicResp.certs) {
|
|
61
|
-
ocspBasicResp.certs =
|
|
209
|
+
ocspBasicResp.certs = issuerCertificates;
|
|
62
210
|
trustedCerts.push(...ca);
|
|
63
211
|
}
|
|
64
212
|
else {
|
|
65
|
-
trustedCerts.push(
|
|
213
|
+
trustedCerts.push(...issuerCertificates);
|
|
66
214
|
}
|
|
67
215
|
await ocspBasicResp.verify({ trustedCerts });
|
|
68
216
|
return ocspBasicResp;
|
|
@@ -74,7 +222,7 @@ export class OCSPHelper {
|
|
|
74
222
|
'Content-Type': 'application/ocsp-request',
|
|
75
223
|
},
|
|
76
224
|
responseType: 'arraybuffer',
|
|
77
|
-
data:
|
|
225
|
+
data: AsnSerializer.serialize(ocspReq),
|
|
78
226
|
});
|
|
79
227
|
const ocspRespSimpl = pkijs.OCSPResponse.fromBER(ocspResponse.data);
|
|
80
228
|
if (!ocspRespSimpl.responseBytes) {
|
|
@@ -88,7 +236,15 @@ export class OCSPHelper {
|
|
|
88
236
|
}
|
|
89
237
|
static getNonceFromResponse(ocspBasicResp) {
|
|
90
238
|
const nonceExtension = ocspBasicResp.tbsResponseData?.responseExtensions?.find((extension) => extension.extnID === constants.OID_OCSP_NONCE);
|
|
91
|
-
return nonceExtension
|
|
239
|
+
return nonceExtension && Buffer.from(nonceExtension.parsedValue.valueBlock.valueHex);
|
|
240
|
+
}
|
|
241
|
+
static getCertExtensionsToCheck(cert, oidsToCheck) {
|
|
242
|
+
return oidsToCheck
|
|
243
|
+
.map((oid) => {
|
|
244
|
+
const value = CertificatesHelper.getExtensionValue(cert, oid);
|
|
245
|
+
return { oid, value };
|
|
246
|
+
})
|
|
247
|
+
.filter((ext) => Boolean(ext.value));
|
|
92
248
|
}
|
|
93
249
|
}
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2NzcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jZXJ0aWZpY2F0ZXMvb2NzcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMvQixPQUFPLEtBQUssTUFBTSxNQUFNLFFBQVEsQ0FBQztBQUNqQyxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxFQUNMLDBDQUEwQyxFQUMxQyxzQkFBc0IsRUFDdEIsNkJBQTZCLEdBQzlCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2pELE9BQU8sRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBSWpELE1BQU0sT0FBTyxVQUFVO0lBQ3JCLE1BQU0sQ0FBQyxLQUFLLENBQUMsd0JBQXdCLENBQ25DLEtBQTBCLEVBQzFCLEVBQXVCO1FBRXZCLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSzthQUMzQixHQUFHLENBQUMsVUFBVSxDQUFDLGtCQUFrQixDQUFDO2FBQ2xDLE1BQU0sQ0FBQyxPQUFPLENBQXNCLENBQUM7UUFFeEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQzdCLE9BQU8sRUFBRSxDQUFDO1FBQ1osQ0FBQztRQUVELE1BQU0sbUJBQW1CLEdBQUcsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUNsRCxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQ25GLENBQUM7UUFFRixNQUFNLHFCQUFxQixHQUFHLG1CQUFtQjthQUM5QyxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQzthQUMxQixHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FB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
|
|
250
|
+
//# 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,6 +1,20 @@
|
|
|
1
|
+
import forge from 'node-forge';
|
|
2
|
+
import _ from 'lodash';
|
|
3
|
+
import { CertificateBinarySplitter, CertificateNonOidParts } from './binary-splitter.js';
|
|
1
4
|
import { CertificatesHelper } from './helper.js';
|
|
5
|
+
import { OID_CUSTOM_EXTENSION_USER_DATA } from '../constants.js';
|
|
6
|
+
import { OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID, OID_CUSTOM_EXTENSION_CHALLENGE_ID, } from '@super-protocol/pki-common';
|
|
2
7
|
const CERTS_CHAIN_DELIMITER = ';';
|
|
3
8
|
const CERTS_SERIALIZATION_PREFIX = 'certs:';
|
|
9
|
+
export const BLOCKCHAIN_CERT_TBS_PARTS = [
|
|
10
|
+
'serialNumber',
|
|
11
|
+
'expirationDate',
|
|
12
|
+
'publicKey',
|
|
13
|
+
'ca',
|
|
14
|
+
'userData',
|
|
15
|
+
'mrEnclave',
|
|
16
|
+
'mrSigner',
|
|
17
|
+
];
|
|
4
18
|
export class CertificateSerializer {
|
|
5
19
|
static serializeCertChain(certChainPem) {
|
|
6
20
|
const certsDer = CertificatesHelper.pemChainToDer(certChainPem);
|
|
@@ -19,5 +33,84 @@ export class CertificateSerializer {
|
|
|
19
33
|
static isSerializedCertChain(certChainBase64) {
|
|
20
34
|
return certChainBase64.startsWith(CERTS_SERIALIZATION_PREFIX);
|
|
21
35
|
}
|
|
36
|
+
static serializeForBlockchain(certPem) {
|
|
37
|
+
const certAlgorithm = CertificatesHelper.getCertPublicKeyAlgorithm(certPem);
|
|
38
|
+
if (certAlgorithm.name !== 'ECDSA' || certAlgorithm.namedCurve !== 'K-256') {
|
|
39
|
+
throw new Error(`Unsupported certificate algorithm: ${certAlgorithm.name}${certAlgorithm.namedCurve ? `with curve ${certAlgorithm.namedCurve}` : ''}. Only ECDSA with secp256k1 curve is supported.`);
|
|
40
|
+
}
|
|
41
|
+
const certDer = CertificatesHelper.pemToDer(certPem);
|
|
42
|
+
const parts = new CertificateBinarySplitter(certDer).split([
|
|
43
|
+
CertificateNonOidParts.SERIAL_NUMBER,
|
|
44
|
+
CertificateNonOidParts.SIGNATURE,
|
|
45
|
+
CertificateNonOidParts.NOT_AFTER,
|
|
46
|
+
CertificateNonOidParts.SUBJECT_PUBLIC_KEY_INFO,
|
|
47
|
+
], [
|
|
48
|
+
forge.pki.oids['basicConstraints'],
|
|
49
|
+
OID_CUSTOM_EXTENSION_USER_DATA,
|
|
50
|
+
OID_CUSTOM_EXTENSION_CHALLENGE_ID,
|
|
51
|
+
OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID,
|
|
52
|
+
]);
|
|
53
|
+
const [nonSerializedParts, serializedParts] = _.partition(parts, (part) => part instanceof Uint8Array);
|
|
54
|
+
const expirationDate = CertificateSerializer.getPart(serializedParts, 'notAfter');
|
|
55
|
+
const serial = CertificateSerializer.getPart(serializedParts, 'serialNumber');
|
|
56
|
+
const publicKey = CertificateSerializer.getPart(serializedParts, 'publicKey');
|
|
57
|
+
const ca = CertificateSerializer.getPart(serializedParts, forge.pki.oids['basicConstraints']);
|
|
58
|
+
const userData = CertificateSerializer.getPart(serializedParts, OID_CUSTOM_EXTENSION_USER_DATA, false);
|
|
59
|
+
const mrEnclave = CertificateSerializer.getPart(serializedParts, OID_CUSTOM_EXTENSION_CHALLENGE_ID, false);
|
|
60
|
+
const mrSigner = CertificateSerializer.getPart(serializedParts, OID_CUSTOM_EXTENSION_CHALLENGE_COMMON_ID, false);
|
|
61
|
+
const signature = CertificateSerializer.getPart(serializedParts, 'signature');
|
|
62
|
+
if (serializedParts.length !== 0) {
|
|
63
|
+
throw new Error(`Unexpected serialized parts found in certificate: ${serializedParts.map((part) => part.name || part.oid).join(', ')}`);
|
|
64
|
+
}
|
|
65
|
+
return {
|
|
66
|
+
nonSerializedParts,
|
|
67
|
+
expirationDate: expirationDate.value,
|
|
68
|
+
ca: ca.value,
|
|
69
|
+
userData: userData?.value,
|
|
70
|
+
serialNumber: serial.value,
|
|
71
|
+
signature: signature.value,
|
|
72
|
+
publicKey: publicKey.value,
|
|
73
|
+
mrEnclave: mrEnclave?.value,
|
|
74
|
+
mrSigner: mrSigner?.value,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
static deserializeFromBlockchain(data) {
|
|
78
|
+
const bufferParts = [];
|
|
79
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[0]));
|
|
80
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[1]));
|
|
81
|
+
let partIndex = 2;
|
|
82
|
+
for (const field of BLOCKCHAIN_CERT_TBS_PARTS) {
|
|
83
|
+
const value = data[field];
|
|
84
|
+
if (value) {
|
|
85
|
+
bufferParts.push(Buffer.from(value));
|
|
86
|
+
if (partIndex < data.nonSerializedParts.length) {
|
|
87
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[partIndex++]));
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
// adding signature part
|
|
92
|
+
// if no custom extensions, it is needed to add additional block with keyUsage extension
|
|
93
|
+
// if custom extension present - keyUsage extension will be a part of block before this custom extension
|
|
94
|
+
// 3 - because asn1 bytes between r and s values are 2 or 3 bytes long (2 for positive value, 3 for negative value)
|
|
95
|
+
if (data.nonSerializedParts[partIndex]?.byteLength > 3) {
|
|
96
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[partIndex++]));
|
|
97
|
+
}
|
|
98
|
+
const rValue = data.signature.slice(0, 32);
|
|
99
|
+
bufferParts.push(Buffer.from(rValue));
|
|
100
|
+
if (partIndex < data.nonSerializedParts.length) {
|
|
101
|
+
bufferParts.push(Buffer.from(data.nonSerializedParts[partIndex++]));
|
|
102
|
+
}
|
|
103
|
+
const sValue = data.signature.slice(32, 64);
|
|
104
|
+
bufferParts.push(Buffer.from(sValue));
|
|
105
|
+
const certDer = Buffer.concat(bufferParts);
|
|
106
|
+
return CertificatesHelper.derToPem(certDer);
|
|
107
|
+
}
|
|
108
|
+
static getPart(parts, nameOrOid, mandatory = true) {
|
|
109
|
+
const part = _.remove(parts, (part) => part.name === nameOrOid || part.oid === nameOrOid)[0];
|
|
110
|
+
if (!part && mandatory) {
|
|
111
|
+
throw new Error(`Part with name or OID "${nameOrOid}" not found in certificate`);
|
|
112
|
+
}
|
|
113
|
+
return part;
|
|
114
|
+
}
|
|
22
115
|
}
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VyaWFsaXplci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jZXJ0aWZpY2F0ZXMvc2VyaWFsaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxZQUFZLENBQUM7QUFDL0IsT0FBTyxDQUFDLE1BQU0sUUFBUSxDQUFDO0FBQ3ZCLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3pGLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNqRCxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNqRSxPQUFPLEVBQ0wsd0NBQXdDLEVBQ3hDLGlDQUFpQyxHQUNsQyxNQUFNLDRCQUE0QixDQUFDO0FBR3BDLE1BQU0scUJBQXFCLEdBQUcsR0FBRyxDQUFDO0FBQ2xDLE1BQU0sMEJBQTBCLEdBQUcsUUFBUSxDQUFDO0FBRTVDLE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUFHO0lBQ3ZDLGNBQWM7SUFDZCxnQkFBZ0I7SUFDaEIsV0FBVztJQUNYLElBQUk7SUFDSixVQUFVO0lBQ1YsV0FBVztJQUNYLFVBQVU7Q0FDWCxDQUFDO0FBRUYsTUFBTSxPQUFPLHFCQUFxQjtJQUNoQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsWUFBb0I7UUFDNUMsTUFBTSxRQUFRLEdBQUcsa0JBQWtCLENBQUMsYUFBYSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBRWhFLE9BQU8sR0FBRywwQkFBMEIsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxFQUFFLENBQUM7SUFDcEksQ0FBQztJQUVELE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxL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
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import * as x509 from '@peculiar/x509';
|
|
2
|
+
import webcrypto from '@peculiar/webcrypto';
|
|
3
|
+
import * as pkijs from 'pkijs';
|
|
4
|
+
const cryptoProvider = new webcrypto.Crypto();
|
|
5
|
+
x509.cryptoProvider.set(cryptoProvider);
|
|
6
|
+
pkijs.setEngine('Node', new pkijs.CryptoEngine({ name: 'Node', crypto: cryptoProvider }));
|
|
7
|
+
pkijs.ECNamedCurves.register('K-256', '1.3.132.0.10', 32);
|
|
8
|
+
const originGetAlgorithmByOIDFn = pkijs.CryptoEngine.prototype.getAlgorithmByOID;
|
|
9
|
+
function getAlgorithmByOID(oid, safety, target) {
|
|
10
|
+
if (oid === '1.3.132.0.10') {
|
|
11
|
+
return {
|
|
12
|
+
name: 'K-256',
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
return originGetAlgorithmByOIDFn(oid, safety, target);
|
|
16
|
+
}
|
|
17
|
+
pkijs.CryptoEngine.prototype.getAlgorithmByOID = getAlgorithmByOID;
|
|
18
|
+
x509.PemConverter.isPem = (data) => {
|
|
19
|
+
return typeof data === 'string' && data.startsWith('-----BEGIN');
|
|
20
|
+
};
|
|
21
|
+
export { cryptoProvider };
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAtY3J5cHRvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NlcnRpZmljYXRlcy9zZXR1cC1jcnlwdG8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLElBQUksTUFBTSxnQkFBZ0IsQ0FBQztBQUN2QyxPQUFPLFNBQVMsTUFBTSxxQkFBcUIsQ0FBQztBQUM1QyxPQUFPLEtBQUssS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUUvQixNQUFNLGNBQWMsR0FBRyxJQUFJLFNBQVMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztBQUU5QyxJQUFJLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztBQUV4QyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxJQUFJLEtBQUssQ0FBQyxZQUFZLENBQUMsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFFMUYsS0FBSyxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUUxRCxNQUFNLHlCQUF5QixHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLGlCQUFpQixDQUFDO0FBQ2pGLFNBQVMsaUJBQWlCLENBQUMsR0FBVyxFQUFFLE1BQWdCLEVBQUUsTUFBZTtJQUN2RSxJQUFJLEdBQUcsS0FBSyxjQUFjLEVBQUUsQ0FBQztRQUMzQixPQUFPO1lBQ0wsSUFBSSxFQUFFLE9BQU87U0FDZCxDQUFDO0lBQ0osQ0FBQztJQUVELE9BQU8seUJBQXlCLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUN4RCxDQUFDO0FBQ0QsS0FBSyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUM7QUFFbkUsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLEdBQUcsQ0FBQyxJQUFZLEVBQWtCLEVBQUU7SUFDekQsT0FBTyxPQUFPLElBQUksS0FBSyxRQUFRLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUNuRSxDQUFDLENBQUM7QUFFRixPQUFPLEVBQUUsY0FBYyxFQUFFLENBQUMifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { OID_CUSTOM_EXTENSION_CHALLENGE_ID } from '@super-protocol/pki-common';
|
|
2
|
+
import { CertificateGenerator } from './generator.js';
|
|
3
|
+
import { CertificatesHelper } from './helper.js';
|
|
4
|
+
import fs from 'fs';
|
|
5
|
+
import { CryptoKeysTransformer } from '../utils/CryptoKeysTransformer.js';
|
|
6
|
+
import { OID_CUSTOM_EXTENSION_USER_DATA } from '../constants.js';
|
|
7
|
+
// const signatureAlgorithm: SignatureAlgorithm = 'ECDSA-P-256-SHA256';
|
|
8
|
+
const signatureAlgorithm = 'ECDSA-secp256k1-SHA256';
|
|
9
|
+
void (async () => {
|
|
10
|
+
const orderCertPem = await fs.promises.readFile('order_cert.crt', 'utf8');
|
|
11
|
+
const mrEnclave = CertificatesHelper.getExtensionValue(orderCertPem, OID_CUSTOM_EXTENSION_CHALLENGE_ID);
|
|
12
|
+
const userDataHashFromCert = CertificatesHelper.getExtensionValue(orderCertPem, OID_CUSTOM_EXTENSION_USER_DATA);
|
|
13
|
+
const rootSubject = {
|
|
14
|
+
country: 'US',
|
|
15
|
+
stateName: 'California',
|
|
16
|
+
localityName: 'San Francisco',
|
|
17
|
+
organization: 'Super Protocol',
|
|
18
|
+
organizationalUnit: 'Development',
|
|
19
|
+
commonName: 'Root CA',
|
|
20
|
+
};
|
|
21
|
+
const subroot1 = {
|
|
22
|
+
country: 'US',
|
|
23
|
+
stateName: 'California',
|
|
24
|
+
localityName: 'San Francisco',
|
|
25
|
+
organization: 'Super Protocol',
|
|
26
|
+
organizationalUnit: 'Development',
|
|
27
|
+
commonName: 'Subroot1 CA',
|
|
28
|
+
};
|
|
29
|
+
const subroot2 = {
|
|
30
|
+
country: 'US',
|
|
31
|
+
stateName: 'California',
|
|
32
|
+
localityName: 'San Francisco',
|
|
33
|
+
organization: 'Super Protocol',
|
|
34
|
+
organizationalUnit: 'Development',
|
|
35
|
+
commonName: 'Subroot Level 2 CA',
|
|
36
|
+
};
|
|
37
|
+
const rootCertKeys = await CertificateGenerator.generateKeys(signatureAlgorithm);
|
|
38
|
+
const rootPrivatePem = await CryptoKeysTransformer.cryptoKeyToPkcs8Pem(rootCertKeys.privateKey);
|
|
39
|
+
const rootPublicPem = await CryptoKeysTransformer.cryptoKeyToSpkiPem(rootCertKeys.publicKey);
|
|
40
|
+
const rootCertParams = {
|
|
41
|
+
subject: rootSubject,
|
|
42
|
+
issuer: rootSubject,
|
|
43
|
+
notAfter: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000), // 1 year
|
|
44
|
+
ca: true,
|
|
45
|
+
dnsNames: ['sp.superprotocol.io', 'superprotocol.io', '127.0.0.1'],
|
|
46
|
+
publicKey: rootPublicPem,
|
|
47
|
+
privateKey: rootPrivatePem,
|
|
48
|
+
};
|
|
49
|
+
const rootCert = await CertificateGenerator.generateCert(rootCertParams);
|
|
50
|
+
const alg = CertificatesHelper.getCertPublicKeyAlgorithm(rootCert);
|
|
51
|
+
alg;
|
|
52
|
+
const subroot1Keys = await CertificateGenerator.generateKeys(signatureAlgorithm);
|
|
53
|
+
const subroot1CertParams = {
|
|
54
|
+
subject: subroot1,
|
|
55
|
+
issuer: rootSubject,
|
|
56
|
+
privateKey: rootCertKeys.privateKey,
|
|
57
|
+
notAfter: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000), // 1 year
|
|
58
|
+
ca: true,
|
|
59
|
+
dnsNames: ['sp.superprotocol.io', 'superprotocol.io'],
|
|
60
|
+
customExtensions: [
|
|
61
|
+
{
|
|
62
|
+
oid: OID_CUSTOM_EXTENSION_USER_DATA,
|
|
63
|
+
value: userDataHashFromCert,
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
oid: '1.3.6.1.3.8888.1.1',
|
|
67
|
+
value: Buffer.from('tdx', 'utf8'),
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
oid: '1.3.6.1.3.8888.1.2',
|
|
71
|
+
value: mrEnclave,
|
|
72
|
+
},
|
|
73
|
+
],
|
|
74
|
+
publicKey: subroot1Keys.publicKey,
|
|
75
|
+
};
|
|
76
|
+
const subroot1Cert = await CertificateGenerator.generateCert(subroot1CertParams);
|
|
77
|
+
const subroot2Keys = await CertificateGenerator.generateKeys(signatureAlgorithm);
|
|
78
|
+
const subrootLevel2CertParams = {
|
|
79
|
+
subject: subroot2,
|
|
80
|
+
issuer: subroot1,
|
|
81
|
+
privateKey: subroot1Keys.privateKey,
|
|
82
|
+
notAfter: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000), // 1 year
|
|
83
|
+
ca: false,
|
|
84
|
+
dnsNames: ['sp.superprotocol.io', 'superprotocol.io'],
|
|
85
|
+
customExtensions: [
|
|
86
|
+
{
|
|
87
|
+
oid: OID_CUSTOM_EXTENSION_CHALLENGE_ID,
|
|
88
|
+
value: Buffer.from('tdx', 'utf8'),
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
oid: '1.3.6.1.3.8888.1.2',
|
|
92
|
+
value: mrEnclave,
|
|
93
|
+
},
|
|
94
|
+
],
|
|
95
|
+
publicKey: subroot2Keys.publicKey,
|
|
96
|
+
};
|
|
97
|
+
const subrootLevel2Cert = await CertificateGenerator.generateCert(subrootLevel2CertParams);
|
|
98
|
+
// const rootCertPem = CertificatesHelper.derToPem(rootCert.certificate.toSchema().toBER());
|
|
99
|
+
// const subroot1CertPem = CertificatesHelper.derToPem(subroot1Cert.certificate.toSchema().toBER());
|
|
100
|
+
// const subrootLevel2CertPem = CertificatesHelper.derToPem(
|
|
101
|
+
// subrootLevel2Cert.certificate.toSchema().toBER(),
|
|
102
|
+
// );
|
|
103
|
+
const certsPem = [subrootLevel2Cert, subroot1Cert];
|
|
104
|
+
const validateResult = await CertificatesHelper.validateCertChain(certsPem, rootCert);
|
|
105
|
+
console.log(JSON.stringify(validateResult, null, 2));
|
|
106
|
+
await fs.promises.writeFile(`pkijsCert-root-${signatureAlgorithm}.crt`, rootCert, 'utf8');
|
|
107
|
+
await fs.promises.writeFile(`pkijsCert-subroot1-${signatureAlgorithm}.crt`, subroot1Cert, 'utf8');
|
|
108
|
+
await fs.promises.writeFile(`pkijsCert-subroot2-${signatureAlgorithm}.crt`, subrootLevel2Cert, 'utf8');
|
|
109
|
+
})();
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy1nZW5lcmF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jZXJ0aWZpY2F0ZXMvdGVzdGluZy1nZW5lcmF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsaUNBQWlDLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUMvRSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFakQsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3BCLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRWpFLHVFQUF1RTtBQUN2RSxNQUFNLGtCQUFrQixHQUF1Qix3QkFBd0IsQ0FBQztBQUV4RSxLQUFLLENBQUMsS0FBSyxJQUFJLEVBQUU7SUFDZixNQUFNLFlBQVksR0FBRyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLGdCQUFnQixFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQzFFLE1BQU0sU0FBUyxHQUFHLGtCQUFrQixDQUFDLGlCQUFpQixDQUNwRCxZQUFZLEVBQ1osaUNBQWlDLENBQ2xDLENBQUM7SUFFRixNQUFNLG9CQUFvQixHQUFHLGtCQUFrQixDQUFDLGlCQUFpQixDQUMvRCxZQUFZLEVBQ1osOEJBQThCLENBQy9CLENBQUM7SUFFRixNQUFNLFdBQVcsR0FBRztRQUNsQixPQUFPLEVBQUUsSUFBSTtRQUNiLFNBQVMsRUFBRSxZQUFZO1FBQ3ZCLFlBQVksRUFBRSxlQUFlO1FBQzdCLFlBQVksRUFBRSxnQkFBZ0I7UUFDOUIsa0JBQWtCLEVBQUUsYUFBYTtRQUNqQyxVQUFVLEVBQUUsU0FBUztLQUN0QixDQUFDO0lBRUYsTUFBTSxRQUFRLEdBQUc7UUFDZixPQUFPLEVBQUUs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
|