@ledgerhq/vault-cli 1.16.1 → 1.17.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/.turbo/turbo-build.log +4 -5
- package/CHANGELOG.md +20 -0
- package/bin/__tests__/backupCompartment.test.js +7 -4
- package/bin/__tests__/backupCompartment.test.js.map +1 -1
- package/bin/__tests__/getCertFromPFX.test.d.ts +2 -0
- package/bin/__tests__/getCertFromPFX.test.d.ts.map +1 -0
- package/bin/__tests__/getCertFromPFX.test.js +54 -0
- package/bin/__tests__/getCertFromPFX.test.js.map +1 -0
- package/bin/__tests__/restoreCompartment.test.js +8 -6
- package/bin/__tests__/restoreCompartment.test.js.map +1 -1
- package/bin/__tests__/wipe.test.js +30 -10
- package/bin/__tests__/wipe.test.js.map +1 -1
- package/bin/commands/backupCompartment.d.ts.map +1 -1
- package/bin/commands/backupCompartment.js +4 -10
- package/bin/commands/backupCompartment.js.map +1 -1
- package/bin/commands/deploy.d.ts +7 -0
- package/bin/commands/deploy.d.ts.map +1 -1
- package/bin/commands/deploy.js +7 -1
- package/bin/commands/deploy.js.map +1 -1
- package/bin/commands/index.d.ts +7 -0
- package/bin/commands/index.d.ts.map +1 -1
- package/bin/commands/restoreCompartment.d.ts.map +1 -1
- package/bin/commands/restoreCompartment.js +4 -9
- package/bin/commands/restoreCompartment.js.map +1 -1
- package/bin/commands/wipe.d.ts.map +1 -1
- package/bin/commands/wipe.js +26 -21
- package/bin/commands/wipe.js.map +1 -1
- package/bin/getCertFromPFX.d.ts +7 -0
- package/bin/getCertFromPFX.d.ts.map +1 -0
- package/bin/getCertFromPFX.js +40 -0
- package/bin/getCertFromPFX.js.map +1 -0
- package/package.json +4 -2
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
@ledgerhq/vault-cli
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
@ledgerhq/vault-cli:build:
|
|
1
|
+
|
|
2
|
+
> @ledgerhq/vault-cli@1.17.0 build /home/runner/work/vault-ts/vault-ts/apps/cli
|
|
3
|
+
> tsc && chmod +x bin/index.js
|
|
4
|
+
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @ledgerhq/vault-cli
|
|
2
2
|
|
|
3
|
+
## 1.17.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 09a49c5: VG-11489 Add a watch deployment timeout of 10 min by default
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [790831d]
|
|
12
|
+
- Updated dependencies [09a49c5]
|
|
13
|
+
- @ledgerhq/vault-common@1.19.0
|
|
14
|
+
|
|
15
|
+
## 1.16.2
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- c2bcd0a: VG-11443 Make PFX certificate parsing compatible with newer NodeJS versions
|
|
20
|
+
- Updated dependencies [c2bcd0a]
|
|
21
|
+
- @ledgerhq/vault-common@1.18.1
|
|
22
|
+
|
|
3
23
|
## 1.16.1
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -36,12 +36,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
const createHSMBridge = __importStar(require("@ledgerhq/vault-common/lib/createHSMBridge"));
|
|
39
|
-
const fs_1 = __importDefault(require("fs"));
|
|
40
39
|
const backupCompartment_1 = __importDefault(require("../commands/backupCompartment"));
|
|
40
|
+
const getCertFromPFX = __importStar(require("../getCertFromPFX"));
|
|
41
41
|
describe("backupCompartment", () => {
|
|
42
42
|
beforeEach(() => {
|
|
43
43
|
jest.spyOn(console, "log").mockImplementation();
|
|
44
|
-
jest.spyOn(
|
|
44
|
+
jest.spyOn(getCertFromPFX, "default").mockResolvedValue({
|
|
45
|
+
cert: Buffer.from("abcde"),
|
|
46
|
+
key: Buffer.from("12345"),
|
|
47
|
+
});
|
|
45
48
|
});
|
|
46
49
|
afterEach(() => {
|
|
47
50
|
jest.restoreAllMocks();
|
|
@@ -74,8 +77,8 @@ describe("backupCompartment", () => {
|
|
|
74
77
|
hsmCertPassword: "1234",
|
|
75
78
|
});
|
|
76
79
|
expect(createHSMBridgeSpy).toHaveBeenCalledWith({
|
|
77
|
-
hsmCert: "
|
|
78
|
-
|
|
80
|
+
hsmCert: Buffer.from("abcde"),
|
|
81
|
+
hsmCertKey: Buffer.from("12345"),
|
|
79
82
|
hsmEndpoint: "<hsm>",
|
|
80
83
|
});
|
|
81
84
|
expect(fakeBridge.backupCompartment).toHaveBeenCalledWith(42);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backupCompartment.test.js","sourceRoot":"","sources":["../../src/__tests__/backupCompartment.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4FAA8E;
|
|
1
|
+
{"version":3,"file":"backupCompartment.test.js","sourceRoot":"","sources":["../../src/__tests__/backupCompartment.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4FAA8E;AAE9E,sFAA8D;AAC9D,kEAAoD;AAEpD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,EAAE,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,iBAAiB,CAAC;YACtD,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YAC1B,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAS,EAAE;QACjD,IAAI,GAAG,CAAC;QACR,IAAI;YACF,MAAM,2BAAiB,CAAC,GAAG,CAAC;gBAC1B,WAAW,EAAE,CAAC;gBACd,GAAG,EAAE,OAAO;gBAEZ,OAAO,EAAE,SAAS;aACnB,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,GAAG,CAAC,CAAC;SACT;QACD,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CACjB,IAAI,KAAK,CACP,qIAAqI,CACtI,CACF,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,GAAS,EAAE;QAC3C,MAAM,UAAU,GAAG;YACjB,iBAAiB,EAAE,IAAI,CAAC,EAAE,EAAE;YAC5B,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE;YAC7B,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE;SAC5B,CAAC;QACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC9F,MAAM,2BAAiB,CAAC,GAAG,CAAC;YAC1B,WAAW,EAAE,EAAE;YACf,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE,MAAM;SACxB,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAAC;YAC9C,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YAC7B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YAChC,WAAW,EAAE,OAAO;SACrB,CAAC,CAAC;QACH,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getCertFromPFX.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/getCertFromPFX.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const fs_1 = __importDefault(require("fs"));
|
|
16
|
+
const pem_1 = __importDefault(require("pem"));
|
|
17
|
+
const getCertFromPFX_1 = __importDefault(require("../getCertFromPFX"));
|
|
18
|
+
describe("getCertFromPFX", () => {
|
|
19
|
+
it("should get cert from pfx file", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
+
jest.useFakeTimers();
|
|
21
|
+
jest.spyOn(fs_1.default, "readFileSync").mockReturnValue(Buffer.from("abcde"));
|
|
22
|
+
let cb = null;
|
|
23
|
+
const readPkcs12Spy = jest.spyOn(pem_1.default, "readPkcs12").mockImplementation((_bufferOrPath, _options, callback) => {
|
|
24
|
+
cb = callback;
|
|
25
|
+
});
|
|
26
|
+
const promise = (0, getCertFromPFX_1.default)("/my/awesome/path.pfx", "lorem-ipsum");
|
|
27
|
+
jest.advanceTimersByTime(500);
|
|
28
|
+
yield Promise.resolve();
|
|
29
|
+
yield Promise.resolve();
|
|
30
|
+
cb(null, { key: "key", cert: "cert", ca: [] });
|
|
31
|
+
yield promise;
|
|
32
|
+
expect(readPkcs12Spy).toHaveBeenCalledWith(Buffer.from("abcde"), { p12Password: "lorem-ipsum" }, expect.any(Function));
|
|
33
|
+
}));
|
|
34
|
+
it("should throw if there is an error decoding the cert", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
35
|
+
jest.useFakeTimers();
|
|
36
|
+
jest.spyOn(fs_1.default, "readFileSync").mockReturnValue(Buffer.from("abcde"));
|
|
37
|
+
let cb = null;
|
|
38
|
+
jest.spyOn(pem_1.default, "readPkcs12").mockImplementation((_bufferOrPath, _options, callback) => {
|
|
39
|
+
cb = callback;
|
|
40
|
+
});
|
|
41
|
+
const promise = (0, getCertFromPFX_1.default)("/my/awesome/path.pfx", "lorem-ipsum");
|
|
42
|
+
jest.advanceTimersByTime(500);
|
|
43
|
+
yield Promise.resolve();
|
|
44
|
+
yield Promise.resolve();
|
|
45
|
+
cb(new Error("hola que tal"), {});
|
|
46
|
+
try {
|
|
47
|
+
yield promise;
|
|
48
|
+
}
|
|
49
|
+
catch (e) {
|
|
50
|
+
expect(e).toEqual(new Error("hola que tal"));
|
|
51
|
+
}
|
|
52
|
+
}));
|
|
53
|
+
});
|
|
54
|
+
//# sourceMappingURL=getCertFromPFX.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getCertFromPFX.test.js","sourceRoot":"","sources":["../../src/__tests__/getCertFromPFX.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,8CAAyE;AAEzE,uEAA+C;AAE/C,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,+BAA+B,EAAE,GAAS,EAAE;QAC7C,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,IAAI,CAAC,KAAK,CAAC,YAAE,EAAE,cAAc,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAErE,IAAI,EAAE,GAAsC,IAAI,CAAC;QACjD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,aAAG,EAAE,YAAY,CAAC,CAAC,kBAAkB,CAEpE,CACE,aAA8B,EAC9B,QAA2B,EAC3B,QAAoC,EACpC,EAAE;YACF,EAAE,GAAG,QAAQ,CAAC;QAChB,CAAC,CACF,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,wBAAc,EAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;QACtE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAG9B,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAExB,EAAG,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAChD,MAAM,OAAO,CAAC;QAEd,MAAM,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACxC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EACpB,EAAE,WAAW,EAAE,aAAa,EAAE,EAC9B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CACrB,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAS,EAAE;QACnE,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,IAAI,CAAC,KAAK,CAAC,YAAE,EAAE,cAAc,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAErE,IAAI,EAAE,GAAsC,IAAI,CAAC;QACjD,IAAI,CAAC,KAAK,CAAC,aAAG,EAAE,YAAY,CAAC,CAAC,kBAAkB,CAE9C,CACE,aAA8B,EAC9B,QAA2B,EAC3B,QAAoC,EACpC,EAAE;YACF,EAAE,GAAG,QAAQ,CAAC;QAChB,CAAC,CACF,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,wBAAc,EAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;QACtE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAG9B,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAExB,EAAG,CACD,IAAI,KAAK,CAAC,cAAc,CAAC,EAEzB,EAAE,CACH,CAAC;QAEF,IAAI;YACF,MAAM,OAAO,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;SAC9C;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -38,6 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
38
38
|
const createHSMBridge = __importStar(require("@ledgerhq/vault-common/lib/createHSMBridge"));
|
|
39
39
|
const fs_1 = __importDefault(require("fs"));
|
|
40
40
|
const restoreCompartment_1 = __importDefault(require("../commands/restoreCompartment"));
|
|
41
|
+
const getCertFromPFX = __importStar(require("../getCertFromPFX"));
|
|
41
42
|
const logger_1 = __importDefault(require("../logger"));
|
|
42
43
|
describe("restoreCompartment", () => {
|
|
43
44
|
beforeEach(() => {
|
|
@@ -61,10 +62,11 @@ describe("restoreCompartment", () => {
|
|
|
61
62
|
expect(err).toEqual(new Error("You must specify the path to your HSM certificate in your environment variable VAULT_HSM_CLIENT_CERT_PATH or use the --hsmCert flag"));
|
|
62
63
|
}));
|
|
63
64
|
it("should restore a compartment", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
64
|
-
jest
|
|
65
|
-
.
|
|
66
|
-
.
|
|
67
|
-
|
|
65
|
+
jest.spyOn(getCertFromPFX, "default").mockResolvedValue({
|
|
66
|
+
cert: Buffer.from("abcde"),
|
|
67
|
+
key: Buffer.from("12345"),
|
|
68
|
+
});
|
|
69
|
+
jest.spyOn(fs_1.default, "readFileSync").mockReturnValue('{"counters":"1234","internalfs":"abcdef"}');
|
|
68
70
|
const fakeBridge = {
|
|
69
71
|
backupCompartment: jest.fn(),
|
|
70
72
|
restoreCompartment: jest.fn(),
|
|
@@ -79,8 +81,8 @@ describe("restoreCompartment", () => {
|
|
|
79
81
|
hsmCertPassword: "1234",
|
|
80
82
|
});
|
|
81
83
|
expect(createHSMBridgeSpy).toHaveBeenCalledWith({
|
|
82
|
-
hsmCert: "
|
|
83
|
-
|
|
84
|
+
hsmCert: Buffer.from("abcde"),
|
|
85
|
+
hsmCertKey: Buffer.from("12345"),
|
|
84
86
|
hsmEndpoint: "<hsm>",
|
|
85
87
|
});
|
|
86
88
|
expect(fakeBridge.restoreCompartment).toHaveBeenCalledWith(42, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restoreCompartment.test.js","sourceRoot":"","sources":["../../src/__tests__/restoreCompartment.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4FAA8E;AAC9E,4CAAoB;AAEpB,wFAAgE;AAChE,uDAA+B;AAE/B,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAS,EAAE;QACjD,IAAI,GAAG,CAAC;QACR,IAAI;YACF,MAAM,4BAAkB,CAAC,GAAG,CAAC;gBAC3B,WAAW,EAAE,CAAC;gBACd,GAAG,EAAE,OAAO;gBAEZ,OAAO,EAAE,SAAS;aACnB,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,GAAG,CAAC,CAAC;SACT;QACD,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CACjB,IAAI,KAAK,CACP,qIAAqI,CACtI,CACF,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAS,EAAE;QAC5C,IAAI
|
|
1
|
+
{"version":3,"file":"restoreCompartment.test.js","sourceRoot":"","sources":["../../src/__tests__/restoreCompartment.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4FAA8E;AAC9E,4CAAoB;AAEpB,wFAAgE;AAChE,kEAAoD;AACpD,uDAA+B;AAE/B,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAS,EAAE;QACjD,IAAI,GAAG,CAAC;QACR,IAAI;YACF,MAAM,4BAAkB,CAAC,GAAG,CAAC;gBAC3B,WAAW,EAAE,CAAC;gBACd,GAAG,EAAE,OAAO;gBAEZ,OAAO,EAAE,SAAS;aACnB,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,GAAG,CAAC,CAAC;SACT;QACD,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CACjB,IAAI,KAAK,CACP,qIAAqI,CACtI,CACF,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAS,EAAE;QAC5C,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,iBAAiB,CAAC;YACtD,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YAC1B,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SAC1B,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,YAAE,EAAE,cAAc,CAAC,CAAC,eAAe,CAAC,2CAA2C,CAAC,CAAC;QAC5F,MAAM,UAAU,GAAG;YACjB,iBAAiB,EAAE,IAAI,CAAC,EAAE,EAAE;YAC5B,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE;YAC7B,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE;SAC5B,CAAC;QACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC9F,MAAM,4BAAkB,CAAC,GAAG,CAAC;YAC3B,UAAU,EAAE,eAAe;YAC3B,WAAW,EAAE,EAAE;YACf,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE,MAAM;SACxB,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAAC;YAC9C,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YAC7B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YAChC,WAAW,EAAE,OAAO;SACrB,CAAC,CAAC;QACH,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CACxD,EAAE,EACF;YACE,QAAQ,EAAE,MAAM;YAChB,UAAU,EAAE,QAAQ;SACrB,EACD,EAAE,MAAM,EAAN,gBAAM,EAAE,CACX,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -13,8 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
36
|
};
|
|
14
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
38
|
const vault_common_1 = require("@ledgerhq/vault-common");
|
|
16
|
-
const fs_1 = __importDefault(require("fs"));
|
|
17
39
|
const wipe_1 = __importDefault(require("../commands/wipe"));
|
|
40
|
+
const getCertFromPFX = __importStar(require("../getCertFromPFX"));
|
|
18
41
|
const logger_1 = __importDefault(require("../logger"));
|
|
19
42
|
const test_utils_1 = require("./test-utils");
|
|
20
43
|
const wipeOpts = {
|
|
@@ -26,15 +49,18 @@ const wipeOpts = {
|
|
|
26
49
|
};
|
|
27
50
|
describe("wipe", () => {
|
|
28
51
|
it("should wipe the backend", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
29
|
-
const spy = jest.spyOn(
|
|
52
|
+
const spy = jest.spyOn(getCertFromPFX, "default").mockResolvedValue({
|
|
53
|
+
cert: Buffer.from("abcde"),
|
|
54
|
+
key: Buffer.from("12345"),
|
|
55
|
+
});
|
|
30
56
|
yield wipe_1.default.run(wipeOpts);
|
|
31
57
|
expect(spy).toHaveBeenCalledTimes(1);
|
|
32
58
|
expect(vault_common_1.wipeBackend).toHaveBeenCalledWith({
|
|
33
59
|
gate: wipeOpts.gate,
|
|
34
60
|
hsmCompartmentID: wipeOpts.compartment,
|
|
35
61
|
hsmEndpoint: wipeOpts.hsm,
|
|
36
|
-
hsmCert: "
|
|
37
|
-
|
|
62
|
+
hsmCert: Buffer.from("abcde"),
|
|
63
|
+
hsmCertKey: Buffer.from("12345"),
|
|
38
64
|
}, { logger: logger_1.default });
|
|
39
65
|
spy.mockRestore();
|
|
40
66
|
}));
|
|
@@ -44,11 +70,5 @@ describe("wipe", () => {
|
|
|
44
70
|
options: Object.assign(Object.assign({}, wipeOpts), { hsmCert: "" }),
|
|
45
71
|
errorMessage: "You must specify the path to your HSM certificate in your environment variable VAULT_HSM_CLIENT_CERT_PATH or use the --hsmCert flag",
|
|
46
72
|
});
|
|
47
|
-
(0, test_utils_1.testErrorCommand)({
|
|
48
|
-
description: "should throw if HSM certificate file is not found",
|
|
49
|
-
task: wipe_1.default.run,
|
|
50
|
-
options: Object.assign(Object.assign({}, wipeOpts), { hsmCert: "<hsmCert>" }),
|
|
51
|
-
errorMessage: "Invalid path for hsmCert: <hsmCert>",
|
|
52
|
-
});
|
|
53
73
|
});
|
|
54
74
|
//# sourceMappingURL=wipe.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wipe.test.js","sourceRoot":"","sources":["../../src/__tests__/wipe.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wipe.test.js","sourceRoot":"","sources":["../../src/__tests__/wipe.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAqD;AAGrD,4DAAoC;AACpC,kEAAoD;AACpD,uDAA+B;AAC/B,6CAAgD;AAEhD,MAAM,QAAQ,GAAuB;IACnC,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,EAAE;IACf,GAAG,EAAE,OAAO;IACZ,OAAO,EAAE,WAAW;IACpB,eAAe,EAAE,mBAAmB;CACrC,CAAC;AAEF,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,EAAE,CAAC,yBAAyB,EAAE,GAAS,EAAE;QACvC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC,iBAAiB,CAAC;YAClE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YAC1B,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SAC1B,CAAC,CAAC;QACH,MAAM,cAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzB,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,CAAC,0BAAW,CAAC,CAAC,oBAAoB,CACtC;YACE,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,gBAAgB,EAAE,QAAQ,CAAC,WAAW;YACtC,WAAW,EAAE,QAAQ,CAAC,GAAG;YACzB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;YAC7B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACjC,EACD,EAAE,MAAM,EAAN,gBAAM,EAAE,CACX,CAAC;QACF,GAAG,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC,CAAA,CAAC,CAAC;IAEH,IAAA,6BAAgB,EAAC;QACf,WAAW,EAAE,+CAA+C;QAC5D,IAAI,EAAE,cAAI,CAAC,GAAG;QACd,OAAO,kCAAO,QAAQ,KAAE,OAAO,EAAE,EAAE,GAAE;QACrC,YAAY,EACV,qIAAqI;KACxI,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backupCompartment.d.ts","sourceRoot":"","sources":["../../src/commands/backupCompartment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"backupCompartment.d.ts","sourceRoot":"","sources":["../../src/commands/backupCompartment.ts"],"names":[],"mappings":"AAIA,oBAAY,OAAO,GAAG;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;;;;;;;;;;;;;;;;;;;;;;mBAyCqB,OAAO,KAAG,QAAQ,IAAI,CAAC;;AAvC9C,wBA0DE"}
|
|
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const createHSMBridge_1 = __importDefault(require("@ledgerhq/vault-common/lib/createHSMBridge"));
|
|
16
|
-
const
|
|
16
|
+
const getCertFromPFX_1 = __importDefault(require("../getCertFromPFX"));
|
|
17
17
|
exports.default = {
|
|
18
18
|
command: "backupCompartment",
|
|
19
19
|
description: "Backup HSM simu compartment",
|
|
@@ -57,17 +57,11 @@ exports.default = {
|
|
|
57
57
|
if (!options.hsmCert) {
|
|
58
58
|
throw new Error("You must specify the path to your HSM certificate in your environment variable VAULT_HSM_CLIENT_CERT_PATH or use the --hsmCert flag");
|
|
59
59
|
}
|
|
60
|
-
|
|
61
|
-
try {
|
|
62
|
-
hsmCert = fs_1.default.readFileSync(options.hsmCert);
|
|
63
|
-
}
|
|
64
|
-
catch (_a) {
|
|
65
|
-
throw new Error(`Invalid path for hsmCert: ${options.hsmCert}`);
|
|
66
|
-
}
|
|
60
|
+
const cert = yield (0, getCertFromPFX_1.default)(options.hsmCert, options.hsmCertPassword);
|
|
67
61
|
const bridge = (0, createHSMBridge_1.default)({
|
|
68
|
-
hsmCert,
|
|
62
|
+
hsmCert: cert.cert,
|
|
63
|
+
hsmCertKey: cert.key,
|
|
69
64
|
hsmEndpoint: options.hsm,
|
|
70
|
-
hsmCertPassword: options.hsmCertPassword,
|
|
71
65
|
});
|
|
72
66
|
const backup = yield bridge.backupCompartment(options.compartment);
|
|
73
67
|
console.log(JSON.stringify(backup));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backupCompartment.js","sourceRoot":"","sources":["../../src/commands/backupCompartment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iGAAyE;
|
|
1
|
+
{"version":3,"file":"backupCompartment.js","sourceRoot":"","sources":["../../src/commands/backupCompartment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iGAAyE;AAEzE,uEAA+C;AAS/C,kBAAe;IACb,OAAO,EAAE,mBAAmB;IAC5B,WAAW,EAAE,6BAA6B;IAC1C,IAAI,EAAE;QACJ;YACE,OAAO,EAAE,mDAAmD;SAC7D;KACF;IACD,OAAO,EAAE;QACP;YACE,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,iDAAiD;YAC9D,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAC9C,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,yCAAyC;YACtD,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;YAC5C,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,4DAA4D;YACzE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;YACpD,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,4DAA4D;YACzE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;YACnD,QAAQ,EAAE,IAAI;SACf;KACF;IACD,GAAG,EAAE,CAAO,OAAgB,EAAiB,EAAE;QAC7C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,MAAM,IAAI,KAAK,CACb,qIAAqI,CACtI,CAAC;SACH;QAED,MAAM,IAAI,GAAG,MAAM,IAAA,wBAAc,EAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAE5E,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC;YAC7B,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,UAAU,EAAE,IAAI,CAAC,GAAG;YACpB,WAAW,EAAE,OAAO,CAAC,GAAG;SACzB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEnE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACtC,CAAC,CAAA;CACF,CAAC"}
|
package/bin/commands/deploy.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ declare type DeployCommandOptions = {
|
|
|
5
5
|
expirationHours?: number;
|
|
6
6
|
preset?: string;
|
|
7
7
|
values?: string;
|
|
8
|
+
watchTimeoutMinutes?: number;
|
|
8
9
|
};
|
|
9
10
|
export declare const deployCommand: (options: DeployCommandOptions) => Promise<void>;
|
|
10
11
|
declare const _default: {
|
|
@@ -38,6 +39,12 @@ declare const _default: {
|
|
|
38
39
|
type: StringConstructor;
|
|
39
40
|
defaultValue: string;
|
|
40
41
|
required?: undefined;
|
|
42
|
+
} | {
|
|
43
|
+
name: string;
|
|
44
|
+
description: string;
|
|
45
|
+
type: NumberConstructor;
|
|
46
|
+
defaultValue: number;
|
|
47
|
+
required?: undefined;
|
|
41
48
|
})[];
|
|
42
49
|
run: (options: DeployCommandOptions) => Promise<void>;
|
|
43
50
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAUA,aAAK,oBAAoB,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAUA,aAAK,oBAAoB,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,aAAa,YAAmB,oBAAoB,KAAG,QAAQ,IAAI,CAuB/E,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,wBAwDE"}
|
package/bin/commands/deploy.js
CHANGED
|
@@ -21,7 +21,7 @@ const deployCommand = (options) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
21
21
|
if (options.values) {
|
|
22
22
|
values = JSON.parse(options.values);
|
|
23
23
|
}
|
|
24
|
-
const deployOptions = Object.assign(Object.assign(Object.assign({ remoteURL: options.remoteURL, name: options.name, owner: options.owner }, (options.preset ? { preset: options.preset } : {})), (values ? { values } : {})), (options.expirationHours
|
|
24
|
+
const deployOptions = Object.assign(Object.assign(Object.assign({ remoteURL: options.remoteURL, name: options.name, owner: options.owner, watchTimeoutMinutes: options.watchTimeoutMinutes }, (options.preset ? { preset: options.preset } : {})), (values ? { values } : {})), (options.expirationHours
|
|
25
25
|
? {
|
|
26
26
|
expireOn: (0, moment_1.default)().add(options.expirationHours, "hours").toDate(),
|
|
27
27
|
}
|
|
@@ -81,6 +81,12 @@ exports.default = {
|
|
|
81
81
|
type: String,
|
|
82
82
|
defaultValue: vault_common_1.DEFAULT_VAULT_REMOTE_URL,
|
|
83
83
|
},
|
|
84
|
+
{
|
|
85
|
+
name: "watchTimeoutMinutes",
|
|
86
|
+
description: `Stop watching and throw after the given elapsed minutes {grey (default: 10)}`,
|
|
87
|
+
type: Number,
|
|
88
|
+
defaultValue: 10,
|
|
89
|
+
},
|
|
84
90
|
],
|
|
85
91
|
run: exports.deployCommand,
|
|
86
92
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAKgC;AAChC,oDAA4B;AAE5B,uDAA+B;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAKgC;AAChC,oDAA4B;AAE5B,uDAA+B;AAYxB,MAAM,aAAa,GAAG,CAAO,OAA6B,EAAiB,EAAE;IAClF,IAAI,MAAM,GAAsB,IAAI,CAAC;IACrC,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAe,CAAC;KACnD;IACD,MAAM,aAAa,+CACjB,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,IAC7C,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAClD,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAC1B,CAAC,OAAO,CAAC,eAAe;QACzB,CAAC,CAAC;YACE,QAAQ,EAAE,IAAA,gBAAM,GAAE,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE;SAClE;QACH,CAAC,CAAC,EAAE,CAAC,CACR,CAAC;IACF,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAA,qBAAM,EAAC,aAAa,EAAE,EAAE,MAAM,EAAN,gBAAM,EAAE,CAAC,CAAC;IACxD,gBAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAChC,gBAAM,CAAC,IAAI,CAAC,uCAAuC,GAAG,EAAE,CAAC,CAAC;IAC1D,gBAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IACzC,gBAAM,CAAC,IAAI,CAAC,qDAAqD,GAAG,EAAE,CAAC,CAAC;AAC1E,CAAC,CAAA,CAAC;AAvBW,QAAA,aAAa,iBAuBxB;AAEF,kBAAe;IACb,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,oDAAoD;IACjE,IAAI,EAAE;QACJ;YACE,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE;gBACP,qDAAqD;gBACrD,2HAA2H;gBAC3H,yEAAyE;aAC1E;SACF;KACF;IACD,OAAO,EAAE;QACP;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,0EAA0E;YACvF,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,yBAAyB;YACtC,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,WAAW,EAAE,yCAAyC;YACtD,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;SAChB;QACD;YACE,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,yBAAyB;YACtC,IAAI,EAAE,MAAM;SACb;QACD;YACE,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,qCAAqC;YAClD,IAAI,EAAE,MAAM;SACb;QACD;YACE,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,oCAAoC,uCAAwB,IAAI;YAC7E,IAAI,EAAE,MAAM;YACZ,YAAY,EAAE,uCAAwB;SACvC;QACD;YACE,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE,8EAA8E;YAC3F,IAAI,EAAE,MAAM;YACZ,YAAY,EAAE,EAAE;SACjB;KACF;IACD,GAAG,EAAE,qBAAa;CACnB,CAAC"}
|
package/bin/commands/index.d.ts
CHANGED
|
@@ -155,6 +155,12 @@ declare const _default: {
|
|
|
155
155
|
type: StringConstructor;
|
|
156
156
|
defaultValue: string;
|
|
157
157
|
required?: undefined;
|
|
158
|
+
} | {
|
|
159
|
+
name: string;
|
|
160
|
+
description: string;
|
|
161
|
+
type: NumberConstructor;
|
|
162
|
+
defaultValue: number;
|
|
163
|
+
required?: undefined;
|
|
158
164
|
})[];
|
|
159
165
|
run: (options: {
|
|
160
166
|
remoteURL: string;
|
|
@@ -163,6 +169,7 @@ declare const _default: {
|
|
|
163
169
|
expirationHours?: number | undefined;
|
|
164
170
|
preset?: string | undefined;
|
|
165
171
|
values?: string | undefined;
|
|
172
|
+
watchTimeoutMinutes?: number | undefined;
|
|
166
173
|
}) => Promise<void>;
|
|
167
174
|
} | {
|
|
168
175
|
command: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgEA,wBAkCE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restoreCompartment.d.ts","sourceRoot":"","sources":["../../src/commands/restoreCompartment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"restoreCompartment.d.ts","sourceRoot":"","sources":["../../src/commands/restoreCompartment.ts"],"names":[],"mappings":"AAMA,oBAAY,OAAO,GAAG;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAgDqB,OAAO,KAAG,QAAQ,IAAI,CAAC;;AA9C9C,wBAkEE"}
|
|
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const createHSMBridge_1 = __importDefault(require("@ledgerhq/vault-common/lib/createHSMBridge"));
|
|
16
16
|
const fs_1 = __importDefault(require("fs"));
|
|
17
|
+
const getCertFromPFX_1 = __importDefault(require("../getCertFromPFX"));
|
|
17
18
|
const logger_1 = __importDefault(require("../logger"));
|
|
18
19
|
exports.default = {
|
|
19
20
|
command: "restoreCompartment",
|
|
@@ -65,17 +66,11 @@ exports.default = {
|
|
|
65
66
|
if (!options.hsmCert) {
|
|
66
67
|
throw new Error("You must specify the path to your HSM certificate in your environment variable VAULT_HSM_CLIENT_CERT_PATH or use the --hsmCert flag");
|
|
67
68
|
}
|
|
68
|
-
|
|
69
|
-
try {
|
|
70
|
-
hsmCert = fs_1.default.readFileSync(options.hsmCert);
|
|
71
|
-
}
|
|
72
|
-
catch (_a) {
|
|
73
|
-
throw new Error(`Invalid path for hsmCert: ${options.hsmCert}`);
|
|
74
|
-
}
|
|
69
|
+
const cert = yield (0, getCertFromPFX_1.default)(options.hsmCert, options.hsmCertPassword);
|
|
75
70
|
const bridge = (0, createHSMBridge_1.default)({
|
|
76
|
-
hsmCert,
|
|
71
|
+
hsmCert: cert.cert,
|
|
72
|
+
hsmCertKey: cert.key,
|
|
77
73
|
hsmEndpoint: options.hsm,
|
|
78
|
-
hsmCertPassword: options.hsmCertPassword,
|
|
79
74
|
});
|
|
80
75
|
const fileContent = fs_1.default.readFileSync(options.backupFile, "utf-8");
|
|
81
76
|
const backup = JSON.parse(fileContent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restoreCompartment.js","sourceRoot":"","sources":["../../src/commands/restoreCompartment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iGAAyE;AACzE,4CAAoB;AAEpB,uDAA+B;AAU/B,kBAAe;IACb,OAAO,EAAE,oBAAoB;IAC7B,WAAW,EAAE,8BAA8B;IAC3C,IAAI,EAAE;QACJ;YACE,OAAO,EAAE,6EAA6E;SACvF;KACF;IACD,OAAO,EAAE;QACP;YACE,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,iDAAiD;YAC9D,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAC9C,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,wEAAwE;YACrF,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,yCAAyC;YACtD,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;YAC5C,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,4DAA4D;YACzE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;YACpD,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,4DAA4D;YACzE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;YACnD,QAAQ,EAAE,IAAI;SACf;KACF;IACD,GAAG,EAAE,CAAO,OAAgB,EAAiB,EAAE;QAC7C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,MAAM,IAAI,KAAK,CACb,qIAAqI,CACtI,CAAC;SACH;QAED,
|
|
1
|
+
{"version":3,"file":"restoreCompartment.js","sourceRoot":"","sources":["../../src/commands/restoreCompartment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iGAAyE;AACzE,4CAAoB;AAEpB,uEAA+C;AAC/C,uDAA+B;AAU/B,kBAAe;IACb,OAAO,EAAE,oBAAoB;IAC7B,WAAW,EAAE,8BAA8B;IAC3C,IAAI,EAAE;QACJ;YACE,OAAO,EAAE,6EAA6E;SACvF;KACF;IACD,OAAO,EAAE;QACP;YACE,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,iDAAiD;YAC9D,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAC9C,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,wEAAwE;YACrF,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,yCAAyC;YACtD,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;YAC5C,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,4DAA4D;YACzE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;YACpD,QAAQ,EAAE,IAAI;SACf;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,4DAA4D;YACzE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;YACnD,QAAQ,EAAE,IAAI;SACf;KACF;IACD,GAAG,EAAE,CAAO,OAAgB,EAAiB,EAAE;QAC7C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,MAAM,IAAI,KAAK,CACb,qIAAqI,CACtI,CAAC;SACH;QAED,MAAM,IAAI,GAAG,MAAM,IAAA,wBAAc,EAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAE5E,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC;YAC7B,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,UAAU,EAAE,IAAI,CAAC,GAAG;YACpB,WAAW,EAAE,OAAO,CAAC,GAAG;SACzB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,YAAE,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEvC,MAAM,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,MAAM,EAAN,gBAAM,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAA;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wipe.d.ts","sourceRoot":"","sources":["../../src/commands/wipe.ts"],"names":[],"mappings":"AAMA,oBAAY,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IAEb,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"wipe.d.ts","sourceRoot":"","sources":["../../src/commands/wipe.ts"],"names":[],"mappings":"AAMA,oBAAY,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IAEb,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAsB,IAAI,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBrE;AAED,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;IAoCvB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,wBAME"}
|
package/bin/commands/wipe.js
CHANGED
|
@@ -1,34 +1,39 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
13
|
};
|
|
5
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
15
|
exports.wipeOptions = exports.wipe = void 0;
|
|
7
16
|
const vault_common_1 = require("@ledgerhq/vault-common");
|
|
8
|
-
const fs_1 = __importDefault(require("fs"));
|
|
9
17
|
const gateOptions_1 = require("../gateOptions");
|
|
18
|
+
const getCertFromPFX_1 = __importDefault(require("../getCertFromPFX"));
|
|
10
19
|
const logger_1 = __importDefault(require("../logger"));
|
|
11
20
|
function wipe(options) {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
monotonicCountersSize: options.monotonicCountersSize,
|
|
29
|
-
fileSystemSize: options.fileSystemSize,
|
|
30
|
-
};
|
|
31
|
-
return (0, vault_common_1.wipeBackend)(wipeOptions, { logger: logger_1.default });
|
|
21
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
if (!options.hsmCert) {
|
|
23
|
+
throw new Error("You must specify the path to your HSM certificate in your environment variable VAULT_HSM_CLIENT_CERT_PATH or use the --hsmCert flag");
|
|
24
|
+
}
|
|
25
|
+
const cert = yield (0, getCertFromPFX_1.default)(options.hsmCert, options.hsmCertPassword);
|
|
26
|
+
const wipeOptions = {
|
|
27
|
+
gate: options.gate,
|
|
28
|
+
hsmCompartmentID: options.compartment,
|
|
29
|
+
hsmEndpoint: options.hsm,
|
|
30
|
+
hsmCert: cert.cert,
|
|
31
|
+
hsmCertKey: cert.key,
|
|
32
|
+
monotonicCountersSize: options.monotonicCountersSize,
|
|
33
|
+
fileSystemSize: options.fileSystemSize,
|
|
34
|
+
};
|
|
35
|
+
return (0, vault_common_1.wipeBackend)(wipeOptions, { logger: logger_1.default });
|
|
36
|
+
});
|
|
32
37
|
}
|
|
33
38
|
exports.wipe = wipe;
|
|
34
39
|
exports.wipeOptions = [
|
package/bin/commands/wipe.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wipe.js","sourceRoot":"","sources":["../../src/commands/wipe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wipe.js","sourceRoot":"","sources":["../../src/commands/wipe.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAkE;AAElE,gDAA+D;AAC/D,uEAA+C;AAC/C,uDAA+B;AAc/B,SAAsB,IAAI,CAAC,OAA2B;;QACpD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,MAAM,IAAI,KAAK,CACb,qIAAqI,CACtI,CAAC;SACH;QAED,MAAM,IAAI,GAAG,MAAM,IAAA,wBAAc,EAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAE5E,MAAM,WAAW,GAAgB;YAC/B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,gBAAgB,EAAE,OAAO,CAAC,WAAW;YACrC,WAAW,EAAE,OAAO,CAAC,GAAG;YACxB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,UAAU,EAAE,IAAI,CAAC,GAAG;YACpB,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;YACpD,cAAc,EAAE,OAAO,CAAC,cAAc;SACvC,CAAC;QACF,OAAO,IAAA,0BAAW,EAAC,WAAW,EAAE,EAAE,MAAM,EAAN,gBAAM,EAAE,CAAC,CAAC;IAC9C,CAAC;CAAA;AAnBD,oBAmBC;AAEY,QAAA,WAAW,GAAG;IACzB;QACE,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,iDAAiD;QAC9D,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;KAC/C;IACD;QACE,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,yCAAyC;QACtD,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;KAC7C;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,4DAA4D;QACzE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;KACrD;IACD;QACE,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,4DAA4D;QACzE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;KACpD;IACD;QACE,IAAI,EAAE,uBAAuB;QAC7B,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,4BAA4B;KAC1C;IACD;QACE,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,qBAAqB;KACnC;CACF,CAAC;AAEF,kBAAe;IACb,OAAO,EAAE,MAAM;IACf,WAAW,EAAE,oDAAoD;IACjE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,sCAAsC,EAAE,CAAC;IAC3D,OAAO,EAAE,CAAC,yBAAW,EAAE,8BAAgB,EAAE,GAAG,mBAAW,CAAC;IACxD,GAAG,EAAE,IAAI;CACV,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getCertFromPFX.d.ts","sourceRoot":"","sources":["../src/getCertFromPFX.ts"],"names":[],"mappings":";AAGA,oBAAY,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAQF,wBAA8B,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB/F"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const fs_1 = __importDefault(require("fs"));
|
|
16
|
+
const pem_1 = __importDefault(require("pem"));
|
|
17
|
+
function pemReady() {
|
|
18
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
19
|
+
yield new Promise((r) => setTimeout(r, 500));
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
function getCertFromPFX(pfxPath, passphrase) {
|
|
23
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
+
yield pemReady();
|
|
25
|
+
const cert = yield new Promise((resolve, reject) => {
|
|
26
|
+
pem_1.default.readPkcs12(fs_1.default.readFileSync(pfxPath), { p12Password: passphrase }, (err, cert) => {
|
|
27
|
+
if (err) {
|
|
28
|
+
return reject(err);
|
|
29
|
+
}
|
|
30
|
+
resolve({
|
|
31
|
+
cert: Buffer.from(cert.cert),
|
|
32
|
+
key: Buffer.from(cert.key),
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
return cert;
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
exports.default = getCertFromPFX;
|
|
40
|
+
//# sourceMappingURL=getCertFromPFX.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getCertFromPFX.js","sourceRoot":"","sources":["../src/getCertFromPFX.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,8CAAsB;AAOtB,SAAe,QAAQ;;QAGrB,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;CAAA;AAED,SAA8B,cAAc,CAAC,OAAe,EAAE,UAAkB;;QAG9E,MAAM,QAAQ,EAAE,CAAC;QAEjB,MAAM,IAAI,GAAS,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACvD,aAAG,CAAC,UAAU,CAAC,YAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBAClF,IAAI,GAAG,EAAE;oBACP,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;iBACpB;gBACD,OAAO,CAAC;oBACN,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC5B,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;iBAC3B,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAlBD,iCAkBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/vault-cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.17.0",
|
|
4
4
|
"description": "A various utility command-line for Vault development",
|
|
5
5
|
"homepage": "https://github.com/LedgerHQ/vault-ts",
|
|
6
6
|
"license": "BSD-2-Clause",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"@ledgerhq/cryptoassets": "^6.28.2",
|
|
19
19
|
"@ledgerhq/hw-transport-node-hid": "^6.24.1",
|
|
20
20
|
"@ledgerhq/live-common-stub": "1.4.6",
|
|
21
|
-
"@ledgerhq/vault-common": "1.
|
|
21
|
+
"@ledgerhq/vault-common": "1.19.0",
|
|
22
22
|
"axios": "^0.21.0",
|
|
23
23
|
"bignumber.js": "^9.0.1",
|
|
24
24
|
"body-parser": "^1.19.0",
|
|
@@ -30,6 +30,7 @@
|
|
|
30
30
|
"express": "^4.17.1",
|
|
31
31
|
"lodash": "^4.17.21",
|
|
32
32
|
"moment": "^2.29.1",
|
|
33
|
+
"pem": "github:Dexus/pem#71dae3346801dafb5a8bcebcd4c7267fd182666f",
|
|
33
34
|
"prettier": "^2.1.1",
|
|
34
35
|
"progress": "^2.0.3",
|
|
35
36
|
"qs": "^6.10.1",
|
|
@@ -47,6 +48,7 @@
|
|
|
47
48
|
"@types/jest": "^28.1.4",
|
|
48
49
|
"@types/lodash": "^4.14.182",
|
|
49
50
|
"@types/node": "^15.0.2",
|
|
51
|
+
"@types/pem": "^1.9.6",
|
|
50
52
|
"@types/progress": "^2.0.3",
|
|
51
53
|
"@types/qs": "^6.9.7",
|
|
52
54
|
"@types/shortid": "^0.0.29",
|