@p0security/cli 0.20.1 → 0.20.3
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/middlewares/version.js +2 -9
- package/build/dist/middlewares/version.js.map +1 -1
- package/build/dist/plugins/azure/auth.d.ts +0 -4
- package/build/dist/plugins/azure/auth.js +5 -17
- package/build/dist/plugins/azure/auth.js.map +1 -1
- package/build/dist/plugins/azure/install.js +4 -2
- package/build/dist/plugins/azure/install.js.map +1 -1
- package/build/dist/plugins/azure/keygen.js +6 -4
- package/build/dist/plugins/azure/keygen.js.map +1 -1
- package/build/dist/plugins/azure/rdp.js +1 -1
- package/build/dist/plugins/azure/rdp.js.map +1 -1
- package/build/dist/plugins/azure/tunnel.js +17 -20
- package/build/dist/plugins/azure/tunnel.js.map +1 -1
- package/build/dist/plugins/google/util.js +1 -11
- package/build/dist/plugins/google/util.js.map +1 -1
- package/build/dist/util.d.ts +11 -0
- package/build/dist/util.js +20 -1
- package/build/dist/util.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -77,18 +77,11 @@ const checkVersion = (yargs) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
77
77
|
if (isDebug) {
|
|
78
78
|
(0, stdio_1.print2)("Checking that your CLI is up to date with the latest version...");
|
|
79
79
|
}
|
|
80
|
-
|
|
81
|
-
// so when calling spawn, it cannot be located except via cmd.exe
|
|
82
|
-
const isWindows = (0, util_1.getOperatingSystem)() === "win";
|
|
83
|
-
const npmCmd = isWindows ? "cmd.exe" : "npm";
|
|
84
|
-
const commonNpmArgs = ["view", name, "--json"];
|
|
85
|
-
const npmArgs = isWindows
|
|
86
|
-
? ["/d", "/s", "/c", "npm", ...commonNpmArgs]
|
|
87
|
-
: commonNpmArgs;
|
|
80
|
+
const { command, args } = (0, util_1.osSafeCommand)("npm", ["view", name, "--json"]);
|
|
88
81
|
// wrap the exec call in a function to add enhanced error handling logic
|
|
89
82
|
const protectedExec = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
90
83
|
try {
|
|
91
|
-
return yield (0, util_1.exec)(
|
|
84
|
+
return yield (0, util_1.exec)(command, args, { check: true });
|
|
92
85
|
}
|
|
93
86
|
catch (error) {
|
|
94
87
|
let errorDetails = (error === null || error === void 0 ? void 0 : error.message) || "Unknown error";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/middlewares/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,8CAA2D;AAC3D,4CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/middlewares/version.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,6 @@ export declare const AUTHORIZATION_FAILED_PATTERN: RegExp;
|
|
|
4
4
|
export declare const USER_NOT_IN_CACHE_PATTERN: RegExp;
|
|
5
5
|
export declare const NASCENT_ACCESS_GRANT_MESSAGE = "If access was recently granted, please try again in a few minutes.";
|
|
6
6
|
export declare const ABORT_AUTHORIZATION_FAILED_MESSAGE: string;
|
|
7
|
-
export declare const azCommandArgs: (args: string[]) => {
|
|
8
|
-
command: string;
|
|
9
|
-
args: string[];
|
|
10
|
-
};
|
|
11
7
|
export declare const azLoginCommand: (tenantId: string) => {
|
|
12
8
|
command: string;
|
|
13
9
|
args: string[];
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.azSetSubscription = exports.azAccountShowUserPrincipalName = exports.azAccountSetCommand = exports.azAccountClearCommand = exports.azLoginCommand = exports.
|
|
12
|
+
exports.azSetSubscription = exports.azAccountShowUserPrincipalName = exports.azAccountSetCommand = exports.azAccountClearCommand = exports.azLoginCommand = exports.ABORT_AUTHORIZATION_FAILED_MESSAGE = exports.NASCENT_ACCESS_GRANT_MESSAGE = exports.USER_NOT_IN_CACHE_PATTERN = exports.AUTHORIZATION_FAILED_PATTERN = void 0;
|
|
13
13
|
/** Copyright © 2024-present P0 Security
|
|
14
14
|
|
|
15
15
|
This file is part of @p0security/cli
|
|
@@ -30,19 +30,7 @@ exports.AUTHORIZATION_FAILED_PATTERN = /The client '.+' with object id '.+' does
|
|
|
30
30
|
exports.USER_NOT_IN_CACHE_PATTERN = /Exception in handling client: User '.+' does not exist in MSAL token cache./;
|
|
31
31
|
exports.NASCENT_ACCESS_GRANT_MESSAGE = "If access was recently granted, please try again in a few minutes.";
|
|
32
32
|
exports.ABORT_AUTHORIZATION_FAILED_MESSAGE = `Your Microsoft Token Cache is out of date. Run 'az account clear' and 'az login' to refresh your credentials. ${(0, config_1.getContactMessage)()}`;
|
|
33
|
-
const
|
|
34
|
-
const isWindows = (0, util_1.getOperatingSystem)() === "win";
|
|
35
|
-
// On Windows, when installing the Azure CLI, the main az file is
|
|
36
|
-
// a .cmd (shell script) file rather than a .exe (binary executable) file,
|
|
37
|
-
// so when calling spawn, it cannot be located except via cmd.exe
|
|
38
|
-
// Unlike in MacOS, the underlying Windows OS API that spawn uses doesn't
|
|
39
|
-
// resolve .CMD files by default
|
|
40
|
-
return isWindows
|
|
41
|
-
? { command: "cmd.exe", args: ["/d", "/s", "/c", "az", ...args] }
|
|
42
|
-
: { command: "az", args };
|
|
43
|
-
};
|
|
44
|
-
exports.azCommandArgs = azCommandArgs;
|
|
45
|
-
const azLoginCommand = (tenantId) => (0, exports.azCommandArgs)([
|
|
33
|
+
const azLoginCommand = (tenantId) => (0, util_1.osSafeCommand)("az", [
|
|
46
34
|
"login",
|
|
47
35
|
"--scope",
|
|
48
36
|
"https://management.core.windows.net//.default",
|
|
@@ -50,11 +38,11 @@ const azLoginCommand = (tenantId) => (0, exports.azCommandArgs)([
|
|
|
50
38
|
tenantId,
|
|
51
39
|
]);
|
|
52
40
|
exports.azLoginCommand = azLoginCommand;
|
|
53
|
-
const azAccountClearCommand = () => (0,
|
|
41
|
+
const azAccountClearCommand = () => (0, util_1.osSafeCommand)("az", ["account", "clear"]);
|
|
54
42
|
exports.azAccountClearCommand = azAccountClearCommand;
|
|
55
|
-
const azAccountSetCommand = (subscriptionId) => (0,
|
|
43
|
+
const azAccountSetCommand = (subscriptionId) => (0, util_1.osSafeCommand)("az", ["account", "set", "--subscription", subscriptionId]);
|
|
56
44
|
exports.azAccountSetCommand = azAccountSetCommand;
|
|
57
|
-
const azAccountShowUserPrincipalName = () => (0,
|
|
45
|
+
const azAccountShowUserPrincipalName = () => (0, util_1.osSafeCommand)("az", ["account", "show", "--query", "user.name", "-o", "tsv"]);
|
|
58
46
|
exports.azAccountShowUserPrincipalName = azAccountShowUserPrincipalName;
|
|
59
47
|
const performAccountClear = ({ debug }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
60
48
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/plugins/azure/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,iDAAyD;AACzD,+CAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/plugins/azure/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,8 +21,10 @@ This file is part of @p0security/cli
|
|
|
21
21
|
You should have received a copy of the GNU General Public License along with @p0security/cli. If not, see <https://www.gnu.org/licenses/>.
|
|
22
22
|
**/
|
|
23
23
|
const install_1 = require("../../common/install");
|
|
24
|
-
const
|
|
25
|
-
const
|
|
24
|
+
const util_1 = require("../../util");
|
|
25
|
+
const os = (0, util_1.getOperatingSystem)();
|
|
26
|
+
const AzItems = os === "mac" ? [...install_1.HomebrewItems, "az"] : ["az"];
|
|
27
|
+
const AzInstall = Object.assign(Object.assign({}, (os === "mac" ? install_1.HomebrewInstall : {})), { az: {
|
|
26
28
|
label: "Azure command-line interface",
|
|
27
29
|
commands: {
|
|
28
30
|
darwin: ["brew update", "brew install azure-cli"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../src/plugins/azure/install.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,kDAK8B;
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../src/plugins/azure/install.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,kDAK8B;AAC9B,qCAAgD;AAEhD,MAAM,EAAE,GAAG,IAAA,yBAAkB,GAAE,CAAC;AAChC,MAAM,OAAO,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,uBAAa,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAIjE,MAAM,SAAS,mCACV,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,yBAAe,CAAC,CAAC,CAAC,EAAE,CAAC,KACxC,EAAE,EAAE;QACF,KAAK,EAAE,8BAA8B;QACrC,QAAQ,EAAE;YACR,MAAM,EAAE,CAAC,aAAa,EAAE,wBAAwB,CAAC;SAClD;KACF,GACF,CAAC;AAEK,MAAM,eAAe,GAAG,GAAS,EAAE,kDACxC,OAAA,MAAM,IAAA,uBAAa,EAAC,OAAO,EAAE,SAAS,CAAC,CAAA,GAAA,CAAC;AAD7B,QAAA,eAAe,mBACc"}
|
|
@@ -30,10 +30,12 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
30
30
|
exports.AD_CERT_FILENAME = "p0cli-azure-ad-ssh-cert.pub";
|
|
31
31
|
// The `az ssh cert` command manages key generation, and generates SSH RSA keys with the standard names
|
|
32
32
|
exports.AD_SSH_KEY_PRIVATE = "id_rsa";
|
|
33
|
-
const azSshCertCommand = (keyPath) => (
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
33
|
+
const azSshCertCommand = (keyPath) => (0, util_1.osSafeCommand)("az", [
|
|
34
|
+
"ssh",
|
|
35
|
+
"cert",
|
|
36
|
+
"--file",
|
|
37
|
+
node_path_1.default.join(keyPath, exports.AD_CERT_FILENAME),
|
|
38
|
+
]);
|
|
37
39
|
exports.azSshCertCommand = azSshCertCommand;
|
|
38
40
|
const generateSshKeyAndAzureAdCert = (keyPath, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
39
41
|
const { debug } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keygen.js","sourceRoot":"","sources":["../../../../src/plugins/azure/keygen.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,+CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"keygen.js","sourceRoot":"","sources":["../../../../src/plugins/azure/keygen.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,+CAA6C;AAC7C,qCAAiD;AACjD,0DAA6B;AAE7B,0DAA0D;AAC7C,QAAA,gBAAgB,GAAG,6BAA6B,CAAC;AAE9D,uGAAuG;AAC1F,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAEpC,MAAM,gBAAgB,GAAG,CAAC,OAAe,EAAE,EAAE,CAClD,IAAA,oBAAa,EAAC,IAAI,EAAE;IAClB,KAAK;IACL,MAAM;IACN,QAAQ;IACR,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,wBAAgB,CAAC;CACrC,CAAC,CAAC;AANQ,QAAA,gBAAgB,oBAMxB;AAEE,MAAM,4BAA4B,GAAG,CAC1C,OAAe,EACf,UAA+B,EAAE,EACjC,EAAE;IACF,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAE1B,IAAI,KAAK;QAAE,IAAA,cAAM,EAAC,wCAAwC,CAAC,CAAC;IAE5D,IAAI;QACF,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC;QACpD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtE,IAAI,KAAK,EAAE;YACT,IAAA,cAAM,EAAC,MAAM,CAAC,CAAC;YACf,IAAA,cAAM,EAAC,MAAM,CAAC,CAAC;SAChB;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,IAAA,cAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrB,IAAA,cAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,gDAAgD,KAAK,EAAE,CAAC;KAC/D;AACH,CAAC,CAAA,CAAC;AArBW,QAAA,4BAA4B,gCAqBvC"}
|
|
@@ -26,7 +26,7 @@ const auth_1 = require("./auth");
|
|
|
26
26
|
const azBastionRdpCommand = (request, options) => {
|
|
27
27
|
const { configure, debug } = options;
|
|
28
28
|
const { bastionName, bastionRg, instanceId } = request.permission.resource;
|
|
29
|
-
return (0,
|
|
29
|
+
return (0, util_1.osSafeCommand)("az", [
|
|
30
30
|
"network",
|
|
31
31
|
"bastion",
|
|
32
32
|
"rdp",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rdp.js","sourceRoot":"","sources":["../../../../src/plugins/azure/rdp.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,+CAA6C;AAG7C,
|
|
1
|
+
{"version":3,"file":"rdp.js","sourceRoot":"","sources":["../../../../src/plugins/azure/rdp.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,+CAA6C;AAG7C,qCAAiD;AACjD,iCAA2C;AAE3C,MAAM,mBAAmB,GAAG,CAC1B,OAA2C,EAC3C,OAAiD,EACjD,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC;IAC3E,OAAO,IAAA,oBAAa,EAAC,IAAI,EAAE;QACzB,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,WAAW;QACX,kBAAkB;QAClB,SAAS;QACT,sBAAsB;QACtB,UAAU;QACV,aAAa;QACb,KAAK;QACL,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC,CAAC;AAEW,QAAA,gBAAgB,GAAG;IAC9B,KAAK,EAAE,CACL,OAA2C,EAC3C,OAA4B,EAC5B,EAAE;QACF,MAAM,gBAAgB,GAAG,MAAM,IAAA,wBAAiB,EAC9C,OAAO,CAAC,UAAU,CAAC,QAAQ,EAC3B,OAAO,CACR,CAAC;QACF,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC9B,CAAC,CAAA;IAED,eAAe,EAAE,CACf,OAA2C,EAC3C,OAGC,EACD,EAAE;QACF,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAE1B,IAAI,KAAK,EAAE;YACT,IAAA,cAAM,EAAC,0CAA0C,CAAC,CAAC;SACpD;QAED,IAAI;YACF,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAEhE,IAAI,KAAK,EAAE;gBACT,IAAA,cAAM,EAAC,cAAc,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aACnD;YAED,MAAM,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC5C;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,KAAK,EAAE;gBACT,IAAA,cAAM,EAAC,qCAAqC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7D,IAAI,KAAK,CAAC,MAAM,EAAE;oBAChB,IAAA,cAAM,EAAC,gBAAgB,CAAC,CAAC;oBACzB,IAAA,cAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;iBACtB;aACF;YACD,MAAM,IAAI,KAAK,CACb,kDAAkD,KAAK,CAAC,OAAO,EAAE,CAClE,CAAC;SACH;IACH,CAAC,CAAA;CACF,CAAC"}
|
|
@@ -32,26 +32,23 @@ const tunnelDebugOutputIgnorePatterns = [
|
|
|
32
32
|
/Received (debugger|websocket)/i,
|
|
33
33
|
/Sending to (debugger|websocket)/i,
|
|
34
34
|
];
|
|
35
|
-
const azBastionTunnelCommand = (request, port) => (
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
"--debug",
|
|
53
|
-
],
|
|
54
|
-
});
|
|
35
|
+
const azBastionTunnelCommand = (request, port) => (0, util_1.osSafeCommand)("az", [
|
|
36
|
+
"network",
|
|
37
|
+
"bastion",
|
|
38
|
+
"tunnel",
|
|
39
|
+
"--ids",
|
|
40
|
+
request.bastionId,
|
|
41
|
+
"--target-resource-id",
|
|
42
|
+
request.instanceId,
|
|
43
|
+
"--resource-port",
|
|
44
|
+
"22",
|
|
45
|
+
"--port",
|
|
46
|
+
port,
|
|
47
|
+
// Always include the debug flag because we use the output to determine if we need
|
|
48
|
+
// to reauthenticate the user when access fails. The output is silenced if the user
|
|
49
|
+
// doesn't pass the --debug flag to the p0 ssh process.
|
|
50
|
+
"--debug",
|
|
51
|
+
]);
|
|
55
52
|
exports.azBastionTunnelCommand = azBastionTunnelCommand;
|
|
56
53
|
const selectRandomPort = () => {
|
|
57
54
|
// The IANA ephemeral port range is 49152 to 65535, inclusive. Pick a random value in that range.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../../src/plugins/azure/tunnel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,8CAAoD;AACpD,+CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../../src/plugins/azure/tunnel.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,16 +17,6 @@ const util_1 = require("../../util");
|
|
|
17
17
|
* running a gcloud command.
|
|
18
18
|
* @param args the arguments to be passed to gcloud (excluding "gcloud" itself)
|
|
19
19
|
*/
|
|
20
|
-
const gcloudCommandArgs = (args) =>
|
|
21
|
-
const isWindows = (0, util_1.getOperatingSystem)() === "win";
|
|
22
|
-
// On Windows, when installing the Google Cloud tools, the main gcloud file is
|
|
23
|
-
// a .cmd (shell script) file rather than a .exe (binary executable) file,
|
|
24
|
-
// so when calling spawn, it cannot be located except via cmd.exe
|
|
25
|
-
// Unlike in MacOS, the underlying Windows OS API that spawn uses doesn't
|
|
26
|
-
// resolve .CMD files by default
|
|
27
|
-
return isWindows
|
|
28
|
-
? { command: "cmd.exe", args: ["/d", "/s", "/c", "gcloud", ...args] }
|
|
29
|
-
: { command: "gcloud", args };
|
|
30
|
-
};
|
|
20
|
+
const gcloudCommandArgs = (args) => (0, util_1.osSafeCommand)("gcloud", args);
|
|
31
21
|
exports.gcloudCommandArgs = gcloudCommandArgs;
|
|
32
22
|
//# sourceMappingURL=util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/plugins/google/util.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/plugins/google/util.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,qCAA2C;AAE3C;;;;GAIG;AACI,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAAE,EAAE,CAClD,IAAA,oBAAa,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AADnB,QAAA,iBAAiB,qBACE"}
|
package/build/dist/util.d.ts
CHANGED
|
@@ -74,4 +74,15 @@ export declare const ciEquals: (a: string, b: string) => boolean;
|
|
|
74
74
|
export declare const delay: (ms: number) => Promise<unknown>;
|
|
75
75
|
type OperatingSystem = "linux" | "mac" | "unknown" | "win";
|
|
76
76
|
export declare const getOperatingSystem: () => OperatingSystem;
|
|
77
|
+
/**
|
|
78
|
+
* Wraps a command with the operating-system specific method
|
|
79
|
+
* executing it.
|
|
80
|
+
* @param command the command to wrap
|
|
81
|
+
* @param args the arguments to be passed to the command
|
|
82
|
+
* @returns the command and arguments to be passed to spawn
|
|
83
|
+
*/
|
|
84
|
+
export declare const osSafeCommand: (command: string, args: string[]) => {
|
|
85
|
+
command: string;
|
|
86
|
+
args: string[];
|
|
87
|
+
};
|
|
77
88
|
export {};
|
package/build/dist/util.js
CHANGED
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.getOperatingSystem = exports.delay = exports.ciEquals = exports.unexpectedValueError = exports.assertNever = exports.conditionalAbortBeforeThrow = exports.throwAssertNever = exports.exec = exports.timeout = exports.sleep = exports.P0_PATH = exports.getAppName = exports.getAppPath = exports.spawnWithCleanEnv = exports.createCleanChildEnv = void 0;
|
|
15
|
+
exports.osSafeCommand = exports.getOperatingSystem = exports.delay = exports.ciEquals = exports.unexpectedValueError = exports.assertNever = exports.conditionalAbortBeforeThrow = exports.throwAssertNever = exports.exec = exports.timeout = exports.sleep = exports.P0_PATH = exports.getAppName = exports.getAppPath = exports.spawnWithCleanEnv = exports.createCleanChildEnv = void 0;
|
|
16
16
|
/** Copyright © 2024-present P0 Security
|
|
17
17
|
|
|
18
18
|
This file is part of @p0security/cli
|
|
@@ -166,4 +166,23 @@ const getOperatingSystem = () => {
|
|
|
166
166
|
}
|
|
167
167
|
};
|
|
168
168
|
exports.getOperatingSystem = getOperatingSystem;
|
|
169
|
+
/**
|
|
170
|
+
* Wraps a command with the operating-system specific method
|
|
171
|
+
* executing it.
|
|
172
|
+
* @param command the command to wrap
|
|
173
|
+
* @param args the arguments to be passed to the command
|
|
174
|
+
* @returns the command and arguments to be passed to spawn
|
|
175
|
+
*/
|
|
176
|
+
const osSafeCommand = (command, args) => {
|
|
177
|
+
const isWindows = (0, exports.getOperatingSystem)() === "win";
|
|
178
|
+
// On Windows, when installing the Azure CLI, the main az file is
|
|
179
|
+
// a .cmd (shell script) file rather than a .exe (binary executable) file,
|
|
180
|
+
// so when calling spawn, it cannot be located except via cmd.exe
|
|
181
|
+
// Unlike in MacOS, the underlying Windows OS API that spawn uses doesn't
|
|
182
|
+
// resolve .CMD files by default
|
|
183
|
+
return isWindows
|
|
184
|
+
? { command: "cmd.exe", args: ["/d", "/s", "/c", command, ...args] }
|
|
185
|
+
: { command, args };
|
|
186
|
+
};
|
|
187
|
+
exports.osSafeCommand = osSafeCommand;
|
|
169
188
|
//# sourceMappingURL=util.js.map
|
package/build/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,uCAA8C;AAC9C,2DAU4B;AAC5B,sDAAyB;AACzB,0DAA6B;AAC7B,gEAAmC;AAEnC,2CAAiC;AAEjC;;;GAGG;AACI,MAAM,mBAAmB,GAAG,CACjC,OAAO,GAAG,sBAAO,CAAC,GAAG,EACF,EAAE;IACrB,MAAM,QAAQ,qBAAQ,OAAO,CAAE,CAAC;IAChC,OAAO,QAAQ,CAAC,YAAY,CAAC;IAC7B,OAAO,QAAQ,CAAC,eAAe,CAAC;IAChC,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAPW,QAAA,mBAAmB,uBAO9B;AA0BF,SAAgB,iBAAiB,CAC/B,OAAe,EACf,IAA4B,EAC5B,OAAsB;IAEtB,OAAO,IAAA,0BAAK,EAAC,OAAO,EAAE,IAAI,IAAI,EAAE,kCAC3B,OAAO,KACV,GAAG,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,KAAI,IAAA,2BAAmB,GAAE,IAC1C,CAAC;AACL,CAAC;AATD,8CASC;AAEM,MAAM,UAAU,GAAG,GAAG,EAAE,eAC7B,OAAA,MAAA,MAAA,sBAAO,CAAC,GAAG,CAAC,WAAW,mCAAI,sBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAI,IAAI,CAAA,EAAA,CAAC;AADxC,QAAA,UAAU,cAC8B;AAE9C,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,mBAAI,CAAC,QAAQ,CAAC,IAAA,kBAAU,GAAE,CAAC,CAAC;AAA/C,QAAA,UAAU,cAAqC;AAE/C,QAAA,OAAO,GAAG,mBAAI,CAAC,IAAI,CAC9B,iBAAE,CAAC,OAAO,EAAE,EACZ,mBAAa,CAAC,WAAW,KAAK,YAAY;IACxC,CAAC,CAAC,KAAK;IACP,CAAC,CAAC,OAAO,mBAAa,CAAC,WAAW,EAAE,CACvC,CAAC;AAEF;;;;;;;;GAQG;AACI,MAAM,KAAK,GAAG,CAAC,aAAqB,EAAE,EAAE;IAC7C,IAAI,KAAK,GAA+B,SAAS,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAC5C,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACvE,CAAC,CAAC;AANW,QAAA,KAAK,SAMhB;AAEF;;;;GAIG;AACI,MAAM,OAAO,GAAG,CACrB,OAAgC,EAChC,aAAqB,EACrB,EAAE;IACF,MAAM,IAAI,GAAG,IAAA,aAAK,EAAC,aAAa,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACnD,IAAI,MAAM,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,EAAE,CAAC;IACd,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC;AATW,QAAA,OAAO,WASlB;AAEF;;;GAGG;AACI,MAAM,IAAI,GAAG,CAClB,OAAe,EACf,IAAc,EACd,OAGC,EACD,EAAE;IACF,OAAA,IAAI,OAAO,CACT,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAClB,IAAI;YACF,MAAM,GAAG,GAAwB,EAAE,CAAC;YACpC,MAAM,GAAG,GAAwB,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,EAAE,IAAI,kCACxC,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,KAClB,KAAK,EAAE,MAAM,IACb,CAAC;YACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAE5C,kGAAkG;YAClG,wFAAwF;YACxF,4DAA4D;YAC5D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACrD,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACrD,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;gBACxC,IAAI,IAAI,KAAK,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA;oBAC9B,MAAM,CACJ,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,EAAE,MAAM,CAAC,CACjE,CAAC;gBACJ,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,gGAAgG;YAChG,+FAA+F;YAC/F,0BAA0B;YAC1B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,CAAC;SACf;IACH,CAAC,CACF,CAAA;EAAA,CAAC;AA5CS,QAAA,IAAI,QA4Cb;AAEG,MAAM,gBAAgB,GAAG,CAAC,KAAY,EAAE,EAAE;IAC/C,MAAM,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;AAC3B,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEF,yEAAyE;AAClE,MAAM,2BAA2B,GACtC,CAAC,gBAAyB,EAAE,EAAE,CAAC,CAAC,GAAQ,EAAE,EAAE;IAC1C,IAAI,gBAAgB,EAAE;QACpB,gBAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACb;IACD,MAAM,GAAG,CAAC;AACZ,CAAC,CAAC;AANS,QAAA,2BAA2B,+BAMpC;AAEG,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,EAAE;IAC1C,OAAO,IAAA,4BAAoB,EAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,WAAW,eAEtB;AAEK,MAAM,oBAAoB,GAAG,CAAC,KAAU,EAAE,EAAE,CACjD,IAAI,KAAK,CAAC,gCAAgC,KAAK,sBAAsB,CAAC,CAAC;AAD5D,QAAA,oBAAoB,wBACwC;AAEzE;;;;;;;;;GASG;AACI,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAC/C,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC;AADpD,QAAA,QAAQ,YAC4C;AAE1D,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAClC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AADvC,QAAA,KAAK,SACkC;AAG7C,MAAM,kBAAkB,GAAG,GAAoB,EAAE;IACtD,MAAM,QAAQ,GAAG,sBAAO,CAAC,QAAQ,CAAC;IAClC,IAAI,QAAQ,KAAK,OAAO,EAAE;QACxB,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,QAAQ,KAAK,QAAQ,EAAE;QAChC,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,QAAQ,KAAK,OAAO,EAAE;QAC/B,OAAO,OAAO,CAAC;KAChB;SAAM;QACL,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AAXW,QAAA,kBAAkB,sBAW7B"}
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"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"}
|