Drop incidentally set env vars when spawning terminal/electron apps

Terminal case is more important, but useful to tidy this up generally.
The goal is to provide an environment that is as close as possible to
running the app normally, and so any extra noise we're creating is messy
and needs fixing.

Author: pimterry

src/interceptors/electron.ts

@@ -13,7 +13,7 @@ import { delay } from '../util/promise';
 import { ErrorLike, isErrorLike } from '../util/error';
 import { canAccess, readFile } from '../util/fs';
 import { windowsClose } from '../util/process-management';
-import { getTerminalEnvVars, OVERRIDES_DIR } from './terminal/terminal-env-overrides';
+import { getInheritableCurrentEnv, getTerminalEnvVars, OVERRIDES_DIR } from './terminal/terminal-env-overrides';
 import { logError, addBreadcrumb } from '../error-tracking';
 import { findExecutableInApp } from '@httptoolkit/osx-find-executable';
 
@@ -65,11 +65,13 @@ export class ElectronInterceptor implements Interceptor {
             // Non-darwin, or darwin with a full path to the binary:
                 : pathToApplication;
 
+        const currentEnv = getInheritableCurrentEnv();
+
         const appProcess = spawn(cmd, [`--inspect-brk=127.0.0.1:${debugPort}`], {
             stdio: 'inherit',
             env: {
-                ...process.env,
-                ...getTerminalEnvVars(proxyPort, this.config.https, process.env),
+                ...currentEnv,
+                ...getTerminalEnvVars(proxyPort, this.config.https, currentEnv),
                 // We have to disable NODE_OPTIONS injection. If set, the Electron
                 // app never fires paused(). I suspect because --require changes the
                 // startup process somehow. Regardless, we don't need it (we're injecting

src/interceptors/terminal/fresh-terminal-interceptor.ts

@@ -11,7 +11,7 @@ import { isErrorLike } from '../../util/error';
 import { canAccess, commandExists, getRealPath, resolveCommandPath } from '../../util/fs';
 import { spawnToResult } from '../../util/process-management';
 
-import { getTerminalEnvVars } from './terminal-env-overrides';
+import { getInheritableCurrentEnv, getTerminalEnvVars } from './terminal-env-overrides';
 import { editShellStartupScripts, resetShellStartupScripts } from './terminal-scripts';
 
 const DEFAULT_GIT_BASH_PATH = 'C:/Program Files/git/git-bash.exe';
@@ -247,13 +247,7 @@ export class FreshTerminalInterceptor implements Interceptor {
         // This gets reset on exit, and is behind a flag so it won't affect other shells anyway.
         if (!skipStartupScripts) await editShellStartupScripts();
 
-        const currentEnv = (process.platform === 'win32')
-            // Windows env var behaviour is very odd. Windows env vars are case-insensitive, and node
-            // simulates this for process.env accesses, but when used in an object they become
-            // case-*sensitive* object keys, and it's easy to end up with duplicates.
-            // To fix this, on Windows we enforce here that all env var input keys are uppercase.
-            ? _.mapKeys(process.env, (_value, key) => key.toUpperCase())
-            : process.env;
+        const currentEnv = getInheritableCurrentEnv();
 
         const childProc = spawn(
             command,

src/interceptors/terminal/terminal-env-overrides.ts

@@ -1,3 +1,4 @@
+import * as _ from 'lodash';
 import * as path from 'path';
 
 import { APP_ROOT } from '../../constants';
@@ -175,4 +176,28 @@ export function getTerminalEnvVars(
         // For now, we don't support intercepting BuildKit builds - disable them:
         'DOCKER_BUILDKIT': '0'
     };
+}
+
+export function getInheritableCurrentEnv() {
+    const currentEnv = (process.platform === 'win32')
+        // Windows env var behaviour is very odd. Windows env vars are case-insensitive, and node
+        // simulates this for process.env accesses, but when used in an object they become
+        // case-*sensitive* object keys, and it's easy to end up with duplicates.
+        // To fix this, on Windows we enforce here that all env var input keys are uppercase.
+        ? _.mapKeys(process.env, (_value, key) => key.toUpperCase())
+        : process.env;
+
+    // We drop various keys that are set by the server or desktop shell, and which shouldn't generally
+    // be inherited through the independently running apps.
+    return _.omit(currentEnv, [
+        // Set by us to mildly widen platform support:
+        'NODE_SKIP_PLATFORM_CHECK',
+        // Set by Oclif:
+        'HTTPTOOLKIT_SERVER_BINPATH',
+        // Set by Electron:
+        'NO_AT_BRIDGE',
+        'ORIGINAL_XDG_CURRENT_DESKTOP',
+        'GDK_BACKEND',
+        'CHROME_DESKTOP'
+    ]);
 }