@super-protocol/sdk-js 3.4.0-beta.9 → 3.5.0-beta.0
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/crl.d.ts +6 -0
- package/dist/cjs/certificates/crl.js +66 -0
- package/dist/cjs/certificates/helper.d.ts +23 -0
- package/dist/cjs/certificates/helper.js +176 -0
- package/dist/cjs/certificates/index.d.ts +2 -0
- package/dist/cjs/certificates/index.js +19 -0
- package/dist/cjs/certificates/ocsp.d.ts +9 -0
- package/dist/cjs/certificates/ocsp.js +124 -0
- package/dist/cjs/certificates/types.d.ts +4 -0
- package/dist/cjs/certificates/types.js +3 -0
- package/dist/cjs/connectors/BaseConnector.d.ts +1 -0
- package/dist/cjs/connectors/BaseConnector.js +1 -1
- package/dist/cjs/connectors/BlockchainConnector.js +2 -2
- package/dist/cjs/constants.d.ts +8 -1
- package/dist/cjs/constants.js +10 -3
- package/dist/cjs/contracts/abi.d.ts +90 -30
- package/dist/cjs/contracts/abi.js +114 -36
- package/dist/cjs/crypto/types.d.ts +0 -4
- package/dist/cjs/crypto/utils.d.ts +2 -3
- package/dist/cjs/crypto/utils.js +46 -26
- package/dist/cjs/crypto/utils.spec.d.ts +1 -0
- package/dist/cjs/crypto/utils.spec.js +176 -0
- package/dist/cjs/index.d.ts +4 -2
- package/dist/cjs/index.js +9 -6
- package/dist/cjs/models/Offer.d.ts +7 -5
- package/dist/cjs/models/Offer.js +20 -13
- package/dist/cjs/providers/storage/fs-storage-provider.js +3 -4
- package/dist/cjs/staticModels/LoaderSecretsAccessPublicKeys.d.ts +9 -0
- package/dist/cjs/staticModels/LoaderSecretsAccessPublicKeys.js +48 -0
- package/dist/cjs/staticModels/OfferResources.js +3 -3
- package/dist/cjs/staticModels/OffersStorageRequests.js +3 -3
- package/dist/cjs/staticModels/SecretRequests.js +2 -2
- package/dist/cjs/store.d.ts +2 -0
- package/dist/cjs/store.js +3 -1
- package/dist/cjs/tee/OrderReportService.d.ts +0 -3
- package/dist/cjs/tee/OrderReportService.js +11 -28
- package/dist/cjs/tee/QuoteValidator.js +2 -2
- package/dist/cjs/tee/TeeCertificateService.d.ts +14 -17
- package/dist/cjs/tee/TeeCertificateService.js +60 -73
- package/dist/cjs/tee/TeeSignatureVerifier.d.ts +2 -2
- package/dist/cjs/tee/TeeSignatureVerifier.js +3 -3
- package/dist/cjs/types/DistributedSecretStorage.d.ts +1 -1
- package/dist/cjs/types/OrderUsage.d.ts +2 -0
- package/dist/cjs/types/ValueOfferSlot.d.ts +1 -0
- package/dist/cjs/utils/TxManager.d.ts +3 -1
- package/dist/cjs/utils/TxManager.js +56 -30
- package/dist/cjs/utils/helper.d.ts +3 -3
- package/dist/cjs/utils/helper.js +12 -11
- package/dist/mjs/certificates/crl.d.ts +6 -0
- package/dist/mjs/certificates/crl.js +39 -0
- package/dist/mjs/certificates/helper.d.ts +23 -0
- package/dist/mjs/certificates/helper.js +146 -0
- package/dist/mjs/certificates/index.d.ts +2 -0
- package/dist/mjs/certificates/index.js +3 -0
- package/dist/mjs/certificates/ocsp.d.ts +9 -0
- package/dist/mjs/certificates/ocsp.js +94 -0
- package/dist/mjs/certificates/types.d.ts +4 -0
- package/dist/mjs/certificates/types.js +2 -0
- package/dist/mjs/connectors/BaseConnector.d.ts +1 -0
- package/dist/mjs/connectors/BaseConnector.js +1 -1
- package/dist/mjs/connectors/BlockchainConnector.js +2 -2
- package/dist/mjs/constants.d.ts +8 -1
- package/dist/mjs/constants.js +9 -2
- package/dist/mjs/contracts/abi.d.ts +90 -30
- package/dist/mjs/contracts/abi.js +113 -35
- package/dist/mjs/crypto/types.d.ts +0 -4
- package/dist/mjs/crypto/utils.d.ts +2 -3
- package/dist/mjs/crypto/utils.js +46 -26
- package/dist/mjs/crypto/utils.spec.d.ts +1 -0
- package/dist/mjs/crypto/utils.spec.js +174 -0
- package/dist/mjs/index.d.ts +4 -2
- package/dist/mjs/index.js +5 -3
- package/dist/mjs/models/Offer.d.ts +7 -5
- package/dist/mjs/models/Offer.js +20 -13
- package/dist/mjs/providers/storage/fs-storage-provider.js +3 -4
- package/dist/mjs/staticModels/LoaderSecretsAccessPublicKeys.d.ts +9 -0
- package/dist/mjs/staticModels/LoaderSecretsAccessPublicKeys.js +43 -0
- package/dist/mjs/staticModels/OfferResources.js +3 -3
- package/dist/mjs/staticModels/OffersStorageRequests.js +3 -3
- package/dist/mjs/staticModels/SecretRequests.js +2 -2
- package/dist/mjs/store.d.ts +2 -0
- package/dist/mjs/store.js +4 -2
- package/dist/mjs/tee/OrderReportService.d.ts +0 -3
- package/dist/mjs/tee/OrderReportService.js +12 -29
- package/dist/mjs/tee/QuoteValidator.js +2 -2
- package/dist/mjs/tee/TeeCertificateService.d.ts +14 -17
- package/dist/mjs/tee/TeeCertificateService.js +59 -69
- package/dist/mjs/tee/TeeSignatureVerifier.d.ts +2 -2
- package/dist/mjs/tee/TeeSignatureVerifier.js +3 -3
- package/dist/mjs/types/DistributedSecretStorage.d.ts +1 -1
- package/dist/mjs/types/OrderUsage.d.ts +2 -0
- package/dist/mjs/types/ValueOfferSlot.d.ts +1 -0
- package/dist/mjs/utils/TxManager.d.ts +3 -1
- package/dist/mjs/utils/TxManager.js +57 -31
- package/dist/mjs/utils/helper.d.ts +3 -3
- package/dist/mjs/utils/helper.js +10 -9
- package/package.json +4 -4
- package/dist/cjs/staticModels/LoaderSecretsPublicKeys.d.ts +0 -9
- package/dist/cjs/staticModels/LoaderSecretsPublicKeys.js +0 -48
- package/dist/mjs/staticModels/LoaderSecretsPublicKeys.d.ts +0 -9
- package/dist/mjs/staticModels/LoaderSecretsPublicKeys.js +0 -43
package/dist/cjs/utils/helper.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.preparePrivateKey = exports.executeBatchAsync = exports.transformComplexObject = exports.cleanWeb3Data = exports.isValidBytes32Hex = exports.packSlotInfo = exports.unpackSlotInfo = exports.convertOptionInfoToRaw = exports.convertOptionInfoFromRaw = exports.convertOrderUsage = exports.formatUsage = exports.formatBenchmarkTo = exports.formatBenchmark = exports.formatBenchmarks = exports.formatPriceMultipliers = exports.createBenchmarkInfo = exports.formatOfferSlot = exports.formatTeeOfferSlot = exports.formatEpochIndexes = exports.formatTcbPublicData = exports.convertOfferStorageRequestFromRaw = exports.convertOfferStorageAllocatedFromRaw = exports.convertSecretRequestFromRaw = exports.convertOfferResourceFromRaw = exports.convertLoaderSessionFromRaw = exports.
|
|
6
|
+
exports.preparePrivateKey = exports.executeBatchAsync = exports.transformComplexObject = exports.cleanWeb3Data = exports.isValidBytes32Hex = exports.packSlotInfo = exports.unpackSlotInfo = exports.convertOptionInfoToRaw = exports.convertOptionInfoFromRaw = exports.convertOrderUsage = exports.formatUsage = exports.formatBenchmarkTo = exports.formatBenchmark = exports.formatBenchmarks = exports.formatPriceMultipliers = exports.createBenchmarkInfo = exports.formatOfferSlot = exports.formatTeeOfferSlot = exports.formatEpochIndexes = exports.formatTcbPublicData = exports.convertOfferStorageRequestFromRaw = exports.convertOfferStorageAllocatedFromRaw = exports.convertSecretRequestFromRaw = exports.convertOfferResourceFromRaw = exports.convertLoaderSessionFromRaw = exports.convertLoaderSecretAccessPublicKeyFromRaw = exports.convertTeeOfferOptionFromRaw = exports.convertBigIntToString = exports.unpackDeviceId = exports.packDeviceId = exports.incrementMethodCall = exports.isNodeJS = exports.createTransactionOptions = exports.multiplyBigIntByNumber = exports.getMaxPriorityFeePerGas = exports.getBaseBlockFee = exports.checkForUsingExternalTxManager = exports.checkIfActionAccountInitialized = void 0;
|
|
7
7
|
const store_js_1 = __importDefault(require("../store.js"));
|
|
8
8
|
const web3_1 = __importDefault(require("web3"));
|
|
9
9
|
const Monitoring_js_1 = require("./Monitoring.js");
|
|
@@ -84,11 +84,13 @@ async function getMaxPriorityFeePerGasGasStation() {
|
|
|
84
84
|
* Merge transaction options from arguments and from store
|
|
85
85
|
* Used in all set methods
|
|
86
86
|
*/
|
|
87
|
-
const createTransactionOptions = async (options) => {
|
|
87
|
+
const createTransactionOptions = async (externalTransactionSigner, options) => {
|
|
88
88
|
if (!options)
|
|
89
89
|
options = {};
|
|
90
90
|
if (!options.from)
|
|
91
91
|
options.from = store_js_1.default.actionAccount;
|
|
92
|
+
if (externalTransactionSigner)
|
|
93
|
+
return options;
|
|
92
94
|
if (!options.gas)
|
|
93
95
|
options.gas = BigInt(0);
|
|
94
96
|
if (!options.maxPriorityFeePerGas) {
|
|
@@ -101,7 +103,7 @@ const createTransactionOptions = async (options) => {
|
|
|
101
103
|
if (maxPriorityFeePerGasGasStation && maxPriorityFeePerGas > maxPriorityFeePerGasGasStation) {
|
|
102
104
|
maxPriorityFeePerGas = maxPriorityFeePerGasGasStation;
|
|
103
105
|
}
|
|
104
|
-
options.maxPriorityFeePerGas = (maxPriorityFeePerGas
|
|
106
|
+
options.maxPriorityFeePerGas = (0, exports.multiplyBigIntByNumber)(maxPriorityFeePerGas, store_js_1.default.maxPriorityFeePerGasMultiplier);
|
|
105
107
|
}
|
|
106
108
|
if (!options.maxFeePerGas) {
|
|
107
109
|
const web3 = options.web3 || store_js_1.default.web3Https;
|
|
@@ -109,10 +111,7 @@ const createTransactionOptions = async (options) => {
|
|
|
109
111
|
throw Error('web3 is undefined, define it in transaction options or initialize BlockchainConnector with web3 instance.');
|
|
110
112
|
}
|
|
111
113
|
const baseFee = await (0, exports.getBaseBlockFee)(web3);
|
|
112
|
-
|
|
113
|
-
options.maxFeePerGas =
|
|
114
|
-
(baseFee > options.maxPriorityFeePerGas ? baseFee : options.maxPriorityFeePerGas) *
|
|
115
|
-
multiplier;
|
|
114
|
+
options.maxFeePerGas = (0, exports.multiplyBigIntByNumber)(options.maxPriorityFeePerGas + baseFee, store_js_1.default.maxFeePerGasMultiplier);
|
|
116
115
|
}
|
|
117
116
|
delete options.web3;
|
|
118
117
|
return options;
|
|
@@ -205,8 +204,8 @@ function transformSignatureFromRaw(signature) {
|
|
|
205
204
|
s: typeof signature.s === 'string' ? ethers_1.ethers.utils.arrayify(signature.s) : signature.s,
|
|
206
205
|
};
|
|
207
206
|
}
|
|
208
|
-
function
|
|
209
|
-
const loaderSecretPublicKey = (0, exports.cleanWeb3Data)({ ...
|
|
207
|
+
function convertLoaderSecretAccessPublicKeyFromRaw(loaderSecretAccessPublicKeyRaw) {
|
|
208
|
+
const loaderSecretPublicKey = (0, exports.cleanWeb3Data)({ ...loaderSecretAccessPublicKeyRaw });
|
|
210
209
|
const secretPublicKey = transformPublicKeyFromRaw(loaderSecretPublicKey.secretPublicKey);
|
|
211
210
|
const signature = transformSignatureFromRaw(loaderSecretPublicKey.signature);
|
|
212
211
|
return {
|
|
@@ -217,7 +216,7 @@ function convertLoaderSecretPublicKeyFromRaw(loaderSecretPublicKeyRaw) {
|
|
|
217
216
|
timestamp: Number(loaderSecretPublicKey.timestamp),
|
|
218
217
|
};
|
|
219
218
|
}
|
|
220
|
-
exports.
|
|
219
|
+
exports.convertLoaderSecretAccessPublicKeyFromRaw = convertLoaderSecretAccessPublicKeyFromRaw;
|
|
221
220
|
function convertLoaderSessionFromRaw(loaderSessionRaw) {
|
|
222
221
|
const loaderSession = (0, exports.cleanWeb3Data)({ ...loaderSessionRaw });
|
|
223
222
|
const sessionPublicKey = transformPublicKeyFromRaw(loaderSession.sessionPublicKey);
|
|
@@ -307,6 +306,7 @@ function formatOfferSlot(slot, coresDenominator) {
|
|
|
307
306
|
option: convertOptionInfoFromRaw(slot.option),
|
|
308
307
|
info: unpackSlotInfo(slot.info, coresDenominator),
|
|
309
308
|
usage: formatUsage(slot.usage),
|
|
309
|
+
metadata: slot.metadata,
|
|
310
310
|
};
|
|
311
311
|
}
|
|
312
312
|
exports.formatOfferSlot = formatOfferSlot;
|
|
@@ -378,6 +378,7 @@ function convertOrderUsage(usage, slotInfo, slotUsage) {
|
|
|
378
378
|
optionsCount: usage.optionsCount,
|
|
379
379
|
slotInfo,
|
|
380
380
|
slotUsage,
|
|
381
|
+
slotId: usage.slotId,
|
|
381
382
|
};
|
|
382
383
|
}
|
|
383
384
|
exports.convertOrderUsage = convertOrderUsage;
|
|
@@ -480,4 +481,4 @@ const preparePrivateKey = (pk) => {
|
|
|
480
481
|
return pk.startsWith('0x') ? pk : '0x' + pk;
|
|
481
482
|
};
|
|
482
483
|
exports.preparePrivateKey = preparePrivateKey;
|
|
483
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
|
|
484
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/utils/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import * as pkijs from 'pkijs';
|
|
2
|
+
import { CertificatesHelper } from './helper.js';
|
|
3
|
+
import { OID_CRL_DISTRIBUTION_POINTS } from '../constants.js';
|
|
4
|
+
import { helpers } from '../index.js';
|
|
5
|
+
export class CRLHelper {
|
|
6
|
+
static async getCRLFromCerts(certs) {
|
|
7
|
+
const crlRequestsData = certs.map(this.getCRLRequestData).filter(Boolean);
|
|
8
|
+
if (!crlRequestsData.length) {
|
|
9
|
+
return [];
|
|
10
|
+
}
|
|
11
|
+
const crlResponseResults = await Promise.allSettled(crlRequestsData.map((reqData) => this.getCRLResponse(reqData)));
|
|
12
|
+
const rejectedCRLResponses = crlResponseResults
|
|
13
|
+
.filter(helpers.isRejected)
|
|
14
|
+
.map((result) => result.reason);
|
|
15
|
+
if (rejectedCRLResponses.length) {
|
|
16
|
+
throw new Error(`Can't get CRL responses for some certificates (reasons=${rejectedCRLResponses.join(';\n')})`);
|
|
17
|
+
}
|
|
18
|
+
return crlResponseResults.filter(helpers.isFulfilled).map((result) => result.value);
|
|
19
|
+
}
|
|
20
|
+
static getCRLRequestData(cert) {
|
|
21
|
+
const authorityExtension = CertificatesHelper.getExtensionValue(cert, OID_CRL_DISTRIBUTION_POINTS);
|
|
22
|
+
if (!authorityExtension) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
const extensionValue = pkijs.ExtensionValueFactory.fromBER(OID_CRL_DISTRIBUTION_POINTS, authorityExtension);
|
|
26
|
+
const findType6DistributionPointExtension = (entry) => entry.type === 6;
|
|
27
|
+
const crlUrlDistributionPoints = extensionValue?.distributionPoints.find((point) => point.distributionPoint?.some(findType6DistributionPointExtension));
|
|
28
|
+
const crlUrl = crlUrlDistributionPoints?.distributionPoint?.find(findType6DistributionPointExtension)?.value;
|
|
29
|
+
if (!crlUrl) {
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
return { crlUrl };
|
|
33
|
+
}
|
|
34
|
+
static async getCRLResponse(data) {
|
|
35
|
+
const response = await CertificatesHelper.downloadCertWithCache(data.crlUrl);
|
|
36
|
+
return pkijs.CertificateRevocationList.fromBER(response);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NlcnRpZmljYXRlcy9jcmwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDL0IsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2pELE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzlELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFJdEMsTUFBTSxPQUFPLFNBQVM7SUFDcEIsTUFBTSxDQUFDLEtBQUssQ0FBQyxlQUFlLENBQzFCLEtBQTBCO1FBRTFCLE1BQU0sZUFBZSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBcUIsQ0FBQztRQUM5RixJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQzVCLE9BQU8sRUFBRSxDQUFDO1FBQ1osQ0FBQztRQUVELE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUNqRCxlQUFlLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQy9ELENBQUM7UUFFRixNQUFNLG9CQUFvQixHQUFHLGtCQUFrQjthQUM1QyxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQzthQUMxQixHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNsQyxJQUFJLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2hDLE1BQU0sSUFBSSxLQUFLLENBQ2IsMERBQTBELG9CQUFvQixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUM5RixDQUFDO1FBQ0osQ0FBQztRQUVELE9BQU8sa0JBQWtCLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN0RixDQUFDO0lBRU8sTUFBTSxDQUFDLGlCQUFpQixDQUFDLElBQXVCO1FBQ3RELE1BQU0sa0JBQWtCLEdBQUcsa0JBQWtCLENBQUMsaUJBQWlCLENBQzdELElBQUksRUFDSiwyQkFBMkIsQ0FDNUIsQ0FBQztRQUNGLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1lBQ3hCLE9BQU87UUFDVCxDQUFDO1FBRUQsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLHFCQUFxQixDQUFDLE9BQU8sQ0FDeEQsMkJBQTJCLEVBQzNCLGtCQUFrQixDQUNZLENBQUM7UUFFakMsTUFBTSxtQ0FBbUMsR0FBRyxDQUFDLEtBQXdCLEVBQVcsRUFBRSxDQUNoRixLQUFLLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQztRQUVuQixNQUFNLHdCQUF3QixHQUFHLGNBQWMsRUFBRSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUNoRixLQUFLLENBQUMsaUJBQXFELEVBQUUsSUFBSSxDQUNoRSxtQ0FBbUMsQ0FDcEMsQ0FDRixDQUFDO1FBQ0YsTUFBTSxNQUFNLEdBQ1Ysd0JBQXdCLEVBQUUsaUJBQzNCLEVBQUUsSUFBSSxDQUFDLG1DQUFtQyxDQUFDLEVBQUUsS0FBSyxDQUFDO1FBQ3BELElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNaLE9BQU87UUFDVCxDQUFDO1FBRUQsT0FBTyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3BCLENBQUM7SUFFTyxNQUFNLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FDakMsSUFBb0I7UUFFcEIsTUFBTSxRQUFRLEdBQUcsTUFBTSxrQkFBa0IsQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFN0UsT0FBTyxLQUFLLENBQUMseUJBQXlCLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzNELENBQUM7Q0FDRiJ9
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import * as pkijs from 'pkijs';
|
|
3
|
+
import { ValidateCertChainResult } from './types.js';
|
|
4
|
+
export declare class CertificatesHelper {
|
|
5
|
+
private static downloadedCertificateCache;
|
|
6
|
+
static derToPem(data: ArrayBuffer): string;
|
|
7
|
+
static pemToDer(certPem: string): Uint8Array;
|
|
8
|
+
static splitPemCerts(certs: string): string[];
|
|
9
|
+
static getDomain(certPem: string): string | undefined;
|
|
10
|
+
static getExtensionValue(certParam: string | pkijs.Certificate, oid: string): Buffer | undefined;
|
|
11
|
+
static extractCAFromChain(certsPem: string): {
|
|
12
|
+
certs: string;
|
|
13
|
+
ca: string;
|
|
14
|
+
};
|
|
15
|
+
static pemChainToDer(certsPem: string): Uint8Array[];
|
|
16
|
+
static derChainToPem(certsDer: Uint8Array[]): string;
|
|
17
|
+
static downloadCertWithCache(url: string): Promise<Buffer>;
|
|
18
|
+
static sortCertsFromLeafToRoot(certsPem: string | string[]): pkijs.Certificate[];
|
|
19
|
+
static validateCertChain(certsPem: string | string[], caPem: string | string[], options?: {
|
|
20
|
+
offline?: boolean;
|
|
21
|
+
}): Promise<ValidateCertChainResult>;
|
|
22
|
+
private static toPkiCerts;
|
|
23
|
+
}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import _ from 'lodash';
|
|
2
|
+
import axios from 'axios';
|
|
3
|
+
import forge from 'node-forge';
|
|
4
|
+
import * as pkijs from 'pkijs';
|
|
5
|
+
import { createMemoryCache } from '../utils/cache/memory.js';
|
|
6
|
+
import { OCSPHelper } from './ocsp.js';
|
|
7
|
+
import { CRLHelper } from './crl.js';
|
|
8
|
+
//pkijs initCryptoEngine method doesn't work properly in nodejs
|
|
9
|
+
//https://github.com/PeculiarVentures/PKI.js/blob/91c596be220c5010b38415a68bd100942dfd321e/src/CryptoEngine/CryptoEngineInit.ts#L4
|
|
10
|
+
try {
|
|
11
|
+
pkijs.getEngine();
|
|
12
|
+
}
|
|
13
|
+
catch (err) {
|
|
14
|
+
if (err.message === `Please call 'setEngine' before call to 'getEngine'`) {
|
|
15
|
+
pkijs.setEngine('Node', new pkijs.CryptoEngine({ name: 'Node', crypto: require('crypto').webcrypto }));
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
export class CertificatesHelper {
|
|
19
|
+
static downloadedCertificateCache = createMemoryCache();
|
|
20
|
+
static derToPem(data) {
|
|
21
|
+
return forge.pem.encode({
|
|
22
|
+
contentDomain: null,
|
|
23
|
+
dekInfo: null,
|
|
24
|
+
headers: [],
|
|
25
|
+
procType: null,
|
|
26
|
+
type: 'CERTIFICATE',
|
|
27
|
+
body: Buffer.from(data).toString('binary'),
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
static pemToDer(certPem) {
|
|
31
|
+
return Buffer.from(forge.pki.pemToDer(certPem).bytes(), 'binary');
|
|
32
|
+
}
|
|
33
|
+
static splitPemCerts(certs) {
|
|
34
|
+
const pemRegex = /(-----BEGIN CERTIFICATE-----[\s\S]*?-----END CERTIFICATE-----)/g;
|
|
35
|
+
return certs.match(pemRegex) || [];
|
|
36
|
+
}
|
|
37
|
+
static getDomain(certPem) {
|
|
38
|
+
const cert = forge.pki.certificateFromPem(certPem);
|
|
39
|
+
return cert.subject.attributes.find((attribute) => attribute.name === 'commonName')
|
|
40
|
+
?.value;
|
|
41
|
+
}
|
|
42
|
+
static getExtensionValue(certParam, oid) {
|
|
43
|
+
const cert = typeof certParam === 'string'
|
|
44
|
+
? pkijs.Certificate.fromBER(CertificatesHelper.pemToDer(certParam))
|
|
45
|
+
: certParam;
|
|
46
|
+
const extension = cert.extensions?.find((ext) => ext.extnID === oid);
|
|
47
|
+
return extension && Buffer.from(extension.extnValue.valueBlock.toBER());
|
|
48
|
+
}
|
|
49
|
+
static extractCAFromChain(certsPem) {
|
|
50
|
+
const certs = CertificatesHelper.toPkiCerts(certsPem);
|
|
51
|
+
const splitCerts = _.partition(certs, (cert) => !cert.issuer.isEqual(cert.subject));
|
|
52
|
+
const toPemChain = (certs) => certs.map((cert) => CertificatesHelper.derToPem(cert.toSchema().toBER())).join('\n');
|
|
53
|
+
return {
|
|
54
|
+
certs: toPemChain(splitCerts[0]),
|
|
55
|
+
ca: toPemChain(splitCerts[1]),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
static pemChainToDer(certsPem) {
|
|
59
|
+
const certs = CertificatesHelper.splitPemCerts(certsPem);
|
|
60
|
+
return certs.map((certPem) => CertificatesHelper.pemToDer(certPem));
|
|
61
|
+
}
|
|
62
|
+
static derChainToPem(certsDer) {
|
|
63
|
+
return certsDer.map(CertificatesHelper.derToPem).join('').trim();
|
|
64
|
+
}
|
|
65
|
+
static async downloadCertWithCache(url) {
|
|
66
|
+
const responseData = await CertificatesHelper.downloadedCertificateCache.wrap(url, async () => {
|
|
67
|
+
const response = await axios(url, {
|
|
68
|
+
responseType: 'arraybuffer',
|
|
69
|
+
});
|
|
70
|
+
return response?.data;
|
|
71
|
+
}, {
|
|
72
|
+
ttl: 5 * 60 * 1000, //5 min
|
|
73
|
+
});
|
|
74
|
+
return responseData;
|
|
75
|
+
}
|
|
76
|
+
static sortCertsFromLeafToRoot(certsPem) {
|
|
77
|
+
const allCerts = CertificatesHelper.toPkiCerts(certsPem);
|
|
78
|
+
const leafs = allCerts.filter((certToCheck) => !allCerts.some((certsToCheckWith) => certToCheck.subject.isEqual(certsToCheckWith.issuer)));
|
|
79
|
+
const buildChain = (leaf) => {
|
|
80
|
+
const chain = [leaf];
|
|
81
|
+
let currentCert = leaf;
|
|
82
|
+
do {
|
|
83
|
+
currentCert = allCerts.find((potentialIssuer) => currentCert?.issuer.isEqual(potentialIssuer.subject) &&
|
|
84
|
+
!currentCert.subject.isEqual(currentCert.issuer));
|
|
85
|
+
if (currentCert) {
|
|
86
|
+
chain.push(currentCert);
|
|
87
|
+
}
|
|
88
|
+
} while (currentCert);
|
|
89
|
+
return chain;
|
|
90
|
+
};
|
|
91
|
+
const chains = leafs.map(buildChain).sort((one, two) => two.length - one.length);
|
|
92
|
+
return chains.flat();
|
|
93
|
+
}
|
|
94
|
+
static async validateCertChain(certsPem, caPem, options = {}) {
|
|
95
|
+
const { offline } = options;
|
|
96
|
+
// reverse() is needed because pkijs expects certificates to be ordered from root to leaf
|
|
97
|
+
const sortedCerts = CertificatesHelper.sortCertsFromLeafToRoot(certsPem).reverse();
|
|
98
|
+
const ca = CertificatesHelper.toPkiCerts(caPem);
|
|
99
|
+
try {
|
|
100
|
+
const crls = offline ? [] : await CRLHelper.getCRLFromCerts(sortedCerts);
|
|
101
|
+
const ocspBaseResponses = offline
|
|
102
|
+
? []
|
|
103
|
+
: await OCSPHelper.getOCSPResponseFromCerts(sortedCerts, ca);
|
|
104
|
+
const chainEngine = new pkijs.CertificateChainValidationEngine({
|
|
105
|
+
certs: sortedCerts,
|
|
106
|
+
trustedCerts: ca,
|
|
107
|
+
ocsps: ocspBaseResponses,
|
|
108
|
+
crls,
|
|
109
|
+
});
|
|
110
|
+
const verifyResult = await chainEngine.verify();
|
|
111
|
+
if (!verifyResult.result) {
|
|
112
|
+
return {
|
|
113
|
+
isValid: false,
|
|
114
|
+
errorMessage: verifyResult.resultMessage,
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* When verifying a certificate chain, chainEngine.verify() attempts to find a valid
|
|
119
|
+
* certification path using the provided certificates. It may ignore certificates that
|
|
120
|
+
* don't belong to the valid chain.
|
|
121
|
+
*
|
|
122
|
+
* This check ensures that all certificates we initially provided were actually used
|
|
123
|
+
* in the valid certification path that CertificateChainValidationEngine constructed.
|
|
124
|
+
* If any certificate was ignored/not used, we throw an error.
|
|
125
|
+
*/
|
|
126
|
+
const isEachCertVerified = sortedCerts.every((cert) => verifyResult.certificatePath?.find((verifiedCert) => verifiedCert.serialNumber.isEqual(cert.serialNumber)));
|
|
127
|
+
if (!isEachCertVerified) {
|
|
128
|
+
throw new Error('Some of certificates do not belong to chain');
|
|
129
|
+
}
|
|
130
|
+
return {
|
|
131
|
+
isValid: true,
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
catch (err) {
|
|
135
|
+
return {
|
|
136
|
+
isValid: false,
|
|
137
|
+
errorMessage: err.message,
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
static toPkiCerts(certs) {
|
|
142
|
+
const certsArray = Array.isArray(certs) ? certs : CertificatesHelper.splitPemCerts(certs);
|
|
143
|
+
return certsArray.map((certPem) => pkijs.Certificate.fromBER(CertificatesHelper.pemToDer(certPem)));
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NlcnRpZmljYXRlcy9oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxDQUFDLE1BQU0sUUFBUSxDQUFDO0FBQ3ZCLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMxQixPQUFPLEtBQUssTUFBTSxZQUFZLENBQUM7QUFDL0IsT0FBTyxLQUFLLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDL0IsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUN2QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRXJDLCtEQUErRDtBQUMvRCxrSUFBa0k7QUFDbEksSUFBSSxDQUFDO0lBQ0gsS0FBSyxDQUFDLFNBQVMsRUFBRSxDQUFDO0FBQ3BCLENBQUM7QUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO0lBQ2IsSUFBSyxHQUFhLENBQUMsT0FBTyxLQUFLLG9EQUFvRCxFQUFFLENBQUM7UUFDcEYsS0FBSyxDQUFDLFNBQVMsQ0FDYixNQUFNLEVBQ04sSUFBSSxLQUFLLENBQUMsWUFBWSxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQzlFLENBQUM7SUFDSixDQUFDO0FBQ0gsQ0FBQztBQUVELE1BQU0sT0FBTyxrQkFBa0I7SUFDckIsTUFBTSxDQUFDLDBCQUEwQixHQUFHLGlCQUFpQixFQUFFLENBQUM7SUFFaEUsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFpQjtRQUMvQixPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3RCLGFBQWEsRUFBRSxJQUFJO1lBQ25CLE9BQU8sRUFBRSxJQUFJO1lBQ2IsT0FBTyxFQUFFLEVBQUU7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
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
export * from './helper.js';
|
|
2
|
+
export * from './types.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2VydGlmaWNhdGVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsWUFBWSxDQUFDIn0=
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import * as pkijs from 'pkijs';
|
|
2
|
+
export declare class OCSPHelper {
|
|
3
|
+
static getOCSPResponseFromCerts(certs: pkijs.Certificate[], ca: pkijs.Certificate[]): Promise<pkijs.BasicOCSPResponse[]>;
|
|
4
|
+
private static getOCSPRequestData;
|
|
5
|
+
private static getOCSPResponse;
|
|
6
|
+
private static sendOCSPRequest;
|
|
7
|
+
private static getNonceForRequest;
|
|
8
|
+
private static getNonceFromResponse;
|
|
9
|
+
}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import * as pkijs from 'pkijs';
|
|
2
|
+
import * as asn1js from 'asn1js';
|
|
3
|
+
import axios from 'axios';
|
|
4
|
+
import { OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION, OID_OCSP_ACCESS_METHOD, OID_OCSP_ISSUER_ACCESS_METHOD, } from '../constants.js';
|
|
5
|
+
import { CertificatesHelper } from './helper.js';
|
|
6
|
+
import { constants, helpers } from '../index.js';
|
|
7
|
+
export class OCSPHelper {
|
|
8
|
+
static async getOCSPResponseFromCerts(certs, ca) {
|
|
9
|
+
const ocspRequestsData = certs
|
|
10
|
+
.map(OCSPHelper.getOCSPRequestData)
|
|
11
|
+
.filter(Boolean);
|
|
12
|
+
if (!ocspRequestsData.length) {
|
|
13
|
+
return [];
|
|
14
|
+
}
|
|
15
|
+
const ocspResponseResults = await Promise.allSettled(ocspRequestsData.map((ocspReqData) => OCSPHelper.getOCSPResponse(ocspReqData, ca)));
|
|
16
|
+
const rejectedOCSPResponses = ocspResponseResults
|
|
17
|
+
.filter(helpers.isRejected)
|
|
18
|
+
.map((result) => result.reason);
|
|
19
|
+
if (rejectedOCSPResponses.length) {
|
|
20
|
+
throw new Error(`Can't get OCSP responses for some certificates (reasons=${rejectedOCSPResponses.join(';\n')})`);
|
|
21
|
+
}
|
|
22
|
+
return ocspResponseResults.filter(helpers.isFulfilled).map((result) => result.value);
|
|
23
|
+
}
|
|
24
|
+
static getOCSPRequestData(cert) {
|
|
25
|
+
const authorityExtension = CertificatesHelper.getExtensionValue(cert, OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION);
|
|
26
|
+
if (!authorityExtension) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const extensionValue = pkijs.ExtensionValueFactory.fromBER(OID_AUTHORITY_INFORMATION_ACCESS_EXTENSION, authorityExtension);
|
|
30
|
+
const ocspUrl = extensionValue.accessDescriptions.find((desc) => desc.accessMethod === OID_OCSP_ACCESS_METHOD)?.accessLocation.value;
|
|
31
|
+
const issuerCertUrl = extensionValue.accessDescriptions.find((desc) => desc.accessMethod === OID_OCSP_ISSUER_ACCESS_METHOD)?.accessLocation.value;
|
|
32
|
+
if (!ocspUrl || !issuerCertUrl) {
|
|
33
|
+
// TODO: throw error?
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
return { ocspUrl, issuerCertUrl, cert };
|
|
37
|
+
}
|
|
38
|
+
static async getOCSPResponse(data, ca) {
|
|
39
|
+
const { ocspUrl, issuerCertUrl, cert } = data;
|
|
40
|
+
const issuerCertRaw = await CertificatesHelper.downloadCertWithCache(issuerCertUrl);
|
|
41
|
+
const issuerCertificate = pkijs.Certificate.fromBER(issuerCertRaw);
|
|
42
|
+
const ocspReq = new pkijs.OCSPRequest();
|
|
43
|
+
await ocspReq.createForCertificate(cert, {
|
|
44
|
+
hashAlgorithm: 'SHA-256',
|
|
45
|
+
issuerCertificate,
|
|
46
|
+
});
|
|
47
|
+
const reqNonce = OCSPHelper.getNonceForRequest();
|
|
48
|
+
ocspReq.tbsRequest.requestExtensions = [
|
|
49
|
+
new pkijs.Extension({
|
|
50
|
+
extnID: constants.OID_OCSP_NONCE,
|
|
51
|
+
extnValue: new asn1js.OctetString({ valueHex: reqNonce.buffer }).toBER(),
|
|
52
|
+
}),
|
|
53
|
+
];
|
|
54
|
+
const ocspBasicResp = await OCSPHelper.sendOCSPRequest(ocspUrl, ocspReq);
|
|
55
|
+
const respNonce = await OCSPHelper.getNonceFromResponse(ocspBasicResp);
|
|
56
|
+
if (respNonce && Buffer.compare(reqNonce, respNonce) !== 0) {
|
|
57
|
+
throw new Error(`OCSP nonces from request and response do not match`);
|
|
58
|
+
}
|
|
59
|
+
const trustedCerts = [];
|
|
60
|
+
if (!ocspBasicResp.certs) {
|
|
61
|
+
ocspBasicResp.certs = [issuerCertificate];
|
|
62
|
+
trustedCerts.push(...ca);
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
trustedCerts.push(issuerCertificate);
|
|
66
|
+
}
|
|
67
|
+
await ocspBasicResp.verify({ trustedCerts });
|
|
68
|
+
return ocspBasicResp;
|
|
69
|
+
}
|
|
70
|
+
static async sendOCSPRequest(ocspUrl, ocspReq) {
|
|
71
|
+
const ocspResponse = await axios(ocspUrl, {
|
|
72
|
+
method: 'POST',
|
|
73
|
+
headers: {
|
|
74
|
+
'Content-Type': 'application/ocsp-request',
|
|
75
|
+
},
|
|
76
|
+
responseType: 'arraybuffer',
|
|
77
|
+
data: ocspReq.toSchema(true).toBER(),
|
|
78
|
+
});
|
|
79
|
+
const ocspRespSimpl = pkijs.OCSPResponse.fromBER(ocspResponse.data);
|
|
80
|
+
if (!ocspRespSimpl.responseBytes) {
|
|
81
|
+
throw new Error('"No "ResponseBytes" in the OCSP Response - nothing to verify');
|
|
82
|
+
}
|
|
83
|
+
const ocspBasicResp = pkijs.BasicOCSPResponse.fromBER(ocspRespSimpl.responseBytes.response.valueBlock.valueHexView);
|
|
84
|
+
return ocspBasicResp;
|
|
85
|
+
}
|
|
86
|
+
static getNonceForRequest() {
|
|
87
|
+
return pkijs.getRandomValues(new Uint8Array(32));
|
|
88
|
+
}
|
|
89
|
+
static getNonceFromResponse(ocspBasicResp) {
|
|
90
|
+
const nonceExtension = ocspBasicResp.tbsResponseData?.responseExtensions?.find((extension) => extension.extnID === constants.OID_OCSP_NONCE);
|
|
91
|
+
return nonceExtension?.extnValue.valueBlock.valueHexView;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2NzcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jZXJ0aWZpY2F0ZXMvb2NzcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMvQixPQUFPLEtBQUssTUFBTSxNQUFNLFFBQVEsQ0FBQztBQUNqQyxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxFQUNMLDBDQUEwQyxFQUMxQyxzQkFBc0IsRUFDdEIsNkJBQTZCLEdBQzlCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2pELE9BQU8sRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBSWpELE1BQU0sT0FBTyxVQUFVO0lBQ3JCLE1BQU0sQ0FBQyxLQUFLLENBQUMsd0JBQXdCLENBQ25DLEtBQTBCLEVBQzFCLEVBQXVCO1FBRXZCLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSzthQUMzQixHQUFHLENBQUMsVUFBVSxDQUFDLGtCQUFrQixDQUFDO2FBQ2xDLE1BQU0sQ0FBQyxPQUFPLENBQXNCLENBQUM7UUFFeEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQzdCLE9BQU8sRUFBRSxDQUFDO1FBQ1osQ0FBQztRQUVELE1BQU0sbUJBQW1CLEdBQUcsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUNsRCxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQ25GLENBQUM7UUFFRixNQUFNLHFCQUFxQixHQUFHLG1CQUFtQjthQUM5QyxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQzthQUMxQixHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FB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
|
|
@@ -49,4 +49,4 @@ export class BaseConnector {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZUNvbm5lY3Rvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25uZWN0b3JzL0Jhc2VDb25uZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxVQUFVLE1BQU0sY0FBYyxDQUFDO0FBaUJ0QyxNQUFNLE9BQU8sYUFBYTtJQUNkLFdBQVcsR0FBRyxLQUFLLENBQUM7SUFDcEIsTUFBTSxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDbkUsUUFBUSxDQUF3QjtJQUNoQyxhQUFhLENBQXdCO0lBQ3JDLFlBQVksQ0FBVTtJQUV6QixhQUFhO1FBQ2xCLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQztJQUMxQixDQUFDO0lBRU0sa0JBQWtCO1FBQ3ZCLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVztZQUNuQixNQUFNLElBQUksS0FBSyxDQUNiLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsc0NBQXNDLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLDRCQUE0QixDQUN0SCxDQUFDO0lBQ04sQ0FBQztJQUVEOzs7T0FHRztJQUNJLFdBQVc7UUFDaEIsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFFMUIsT0FBTyxJQUFJLENBQUMsUUFBUyxDQUFDO0lBQ3hCLENBQUM7SUFFRDs7O09BR0c7SUFDSSxnQkFBZ0I7UUFDckIsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFFMUIsT0FBTyxJQUFJLENBQUMsYUFBYyxDQUFDO0lBQzdCLENBQUM7SUFFRDs7O09BR0c7SUFDSSxlQUFlO1FBQ3BCLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBRTFCLE9BQU8sSUFBSSxDQUFDLFlBQWEsQ0FBQztJQUM1QixDQUFDO0lBQ0Q7Ozs7T0FJRztJQUNJLEtBQUssQ0FBQyxVQUFVLENBQUMsT0FBZSxJQUFrQixDQUFDO0lBRW5ELFFBQVE7UUFDYixJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNyQixJQUFJLENBQUMsV0FBVyxHQUFHLEtBQUssQ0FBQztZQUN6QixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2hFLENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
|