bananas

Author: alasdairhurst

src/lib/util.js

@@ -2,10 +2,13 @@ import argvSplit from 'argv-split';
 import fs from 'fs-extra';
 import E from './errors.js';
 import path from 'path';
+import os from 'os';
 import semver from 'semver';
 import which from 'which';
+import child_process from 'child_process';
 import { fileURLToPath } from 'url';
 import { packageDirectorySync } from 'pkg-dir';
+import { execPath } from 'process';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -264,3 +267,27 @@ export function wrap(str, width, indent) {
 		})
 		.join('\n');
 }
+
+// cache to avoid extra lookups
+let _nodePath;
+export function nodePath() {
+	if (!_nodePath) {
+		const execPath = process.execPath;
+		// cannot exec cmd on windows on new versions of node https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
+		// CVE-2024-27980. Can't pass shell: true to get around this on windows since it breaks non-shell executions.
+		// Can't imagine node would be a bat but who knows. It's .cmd on windows often.
+		if (os.platform() === 'win32' && [ 'cmd', 'bat' ].includes(path.extname(execPath))) {
+			// try and see if the node.exe lives in the same dir
+			const newNodePath = execPath.replace(new RegExp(`${path.extname(execPath)}$`), 'exe');
+			try {
+				fs.statSync(newNodePath);
+				_nodePath = newNodePath;
+			} catch (err) {
+				_nodePath = 'node.exe';
+			}
+		} else {
+			_nodePath = execPath;
+		}
+	}
+	return _nodePath;
+}

src/parser/extension.js

@@ -4,7 +4,7 @@ import E from '../lib/errors.js';
 import helpCommand from '../commands/help.js';
 import _path from 'path';
 
-import { declareCLIKitClass, filename, findPackage, isExecutable } from '../lib/util.js';
+import { declareCLIKitClass, filename, findPackage, isExecutable, nodePath } from '../lib/util.js';
 import { spawn } from 'child_process';
 
 const { log, warn } = debug('cli-kit:extension');
@@ -114,7 +114,7 @@ export default class Extension {
 				const makeDefaultAction = main => {
 					return async ({ __argv, cmd }) => {
 						process.argv = [
-							'node',
+							nodePath(),
 							main
 						];
 

test/examples/external-binary/extbin.js

@@ -1,5 +1,6 @@
 import CLI from '../../../src/index.js';
+import { nodePath } from '../../../src/lib/util.js';
 
 new CLI({
-	extensions: [ 'node' ]
+	extensions: [ nodePath() ]
 }).exec();

test/test-extension.js

@@ -7,6 +7,7 @@ import { fileURLToPath } from 'url';
 import { platform } from 'os';
 import { spawnSync } from 'child_process';
 import { WritableStream } from 'memory-streams';
+import { nodePath } from '../src/lib/util.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -58,14 +59,14 @@ describe('Extension', () => {
 			delete env.SNOOPLOGG;
 			const args = [
 				path.join(__dirname, 'examples', 'external-binary', 'extbin.js'),
-				'node',
+				nodePath(),
 				'-e',
 				'console.log(\'foo\');'
 			];
 
 			let s = '',o = '',e = '';
 			try {
-				const { status, stdout, stderr } = spawnSync('where', [ 'node.exe' ]);
+				const { status, stdout, stderr } = spawnSync('where', [ nodePath() ]);
 				s = status; o = stdout; e = stderr;
 			} catch (e) {
 				console.log('EROROROROROR!', e);
@@ -74,7 +75,7 @@ describe('Extension', () => {
 				console.log('PLATFORM:', platform());
 			}
 
-			const { status, stdout, stderr } = spawnSync('node.exe', args, {
+			const { status, stdout, stderr } = spawnSync(nodePath(), args, {
 				env,
 				shell: platform() === 'win32'
 			});
@@ -90,7 +91,7 @@ describe('Extension', () => {
 			const env = { ...process.env };
 			delete env.SNOOPLOGG;
 
-			const { status, stdout, stderr } = spawnSync('node', [
+			const { status, stdout, stderr } = spawnSync(nodePath(), [
 				path.join(__dirname, 'examples', 'run-node', 'run.js'), 'run', 'console.log(\'It works\')'
 			], {
 				env,
@@ -186,7 +187,7 @@ describe('Extension', () => {
 			const env = { ...process.env };
 			delete env.SNOOPLOGG;
 
-			const { status, stdout, stderr } = spawnSync('node', [
+			const { status, stdout, stderr } = spawnSync(nodePath(), [
 				path.join(__dirname, 'examples', 'external-js-file', 'extjsfile.js'), 'simple', 'foo', 'bar'
 			], {
 				env
@@ -202,7 +203,7 @@ describe('Extension', () => {
 			const env = { ...process.env };
 			delete env.SNOOPLOGG;
 
-			const { status, stdout, stderr } = spawnSync('node', [
+			const { status, stdout, stderr } = spawnSync(nodePath(), [
 				path.join(__dirname, 'examples', 'external-module', 'extmod.js'), 'foo', 'bar'
 			], {
 				env

test/test-parser.js

@@ -1,10 +1,10 @@
 import CLI, { ansi, Terminal } from '../src/index.js';
 import path from 'path';
 import { expect } from 'chai';
-import { platform } from 'os';
 import { fileURLToPath } from 'url';
 import { spawnSync } from 'child_process';
 import { WritableStream } from 'memory-streams';
+import { nodePath } from '../src/lib/util.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -87,7 +87,7 @@ describe('Parser', () => {
 			const env = Object.assign({}, process.env);
 			delete env.SNOOPLOGG;
 
-			const { status, stdout } = spawnSync('node', [ path.join(__dirname, 'examples', 'version-test', 'ver.js'), '--version' ], {
+			const { status, stdout } = spawnSync(nodePath(), [ path.join(__dirname, 'examples', 'version-test', 'ver.js'), '--version' ], {
 				env
 			});
 			expect(status).to.equal(0);