fix: Cloud sign-in fails when user is behind a network proxy (#756)

Author: allansson

package-lock.json

@@ -138,6 +138,7 @@
     "tiny-invariant": "^1.3.3",
     "tree-kill": "^1.2.2",
     "typescript": "^5.4.5",
+    "undici": "^7.10.0",
     "update-electron-app": "^3.0.0",
     "use-konami": "^1.0.1",
     "webextension-polyfill": "^0.12.0",

package.json

@@ -19,6 +19,7 @@ import { getSettings, initSettings } from './main/settings'
 import { closeWatcher, configureWatcher } from './main/watcher'
 import { showWindow, trackWindowState } from './main/window'
 import { BrowserServer } from './services/browser/server'
+import { configureSystemProxy } from './services/http'
 import { ProxyStatus } from './types'
 import { sendReport } from './usageReport'
 import { getAppIcon, getPlatform } from './utils/electron'
@@ -136,6 +137,9 @@ const createWindow = async () => {
     mainWindow.webContents.send(ProxyHandler.ChangeStatus, status)
   })
 
+  // Configure proxy settings for `fetch`.
+  await configureSystemProxy()
+
   // Start proxy
   k6StudioState.currentProxyProcess =
     await launchProxyAndAttachEmitter(mainWindow)

src/main.ts

@@ -4,6 +4,8 @@ import { existsSync, readFileSync } from 'fs'
 import { writeFile, open } from 'fs/promises'
 import path from 'node:path'
 
+import { configureSystemProxy } from '@/services/http'
+
 import { AppSettingsSchema } from '../schemas/settings'
 import { AppSettings } from '../types/settings'
 import { getPlatform } from '../utils/electron'
@@ -177,16 +179,22 @@ export async function applySettings(
 ) {
   if (modifiedSettings.proxy) {
     await stopProxyProcess()
+
     k6StudioState.appSettings.proxy = modifiedSettings.proxy
     k6StudioState.currentProxyProcess =
       await launchProxyAndAttachEmitter(browserWindow)
+
+    await configureSystemProxy()
   }
+
   if (modifiedSettings.recorder) {
     k6StudioState.appSettings.recorder = modifiedSettings.recorder
   }
+
   if (modifiedSettings.telemetry) {
     k6StudioState.appSettings.telemetry = modifiedSettings.telemetry
   }
+
   if (modifiedSettings.appearance) {
     k6StudioState.appSettings.appearance = modifiedSettings.appearance
     nativeTheme.themeSource = k6StudioState.appSettings.appearance.theme

src/main/settings.ts

@@ -33,4 +33,5 @@ export {
   RecorderSettingsSchema,
   TelemetrySchema,
   WindowStateSchema,
+  type UpstreamProxySettings,
 } from './v3'

src/schemas/settings/index.ts

@@ -125,4 +125,5 @@ export function migrate(
   }
 }
 
+export type UpstreamProxySettings = z.infer<typeof UpstreamProxySettingsSchema>
 export type AppSettings = z.infer<typeof AppSettingsSchema>

src/schemas/settings/v1/index.ts

@@ -5,6 +5,7 @@ import {
   ProxySettingsSchema,
   RecorderSettingsSchema,
   WindowStateSchema,
+  type UpstreamProxySettings,
 } from '../v1'
 
 const TelemetrySchema = z.object({
@@ -18,6 +19,7 @@ export {
   RecorderSettingsSchema,
   TelemetrySchema,
   WindowStateSchema,
+  type UpstreamProxySettings,
 }
 
 export const AppSettingsSchema = z.object({

src/schemas/settings/v3/index.ts

@@ -0,0 +1,54 @@
+import log from 'electron-log/main'
+import { readFile } from 'node:fs/promises'
+import { getGlobalDispatcher, ProxyAgent, setGlobalDispatcher } from 'undici'
+
+import { UpstreamProxySettings } from '@/schemas/settings'
+
+const DEFAULT_DISPATCHER = getGlobalDispatcher()
+
+async function readCertificate(path: string | undefined) {
+  if (path === undefined || path.trim() === '') {
+    return undefined
+  }
+
+  try {
+    return await readFile(path, 'utf-8')
+  } catch (error) {
+    log.error('Failed to read proxy certificate.', error)
+
+    return undefined
+  }
+}
+
+function getAuthorizationHeader({ username, password }: UpstreamProxySettings) {
+  if (username === undefined || password === undefined) {
+    return undefined
+  }
+
+  return {
+    'Proxy-Authorization': `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`,
+  }
+}
+
+export async function configureSystemProxy() {
+  const proxy = k6StudioState.appSettings.proxy
+
+  if (proxy.mode === 'regular') {
+    setGlobalDispatcher(DEFAULT_DISPATCHER)
+
+    return
+  }
+
+  const certificate = await readCertificate(proxy.certificatePath)
+
+  const agent = new ProxyAgent({
+    uri: proxy.url,
+    headers: getAuthorizationHeader(proxy),
+    requestTls: {
+      ca: certificate,
+      rejectUnauthorized: !proxy.sslInsecure,
+    },
+  })
+
+  setGlobalDispatcher(agent)
+}