app: runCmd: Add user and static plugin type to runScript

This function was not updated to account for these two plugin
type paths.

Also the script exits with 1 when enountering a wrong path.
Otherwise the script just hangs.

Author: illume

app/electron/runCmd.test.ts

@@ -220,3 +220,67 @@ describe('validateCommandData', () => {
     ).toBe(true);
   });
 });
+
+describe('runScript', () => {
+  const originalArgv = process.argv;
+  const originalExit = process.exit;
+  const originalConsoleError = console.error;
+  const originalResourcesPath = process.resourcesPath;
+
+  let exitMock: jest.Mock;
+  let consoleErrorMock: jest.Mock;
+
+  beforeEach(() => {
+    jest.resetModules();
+    // @ts-ignore this is fine for tests
+    process.resourcesPath = '/resources';
+    jest.mock('./plugin-management', () => ({
+      defaultPluginsDir: jest.fn(() => '/plugins/default'),
+      defaultUserPluginsDir: jest.fn(() => '/plugins/user'),
+    }));
+
+    exitMock = jest.fn() as any;
+    // @ts-expect-error overriding for test
+    process.exit = exitMock;
+    consoleErrorMock = jest.fn();
+    console.error = consoleErrorMock;
+  });
+
+  afterEach(() => {
+    process.argv = originalArgv;
+    process.exit = originalExit;
+    console.error = originalConsoleError;
+    // @ts-ignore
+    process.resourcesPath = originalResourcesPath;
+    jest.unmock('./plugin-management');
+    jest.restoreAllMocks();
+  });
+
+  const testScriptImport = async (scriptPath: string) => {
+    process.argv = ['node', scriptPath];
+    jest.doMock(scriptPath, () => ({}), { virtual: true });
+    const runCmdModule = await import('./runCmd');
+    await runCmdModule.runScript();
+    expect(exitMock).not.toHaveBeenCalled();
+  };
+
+  it('imports the script when path is inside defaultPluginsDir', () =>
+    testScriptImport('/plugins/default/my-script.js'));
+
+  it('imports the script when path is inside defaultUserPluginsDir', () =>
+    testScriptImport('/plugins/user/my-script.js'));
+
+  it('imports the script when path is inside static .plugins dir', () =>
+    testScriptImport('/resources/.plugins/my-script.js'));
+
+  it('exits with error when script is outside allowed directories', async () => {
+    process.argv = ['node', '/not-allowed/my-script.js'];
+    jest.doMock('/not-allowed/my-script.js', () => ({}), { virtual: true });
+
+    const runCmdModule = await import('./runCmd');
+    await runCmdModule.runScript();
+
+    expect(consoleErrorMock).toHaveBeenCalledTimes(1);
+    expect(exitMock).toHaveBeenCalledWith(1);
+  });
+});

app/electron/runCmd.ts

@@ -141,6 +141,7 @@ const COMMANDS_WITH_CONSENT = {
     'scriptjs minikube/manage-minikube.js',
   ],
 };
+
 /**
  * Adds the runCmd consent for the plugin.
  *
@@ -323,12 +324,21 @@ export function handleRunCommand(
  */
 export function runScript() {
   const baseDir = path.resolve(defaultPluginsDir());
+  const userPluginsDir = path.resolve(defaultUserPluginsDir());
+  const staticPluginsDir = path.resolve(path.join(process.resourcesPath, '.plugins'));
   const scriptPath = path.resolve(process.argv[1]);
 
-  if (!scriptPath.startsWith(baseDir)) {
-    console.error(`Invalid script path: ${scriptPath}. Must be within ${baseDir}.`);
-    return;
+  if (
+    !scriptPath.startsWith(baseDir) &&
+    !scriptPath.startsWith(userPluginsDir) &&
+    !scriptPath.startsWith(staticPluginsDir)
+  ) {
+    console.error(
+      `Invalid script path: ${scriptPath}. Must be within ${baseDir}, ${userPluginsDir}, or ${staticPluginsDir}.`
+    );
+    process.exit(1);
   }
+
   import(scriptPath);
 }