@p0security/cli 0.26.9 → 0.26.10
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/build/dist/commands/shared/request.d.ts +2 -0
- package/build/dist/commands/shared/request.js +30 -19
- package/build/dist/commands/shared/request.js.map +1 -1
- package/build/dist/commands/ssh-resolve.js +7 -0
- package/build/dist/commands/ssh-resolve.js.map +1 -1
- package/build/dist/drivers/api.d.ts +1 -1
- package/build/dist/drivers/api.js +15 -25
- package/build/dist/drivers/api.js.map +1 -1
- package/build/dist/drivers/constants.d.ts +7 -0
- package/build/dist/drivers/constants.js +24 -0
- package/build/dist/drivers/constants.js.map +1 -0
- package/build/dist/drivers/util.d.ts +1 -0
- package/build/dist/drivers/util.js +4 -1
- package/build/dist/drivers/util.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -4,6 +4,7 @@ import yargs from "yargs";
|
|
|
4
4
|
export declare const PROVISIONING_ACCESS_MESSAGE = "Waiting for access to be provisioned";
|
|
5
5
|
export declare const EXISTING_ACCESS_MESSAGE = "Existing access found.";
|
|
6
6
|
export declare const ACCESS_EXISTS_ERROR_MESSAGE = "This principal already has this access";
|
|
7
|
+
export declare const ACCESS_WAIT_TIMEOUT_ERROR_MESSAGE = "Failed waiting for access to be resolved";
|
|
7
8
|
export declare const requestArgs: <T>(yargs: yargs.Argv<T>) => yargs.Argv<T & {
|
|
8
9
|
wait: boolean;
|
|
9
10
|
} & {
|
|
@@ -18,6 +19,7 @@ export declare const request: (command: "grant" | "request") => <T>(args: yargs.
|
|
|
18
19
|
}>, authn?: Authn, options?: {
|
|
19
20
|
accessMessage?: string;
|
|
20
21
|
message?: "all" | "approval-required" | "none" | "quiet";
|
|
22
|
+
timeOut?: number;
|
|
21
23
|
}) => Promise<RequestResponse<T> | undefined>;
|
|
22
24
|
export declare const provisionRequest: (argv: yargs.ArgumentsCamelCase<{
|
|
23
25
|
arguments: string[];
|
|
@@ -16,7 +16,7 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
|
16
16
|
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
17
17
|
};
|
|
18
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
-
exports.provisionRequest = exports.request = exports.requestArgs = exports.ACCESS_EXISTS_ERROR_MESSAGE = exports.EXISTING_ACCESS_MESSAGE = exports.PROVISIONING_ACCESS_MESSAGE = void 0;
|
|
19
|
+
exports.provisionRequest = exports.request = exports.requestArgs = exports.ACCESS_WAIT_TIMEOUT_ERROR_MESSAGE = exports.ACCESS_EXISTS_ERROR_MESSAGE = exports.EXISTING_ACCESS_MESSAGE = exports.PROVISIONING_ACCESS_MESSAGE = void 0;
|
|
20
20
|
/** Copyright © 2024-present P0 Security
|
|
21
21
|
|
|
22
22
|
This file is part of @p0security/cli
|
|
@@ -27,15 +27,21 @@ This file is part of @p0security/cli
|
|
|
27
27
|
|
|
28
28
|
You should have received a copy of the GNU General Public License along with @p0security/cli. If not, see <https://www.gnu.org/licenses/>.
|
|
29
29
|
**/
|
|
30
|
+
const retry_1 = require("../../common/retry");
|
|
30
31
|
const api_1 = require("../../drivers/api");
|
|
31
32
|
const auth_1 = require("../../drivers/auth");
|
|
33
|
+
const constants_1 = require("../../drivers/constants");
|
|
32
34
|
const stdio_1 = require("../../drivers/stdio");
|
|
33
35
|
const otel_helpers_1 = require("../../opentelemetry/otel-helpers");
|
|
36
|
+
const util_1 = require("../../util");
|
|
34
37
|
const api_2 = require("@opentelemetry/api");
|
|
35
38
|
const typescript_1 = require("typescript");
|
|
36
39
|
exports.PROVISIONING_ACCESS_MESSAGE = "Waiting for access to be provisioned";
|
|
37
40
|
exports.EXISTING_ACCESS_MESSAGE = "Existing access found.";
|
|
38
41
|
exports.ACCESS_EXISTS_ERROR_MESSAGE = "This principal already has this access";
|
|
42
|
+
exports.ACCESS_WAIT_TIMEOUT_ERROR_MESSAGE = "Failed waiting for access to be resolved";
|
|
43
|
+
// 10 minutes of max request timeout including retries
|
|
44
|
+
const MAX_REQUEST_TIMEOUT = 10 * 60 * 1000;
|
|
39
45
|
const APPROVED = { message: "Your request was approved", code: 0 };
|
|
40
46
|
const DENIED = { message: "Your request was denied", code: 2 };
|
|
41
47
|
const ERRORED = { message: "Your request encountered an error", code: 1 };
|
|
@@ -132,33 +138,30 @@ const request = (command) => (args, authn, options) => __awaiter(void 0, void 0,
|
|
|
132
138
|
throw data;
|
|
133
139
|
}
|
|
134
140
|
};
|
|
141
|
+
const executeAndProcessApiRequest = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
142
|
+
const fetchCommandPromise = (0, retry_1.retryWithSleep)(() => (0, api_1.fetchCommand)(resolvedAuthn, args, [
|
|
143
|
+
command,
|
|
144
|
+
...args.arguments,
|
|
145
|
+
]), constants_1.RETRY_OPTIONS);
|
|
146
|
+
return processResponse(yield executeApiRequest(fetchCommandPromise));
|
|
147
|
+
});
|
|
135
148
|
const invokeRequest = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
136
|
-
const
|
|
137
|
-
const response = yield executeApiRequest(fetchCommandPromise);
|
|
138
|
-
const { data, shouldLogMessage } = processResponse(response);
|
|
149
|
+
const { data, shouldLogMessage } = yield executeAndProcessApiRequest();
|
|
139
150
|
if (shouldLogMessage)
|
|
140
151
|
(0, stdio_1.print2)(data.message);
|
|
141
152
|
return data;
|
|
142
153
|
});
|
|
143
154
|
const executeStreamingRequest = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
144
155
|
var _a, e_1, _b, _c;
|
|
145
|
-
const
|
|
146
|
-
const getNextPermissionRequestChunk = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
147
|
-
const generatedValue = yield fetchStreamingCommandGenerator.next();
|
|
148
|
-
if (generatedValue.done) {
|
|
149
|
-
return undefined;
|
|
150
|
-
}
|
|
151
|
-
return generatedValue.value;
|
|
152
|
-
});
|
|
153
|
-
const firstChunk = yield executeApiRequest(getNextPermissionRequestChunk());
|
|
154
|
-
const { data, shouldLogMessage } = processResponse(firstChunk);
|
|
156
|
+
const { data, shouldLogMessage } = yield executeAndProcessApiRequest();
|
|
155
157
|
if (shouldLogMessage) {
|
|
156
158
|
(0, stdio_1.print2)(data.message);
|
|
157
159
|
(0, stdio_1.print2)("Will wait up to 5 minutes for this request to complete...");
|
|
158
160
|
}
|
|
161
|
+
const fetchStreamingStatusGenerator = (0, api_1.fetchStreamingStatus)(resolvedAuthn, data.id, args.debug);
|
|
159
162
|
try {
|
|
160
|
-
for (var _d = true,
|
|
161
|
-
_c =
|
|
163
|
+
for (var _d = true, fetchStreamingStatusGenerator_1 = __asyncValues(fetchStreamingStatusGenerator), fetchStreamingStatusGenerator_1_1; fetchStreamingStatusGenerator_1_1 = yield fetchStreamingStatusGenerator_1.next(), _a = fetchStreamingStatusGenerator_1_1.done, !_a;) {
|
|
164
|
+
_c = fetchStreamingStatusGenerator_1_1.value;
|
|
162
165
|
_d = false;
|
|
163
166
|
try {
|
|
164
167
|
const chunkData = _c;
|
|
@@ -170,7 +173,7 @@ const request = (command) => (args, authn, options) => __awaiter(void 0, void 0,
|
|
|
170
173
|
typescript_1.sys.exit(code);
|
|
171
174
|
return undefined;
|
|
172
175
|
}
|
|
173
|
-
return chunkData;
|
|
176
|
+
return Object.assign(Object.assign({}, data), chunkData);
|
|
174
177
|
}
|
|
175
178
|
finally {
|
|
176
179
|
_d = true;
|
|
@@ -180,14 +183,22 @@ const request = (command) => (args, authn, options) => __awaiter(void 0, void 0,
|
|
|
180
183
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
181
184
|
finally {
|
|
182
185
|
try {
|
|
183
|
-
if (!_d && !_a && (_b =
|
|
186
|
+
if (!_d && !_a && (_b = fetchStreamingStatusGenerator_1.return)) yield _b.call(fetchStreamingStatusGenerator_1);
|
|
184
187
|
}
|
|
185
188
|
finally { if (e_1) throw e_1.error; }
|
|
186
189
|
}
|
|
187
190
|
throw data;
|
|
188
191
|
});
|
|
192
|
+
const timeoutOperation = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
193
|
+
var _e;
|
|
194
|
+
yield (0, util_1.sleep)((_e = options === null || options === void 0 ? void 0 : options.timeOut) !== null && _e !== void 0 ? _e : MAX_REQUEST_TIMEOUT);
|
|
195
|
+
throw exports.ACCESS_WAIT_TIMEOUT_ERROR_MESSAGE;
|
|
196
|
+
});
|
|
189
197
|
try {
|
|
190
|
-
return yield
|
|
198
|
+
return yield Promise.race([
|
|
199
|
+
!args.wait ? invokeRequest() : executeStreamingRequest(),
|
|
200
|
+
timeoutOperation(),
|
|
201
|
+
]);
|
|
191
202
|
}
|
|
192
203
|
catch (error) {
|
|
193
204
|
if (error instanceof Error && error.name === "TimeoutError") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../src/commands/shared/request.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../src/commands/shared/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ const destination_1 = require("../common/destination");
|
|
|
27
27
|
const keys_1 = require("../common/keys");
|
|
28
28
|
const auth_1 = require("../drivers/auth");
|
|
29
29
|
const stdio_1 = require("../drivers/stdio");
|
|
30
|
+
const otel_helpers_1 = require("../opentelemetry/otel-helpers");
|
|
30
31
|
const util_1 = require("../util");
|
|
31
32
|
const ssh_1 = require("./shared/ssh");
|
|
32
33
|
const ssh_cleanup_1 = require("./shared/ssh-cleanup");
|
|
@@ -152,6 +153,12 @@ const sshResolveAction = (args) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
152
153
|
(0, stdio_1.print2)(data);
|
|
153
154
|
}
|
|
154
155
|
fs_1.default.writeFileSync(configLocation, data);
|
|
156
|
+
// Force exit to prevent hanging due to orphaned child processes (e.g., session-manager-plugin)
|
|
157
|
+
// holding open file descriptors. See: https://github.com/aws/amazon-ssm-agent/issues/173
|
|
158
|
+
// Skip in tests to avoid killing the test runner
|
|
159
|
+
if (process.env.NODE_ENV !== "unit") {
|
|
160
|
+
(0, otel_helpers_1.exitProcess)(0);
|
|
161
|
+
}
|
|
155
162
|
});
|
|
156
163
|
exports.sshResolveAction = sshResolveAction;
|
|
157
164
|
//# sourceMappingURL=ssh-resolve.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-resolve.js","sourceRoot":"","sources":["../../../src/commands/ssh-resolve.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ssh-resolve.js","sourceRoot":"","sources":["../../../src/commands/ssh-resolve.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export declare const tracesUrl: (tenant: string) => string;
|
|
|
4
4
|
export declare const fetchOrgData: <T>(orgId: string) => Promise<T>;
|
|
5
5
|
export declare const fetchAccountInfo: <T>(authn: Authn, debug?: boolean) => Promise<T>;
|
|
6
6
|
export declare const fetchIntegrationConfig: <T>(authn: Authn, integration: string, debug?: boolean) => Promise<T>;
|
|
7
|
-
export declare const
|
|
7
|
+
export declare const fetchStreamingStatus: <T>(authn: Authn, requestId: string, debug?: boolean) => AsyncGenerator<Awaited<NonNullable<T>>, void, unknown>;
|
|
8
8
|
export declare const fetchCommand: <T>(authn: Authn, args: yargs.ArgumentsCamelCase<{
|
|
9
9
|
debug?: boolean;
|
|
10
10
|
}>, argv: string[]) => Promise<T>;
|
|
@@ -56,7 +56,7 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
|
|
|
56
56
|
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
57
57
|
};
|
|
58
58
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
59
|
-
exports.auditSshSessionActivity = exports.fetchWithStreaming = exports.certificateSigningRequest = exports.fetchSshHostKeys = exports.submitPublicKey = exports.fetchAdminLsCommand = exports.fetchCommand = exports.
|
|
59
|
+
exports.auditSshSessionActivity = exports.fetchWithStreaming = exports.certificateSigningRequest = exports.fetchSshHostKeys = exports.submitPublicKey = exports.fetchAdminLsCommand = exports.fetchCommand = exports.fetchStreamingStatus = exports.fetchIntegrationConfig = exports.fetchAccountInfo = exports.fetchOrgData = exports.tracesUrl = void 0;
|
|
60
60
|
/** Copyright © 2024-present P0 Security
|
|
61
61
|
|
|
62
62
|
This file is part of @p0security/cli
|
|
@@ -70,19 +70,10 @@ You should have received a copy of the GNU General Public License along with @p0
|
|
|
70
70
|
const retry_1 = require("../common/retry");
|
|
71
71
|
const version_1 = require("../version");
|
|
72
72
|
const config_1 = require("./config");
|
|
73
|
+
const constants_1 = require("./constants");
|
|
73
74
|
const stdio_1 = require("./stdio");
|
|
75
|
+
const util_1 = require("./util");
|
|
74
76
|
const path = __importStar(require("node:path"));
|
|
75
|
-
const isNetworkError = (error) => error instanceof TypeError &&
|
|
76
|
-
(error.message === "fetch failed" || error.message === "terminated");
|
|
77
|
-
// We retry with these delays: 1s, 2s, 4s, 8s, 16s, 30s, 30s, 30s
|
|
78
|
-
// for a total of 121s wait time over 8 retries (ignoring jitter)
|
|
79
|
-
const RETRY_OPTIONS = {
|
|
80
|
-
shouldRetry: (error) => error === "HTTP Error: 429 Too Many Requests" || isNetworkError(error),
|
|
81
|
-
retries: 8,
|
|
82
|
-
delayMs: 1000,
|
|
83
|
-
multiplier: 2.0,
|
|
84
|
-
maxDelayMs: 30000,
|
|
85
|
-
};
|
|
86
77
|
const tenantOrgUrl = (tenant) => `${(0, config_1.getAppUrl)()}/orgs/${tenant}`;
|
|
87
78
|
const tenantUrl = (tenant) => `${(0, config_1.getTenantConfig)().appUrl}/o/${tenant}`;
|
|
88
79
|
const publicKeysUrl = (tenant) => `${tenantUrl(tenant)}/integrations/ssh/public-keys`;
|
|
@@ -90,6 +81,7 @@ const sshHostKeysUrl = (tenant) => `${tenantUrl(tenant)}/integrations/ssh/host-k
|
|
|
90
81
|
const certSignRequestUrl = (tenant) => `${tenantUrl(tenant)}/integrations/ssh/certificates`;
|
|
91
82
|
const sshAuditUrl = (tenant) => `${tenantUrl(tenant)}/integrations/ssh/audit`;
|
|
92
83
|
const commandUrl = (tenant) => `${tenantUrl(tenant)}/command/`;
|
|
84
|
+
const requestStatusUrl = (tenant, requestId) => `${commandUrl(tenant)}/${requestId}/poll`;
|
|
93
85
|
const adminLsCommandUrl = (tenant) => `${tenantUrl(tenant)}/command/ls`;
|
|
94
86
|
const tracesUrl = (tenant) => `${tenantUrl(tenant)}/traces`;
|
|
95
87
|
exports.tracesUrl = tracesUrl;
|
|
@@ -111,20 +103,15 @@ const fetchIntegrationConfig = (authn, integration, debug) => __awaiter(void 0,
|
|
|
111
103
|
});
|
|
112
104
|
});
|
|
113
105
|
exports.fetchIntegrationConfig = fetchIntegrationConfig;
|
|
114
|
-
const
|
|
106
|
+
const fetchStreamingStatus = function (authn, requestId, debug) {
|
|
115
107
|
return __asyncGenerator(this, arguments, function* () {
|
|
116
108
|
yield __await(yield* __asyncDelegator(__asyncValues((0, exports.fetchWithStreaming)(authn, {
|
|
117
|
-
url:
|
|
118
|
-
method: "
|
|
119
|
-
body: JSON.stringify({
|
|
120
|
-
argv,
|
|
121
|
-
scriptName: path.basename(args.$0),
|
|
122
|
-
wait: true,
|
|
123
|
-
}),
|
|
109
|
+
url: requestStatusUrl(authn.identity.org.slug, requestId),
|
|
110
|
+
method: "GET",
|
|
124
111
|
}, debug))));
|
|
125
112
|
});
|
|
126
113
|
};
|
|
127
|
-
exports.
|
|
114
|
+
exports.fetchStreamingStatus = fetchStreamingStatus;
|
|
128
115
|
const fetchCommand = (authn, args, argv) => __awaiter(void 0, void 0, void 0, function* () {
|
|
129
116
|
return authFetch(authn, {
|
|
130
117
|
url: commandUrl(authn.identity.org.slug),
|
|
@@ -280,14 +267,17 @@ const fetchWithStreaming = function (authn, args, debug) {
|
|
|
280
267
|
throw err;
|
|
281
268
|
}
|
|
282
269
|
}
|
|
270
|
+
finally {
|
|
271
|
+
yield __await(reader.cancel());
|
|
272
|
+
}
|
|
283
273
|
}
|
|
284
274
|
});
|
|
285
275
|
};
|
|
286
276
|
try {
|
|
287
|
-
yield __await(yield* __asyncDelegator(__asyncValues((0, retry_1.regenerateWithSleep)(() => attemptFetch(), Object.assign(Object.assign({}, RETRY_OPTIONS), { debug })))));
|
|
277
|
+
yield __await(yield* __asyncDelegator(__asyncValues((0, retry_1.regenerateWithSleep)(() => attemptFetch(), Object.assign(Object.assign({}, constants_1.RETRY_OPTIONS), { debug })))));
|
|
288
278
|
}
|
|
289
279
|
catch (error) {
|
|
290
|
-
if (isNetworkError(error)) {
|
|
280
|
+
if ((0, util_1.isNetworkError)(error)) {
|
|
291
281
|
if (debug) {
|
|
292
282
|
(0, stdio_1.print2)("Network error: " + String(error));
|
|
293
283
|
}
|
|
@@ -336,10 +326,10 @@ const baseFetch = (args) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
336
326
|
return handleResponse(response, text, args.debug);
|
|
337
327
|
});
|
|
338
328
|
try {
|
|
339
|
-
return yield (0, retry_1.retryWithSleep)(() => attemptFetch(), Object.assign(Object.assign({}, RETRY_OPTIONS), { debug: args.debug }));
|
|
329
|
+
return yield (0, retry_1.retryWithSleep)(() => attemptFetch(), Object.assign(Object.assign({}, constants_1.RETRY_OPTIONS), { debug: args.debug }));
|
|
340
330
|
}
|
|
341
331
|
catch (error) {
|
|
342
|
-
if (isNetworkError(error)) {
|
|
332
|
+
if ((0, util_1.isNetworkError)(error)) {
|
|
343
333
|
throw `Network error: Unable to reach the server at ${url}.`;
|
|
344
334
|
}
|
|
345
335
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/drivers/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,2CAAsE;AAEtE,wCAA0C;AAC1C,qCAAsD;AACtD,mCAAiC;AACjC,gDAAkC;AAGlC,MAAM,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/drivers/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RETRY_OPTIONS = void 0;
|
|
4
|
+
/** Copyright © 2024-present P0 Security
|
|
5
|
+
|
|
6
|
+
This file is part of @p0security/cli
|
|
7
|
+
|
|
8
|
+
@p0security/cli is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3 of the License.
|
|
9
|
+
|
|
10
|
+
@p0security/cli is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
11
|
+
|
|
12
|
+
You should have received a copy of the GNU General Public License along with @p0security/cli. If not, see <https://www.gnu.org/licenses/>.
|
|
13
|
+
**/
|
|
14
|
+
const util_1 = require("./util");
|
|
15
|
+
// We retry with these delays: 1s, 2s, 4s, 8s, 16s, 30s, 30s, 30s
|
|
16
|
+
// for a total of 121s wait time over 8 retries (ignoring jitter)
|
|
17
|
+
exports.RETRY_OPTIONS = {
|
|
18
|
+
shouldRetry: (error) => error === "HTTP Error: 429 Too Many Requests" || (0, util_1.isNetworkError)(error),
|
|
19
|
+
retries: 8,
|
|
20
|
+
delayMs: 1000,
|
|
21
|
+
multiplier: 2.0,
|
|
22
|
+
maxDelayMs: 30000,
|
|
23
|
+
};
|
|
24
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/drivers/constants.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,iCAAwC;AAExC,iEAAiE;AACjE,iEAAiE;AACpD,QAAA,aAAa,GAAG;IAC3B,WAAW,EAAE,CAAC,KAAc,EAAE,EAAE,CAC9B,KAAK,KAAK,mCAAmC,IAAI,IAAA,qBAAc,EAAC,KAAK,CAAC;IACxE,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,IAAK;IACd,UAAU,EAAE,GAAG;IACf,UAAU,EAAE,KAAM;CACnB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getExpiredCredentialsMessage = void 0;
|
|
3
|
+
exports.isNetworkError = exports.getExpiredCredentialsMessage = void 0;
|
|
4
4
|
/** Copyright © 2024-present P0 Security
|
|
5
5
|
|
|
6
6
|
This file is part of @p0security/cli
|
|
@@ -14,4 +14,7 @@ You should have received a copy of the GNU General Public License along with @p0
|
|
|
14
14
|
const util_1 = require("../util");
|
|
15
15
|
const getExpiredCredentialsMessage = () => `Your credentials have expired. Please run \`${(0, util_1.getAppName)()} login <organization>\` to refresh your credentials.`;
|
|
16
16
|
exports.getExpiredCredentialsMessage = getExpiredCredentialsMessage;
|
|
17
|
+
const isNetworkError = (error) => error instanceof TypeError &&
|
|
18
|
+
(error.message === "fetch failed" || error.message === "terminated");
|
|
19
|
+
exports.isNetworkError = isNetworkError;
|
|
17
20
|
//# sourceMappingURL=util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/drivers/util.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,kCAAqC;AAE9B,MAAM,4BAA4B,GAAG,GAAG,EAAE,CAC/C,+CAA+C,IAAA,iBAAU,GAAE,sDAAsD,CAAC;AADvG,QAAA,4BAA4B,gCAC2E"}
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/drivers/util.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,kCAAqC;AAE9B,MAAM,4BAA4B,GAAG,GAAG,EAAE,CAC/C,+CAA+C,IAAA,iBAAU,GAAE,sDAAsD,CAAC;AADvG,QAAA,4BAA4B,gCAC2E;AAE7G,MAAM,cAAc,GAAG,CAAC,KAAc,EAAE,EAAE,CAC/C,KAAK,YAAY,SAAS;IAC1B,CAAC,KAAK,CAAC,OAAO,KAAK,cAAc,IAAI,KAAK,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC;AAF1D,QAAA,cAAc,kBAE4C"}
|