From e16bf23ca0924a14c3265fe7e493003e7cf8f7b0 Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Fri, 27 Mar 2026 22:13:45 -0700 Subject: [PATCH 01/10] fix: remove auth token from /health, secure extension bootstrap (CRITICAL-02 + HIGH-03) - Remove token from /health response (was leaked to any localhost process) - Write .auth.json to extension dir for Manifest V3 bootstrap - sidebar-agent reads token from state file via BROWSE_STATE_FILE env var - Remove getToken handler from extension (token via health broadcast) - Extension loads token before first health poll to prevent race condition --- .gitignore | 1 + browse/src/browser-manager.ts | 27 ++++++++++++++- browse/src/server.ts | 62 ++++++++++++++++++++++++++--------- browse/src/sidebar-agent.ts | 7 ++-- extension/background.js | 42 ++++++++++++++++-------- extension/sidepanel.js | 15 +++++---- 6 files changed, 114 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 770818be3..3cc03a596 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ bin/gstack-global-discover .claude/skills/ .agents/ .context/ +extension/.auth.json .gstack-worktrees/ /tmp/ *.log diff --git a/browse/src/browser-manager.ts b/browse/src/browser-manager.ts index 1ef58e36a..a6eda991b 100644 --- a/browse/src/browser-manager.ts +++ b/browse/src/browser-manager.ts @@ -211,7 +211,7 @@ export class BrowserManager { * The browser launches headed with a visible window — the user sees * every action Claude takes in real time. */ - async launchHeaded(): Promise { + async launchHeaded(authToken?: string): Promise { // Clear old state before repopulating this.pages.clear(); this.refMap.clear(); @@ -223,6 +223,17 @@ export class BrowserManager { if (extensionPath) { launchArgs.push(`--disable-extensions-except=${extensionPath}`); launchArgs.push(`--load-extension=${extensionPath}`); + // Write auth token for extension bootstrap (read via chrome.runtime.getURL) + if (authToken) { + const fs = require('fs'); + const path = require('path'); + const authFile = path.join(extensionPath, '.auth.json'); + try { + fs.writeFileSync(authFile, JSON.stringify({ token: authToken }), { mode: 0o600 }); + } catch (err: any) { + console.warn(`[browse] Could not write .auth.json: ${err.message}`); + } + } } // Launch headed Chromium via Playwright's persistent context. @@ -751,6 +762,20 @@ export class BrowserManager { if (extensionPath) { launchArgs.push(`--disable-extensions-except=${extensionPath}`); launchArgs.push(`--load-extension=${extensionPath}`); + // Write auth token for extension bootstrap during handoff + if (this.serverPort) { + try { + const { resolveConfig } = require('./config'); + const config = resolveConfig(); + const stateFile = path.join(config.stateDir, 'browse.json'); + if (fs.existsSync(stateFile)) { + const stateData = JSON.parse(fs.readFileSync(stateFile, 'utf-8')); + if (stateData.token) { + fs.writeFileSync(path.join(extensionPath, '.auth.json'), JSON.stringify({ token: stateData.token }), { mode: 0o600 }); + } + } + } catch {} + } console.log(`[browse] Handoff: loading extension from ${extensionPath}`); } else { console.log('[browse] Handoff: extension not found — headed mode without side panel'); diff --git a/browse/src/server.ts b/browse/src/server.ts index 00e4393a0..dca380409 100644 --- a/browse/src/server.ts +++ b/browse/src/server.ts @@ -805,7 +805,7 @@ async function start() { if (!skipBrowser) { const headed = process.env.BROWSE_HEADED === '1'; if (headed) { - await browserManager.launchHeaded(); + await browserManager.launchHeaded(AUTH_TOKEN); console.log(`[browse] Launched headed Chromium with extension`); } else { await browserManager.launch(); @@ -819,9 +819,9 @@ async function start() { fetch: async (req) => { const url = new URL(req.url); - // Cookie picker routes — no auth required (localhost-only) + // Cookie picker routes — HTML page unauthenticated, data/action routes require auth if (url.pathname.startsWith('/cookie-picker')) { - return handleCookiePickerRoute(url, req, browserManager); + return handleCookiePickerRoute(url, req, browserManager, AUTH_TOKEN); } // Health check — no auth required, does NOT reset idle timer @@ -833,7 +833,7 @@ async function start() { uptime: Math.floor((Date.now() - startTime) / 1000), tabs: browserManager.getTabCount(), currentUrl: browserManager.getCurrentUrl(), - token: AUTH_TOKEN, // Extension uses this for Bearer auth + // token removed — see .auth.json for extension bootstrap chatEnabled: true, agent: { status: agentStatus, @@ -848,8 +848,14 @@ async function start() { }); } - // Refs endpoint — no auth required (localhost-only), does NOT reset idle timer + // Refs endpoint — auth required, does NOT reset idle timer if (url.pathname === '/refs') { + if (!validateAuth(req)) { + return new Response(JSON.stringify({ error: 'Unauthorized' }), { + status: 401, + headers: { 'Content-Type': 'application/json' }, + }); + } const refs = browserManager.getRefMap(); return new Response(JSON.stringify({ refs, @@ -857,15 +863,20 @@ async function start() { mode: browserManager.getConnectionMode(), }), { status: 200, - headers: { - 'Content-Type': 'application/json', - 'Access-Control-Allow-Origin': '*', - }, + headers: { 'Content-Type': 'application/json' }, }); } - // Activity stream — SSE, no auth (localhost-only), does NOT reset idle timer + // Activity stream — SSE, auth required, does NOT reset idle timer if (url.pathname === '/activity/stream') { + // Inline auth: accept Bearer header OR ?token= query param (EventSource can't send headers) + const streamToken = url.searchParams.get('token'); + if (!validateAuth(req) && streamToken !== AUTH_TOKEN) { + return new Response(JSON.stringify({ error: 'Unauthorized' }), { + status: 401, + headers: { 'Content-Type': 'application/json' }, + }); + } const afterId = parseInt(url.searchParams.get('after') || '0', 10); const encoder = new TextEncoder(); @@ -913,21 +924,23 @@ async function start() { 'Content-Type': 'text/event-stream', 'Cache-Control': 'no-cache', 'Connection': 'keep-alive', - 'Access-Control-Allow-Origin': '*', }, }); } - // Activity history — REST, no auth (localhost-only), does NOT reset idle timer + // Activity history — REST, auth required, does NOT reset idle timer if (url.pathname === '/activity/history') { + if (!validateAuth(req)) { + return new Response(JSON.stringify({ error: 'Unauthorized' }), { + status: 401, + headers: { 'Content-Type': 'application/json' }, + }); + } const limit = parseInt(url.searchParams.get('limit') || '50', 10); const { entries, totalAdded } = getActivityHistory(limit); return new Response(JSON.stringify({ entries, totalAdded, subscribers: getSubscriberCount() }), { status: 200, - headers: { - 'Content-Type': 'application/json', - 'Access-Control-Allow-Origin': '*', - }, + headers: { 'Content-Type': 'application/json' }, }); } @@ -1139,6 +1152,23 @@ async function start() { fs.renameSync(tmpFile, config.stateFile); browserManager.serverPort = port; + + // Clean up stale state files (older than 7 days) + try { + const stateDir = path.join(config.stateDir, 'browse-states'); + if (fs.existsSync(stateDir)) { + const SEVEN_DAYS = 7 * 24 * 60 * 60 * 1000; + for (const file of fs.readdirSync(stateDir)) { + const filePath = path.join(stateDir, file); + const stat = fs.statSync(filePath); + if (Date.now() - stat.mtimeMs > SEVEN_DAYS) { + fs.unlinkSync(filePath); + console.log(`[browse] Deleted stale state file: ${file}`); + } + } + } + } catch {} + console.log(`[browse] Server running on http://127.0.0.1:${port} (PID: ${process.pid})`); console.log(`[browse] State file: ${config.stateFile}`); console.log(`[browse] Idle timeout: ${IDLE_TIMEOUT_MS / 1000}s`); diff --git a/browse/src/sidebar-agent.ts b/browse/src/sidebar-agent.ts index 6eb2cebbb..ecce778ee 100644 --- a/browse/src/sidebar-agent.ts +++ b/browse/src/sidebar-agent.ts @@ -66,10 +66,11 @@ function writeToInbox(message: string, pageUrl?: string, sessionId?: string): vo // ─── Auth ──────────────────────────────────────────────────────── async function refreshToken(): Promise { + // Read token from state file (same-user, mode 0o600) instead of /health try { - const resp = await fetch(`${SERVER_URL}/health`, { signal: AbortSignal.timeout(3000) }); - if (!resp.ok) return null; - const data = await resp.json() as any; + const stateFile = process.env.BROWSE_STATE_FILE || + path.join(process.env.HOME || '/tmp', '.gstack', 'browse.json'); + const data = JSON.parse(fs.readFileSync(stateFile, 'utf-8')); authToken = data.token || null; return authToken; } catch { diff --git a/extension/background.js b/extension/background.js index a4e72d3f6..af1f32ea6 100644 --- a/extension/background.js +++ b/extension/background.js @@ -30,6 +30,19 @@ function getBaseUrl() { return serverPort ? `http://127.0.0.1:${serverPort}` : null; } +// ─── Auth Token Bootstrap ───────────────────────────────────── + +async function loadAuthToken() { + if (authToken) return; + try { + const resp = await fetch(chrome.runtime.getURL('.auth.json')); + if (resp.ok) { + const data = await resp.json(); + if (data.token) authToken = data.token; + } + } catch {} +} + // ─── Health Polling ──────────────────────────────────────────── async function checkHealth() { @@ -39,13 +52,14 @@ async function checkHealth() { return; } + // Retry loading auth token if we don't have one yet + if (!authToken) await loadAuthToken(); + try { const resp = await fetch(`${base}/health`, { signal: AbortSignal.timeout(3000) }); if (!resp.ok) { setDisconnected(); return; } const data = await resp.json(); if (data.status === 'healthy') { - // Capture auth token from health response - if (data.token) authToken = data.token; // Forward chatEnabled so sidepanel can show/hide chat tab setConnected({ ...data, chatEnabled: !!data.chatEnabled }); } else { @@ -62,8 +76,8 @@ function setConnected(healthData) { chrome.action.setBadgeBackgroundColor({ color: '#F59E0B' }); chrome.action.setBadgeText({ text: ' ' }); - // Broadcast health to popup and side panel - chrome.runtime.sendMessage({ type: 'health', data: healthData }).catch(() => {}); + // Broadcast health to popup and side panel (include token for sidepanel auth) + chrome.runtime.sendMessage({ type: 'health', data: { ...healthData, token: authToken } }).catch(() => {}); // Notify content scripts on connection change if (wasDisconnected) { @@ -74,7 +88,7 @@ function setConnected(healthData) { function setDisconnected() { const wasConnected = isConnected; isConnected = false; - authToken = null; + // Keep authToken — it comes from .auth.json, not /health chrome.action.setBadgeText({ text: '' }); chrome.runtime.sendMessage({ type: 'health', data: null }).catch(() => {}); @@ -128,7 +142,9 @@ async function fetchAndRelayRefs() { if (!base || !isConnected) return; try { - const resp = await fetch(`${base}/refs`, { signal: AbortSignal.timeout(3000) }); + const headers = {}; + if (authToken) headers['Authorization'] = `Bearer ${authToken}`; + const resp = await fetch(`${base}/refs`, { signal: AbortSignal.timeout(3000), headers }); if (!resp.ok) return; const data = await resp.json(); @@ -163,10 +179,7 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => { return true; } - if (msg.type === 'getToken') { - sendResponse({ token: authToken }); - return true; - } + // getToken handler removed — token distributed via health broadcast if (msg.type === 'fetchRefs') { fetchAndRelayRefs().then(() => sendResponse({ ok: true })); @@ -237,7 +250,10 @@ chrome.runtime.onInstalled.addListener(async () => { // ─── Startup ──────────────────────────────────────────────────── -loadPort().then(() => { - checkHealth(); - healthInterval = setInterval(checkHealth, 10000); +// Load auth token BEFORE first health poll (token no longer in /health response) +loadAuthToken().then(() => { + loadPort().then(() => { + checkHealth(); + healthInterval = setInterval(checkHealth, 10000); + }); }); diff --git a/extension/sidepanel.js b/extension/sidepanel.js index 9ba7c5a26..2ee3da6b3 100644 --- a/extension/sidepanel.js +++ b/extension/sidepanel.js @@ -413,7 +413,7 @@ function createEntryElement(entry) { div.innerHTML = `
${formatTime(entry.timestamp)} - ${entry.command || entry.type} + ${escapeHtml(entry.command || entry.type)}
${argsText ? `
${escapeHtml(argsText)}
` : ''} ${entry.type === 'command_end' ? ` @@ -469,7 +469,8 @@ function connectSSE() { if (!serverUrl) return; if (eventSource) { eventSource.close(); eventSource = null; } - const url = `${serverUrl}/activity/stream?after=${lastId}`; + const tokenParam = serverToken ? `&token=${serverToken}` : ''; + const url = `${serverUrl}/activity/stream?after=${lastId}${tokenParam}`; eventSource = new EventSource(url); eventSource.addEventListener('activity', (e) => { @@ -493,7 +494,9 @@ function connectSSE() { async function fetchRefs() { if (!serverUrl) return; try { - const resp = await fetch(`${serverUrl}/refs`, { signal: AbortSignal.timeout(3000) }); + const headers = {}; + if (serverToken) headers['Authorization'] = `Bearer ${serverToken}`; + const resp = await fetch(`${serverUrl}/refs`, { signal: AbortSignal.timeout(3000), headers }); if (!resp.ok) return; const data = await resp.json(); @@ -594,10 +597,8 @@ function tryConnect() { chrome.runtime.sendMessage({ type: 'getPort' }, (resp) => { if (resp && resp.port && resp.connected) { const url = `http://127.0.0.1:${resp.port}`; - // Get the token from background - chrome.runtime.sendMessage({ type: 'getToken' }, (tokenResp) => { - updateConnection(url, tokenResp?.token); - }); + // Token arrives via health broadcast from background.js + updateConnection(url, null); } else { setTimeout(tryConnect, 2000); } From 480f4bb23d55eb929093b9e5354956697035acde Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Fri, 27 Mar 2026 22:13:48 -0700 Subject: [PATCH 02/10] fix: require auth on cookie-picker data routes (CRITICAL-01) - Add Bearer token auth gate on all /cookie-picker/* data/action routes - GET /cookie-picker HTML page stays unauthenticated (UI shell) - Token embedded in served HTML for picker's fetch calls - CORS preflight now allows Authorization header --- browse/src/cookie-picker-routes.ts | 16 ++++++++++++++-- browse/src/cookie-picker-ui.ts | 7 +++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/browse/src/cookie-picker-routes.ts b/browse/src/cookie-picker-routes.ts index 0e6972484..f36a66600 100644 --- a/browse/src/cookie-picker-routes.ts +++ b/browse/src/cookie-picker-routes.ts @@ -53,6 +53,7 @@ export async function handleCookiePickerRoute( url: URL, req: Request, bm: BrowserManager, + authToken?: string, ): Promise { const pathname = url.pathname; const port = parseInt(url.port, 10) || 9400; @@ -64,7 +65,7 @@ export async function handleCookiePickerRoute( headers: { 'Access-Control-Allow-Origin': corsOrigin(port), 'Access-Control-Allow-Methods': 'GET, POST, OPTIONS', - 'Access-Control-Allow-Headers': 'Content-Type', + 'Access-Control-Allow-Headers': 'Content-Type, Authorization', }, }); } @@ -72,13 +73,24 @@ export async function handleCookiePickerRoute( try { // GET /cookie-picker — serve the picker UI if (pathname === '/cookie-picker' && req.method === 'GET') { - const html = getCookiePickerHTML(port); + const html = getCookiePickerHTML(port, authToken); return new Response(html, { status: 200, headers: { 'Content-Type': 'text/html; charset=utf-8' }, }); } + // ─── Auth gate: all data/action routes below require Bearer token ─── + if (authToken) { + const authHeader = req.headers.get('authorization'); + if (!authHeader || authHeader !== `Bearer ${authToken}`) { + return new Response(JSON.stringify({ error: 'Unauthorized' }), { + status: 401, + headers: { 'Content-Type': 'application/json' }, + }); + } + } + // GET /cookie-picker/browsers — list installed browsers if (pathname === '/cookie-picker/browsers' && req.method === 'GET') { const browsers = findInstalledBrowsers(); diff --git a/browse/src/cookie-picker-ui.ts b/browse/src/cookie-picker-ui.ts index 381cf2e2f..70faa5621 100644 --- a/browse/src/cookie-picker-ui.ts +++ b/browse/src/cookie-picker-ui.ts @@ -7,7 +7,7 @@ * No cookie values exposed anywhere. */ -export function getCookiePickerHTML(serverPort: number): string { +export function getCookiePickerHTML(serverPort: number, authToken?: string): string { const baseUrl = `http://127.0.0.1:${serverPort}`; return ` @@ -330,6 +330,7 @@ export function getCookiePickerHTML(serverPort: number): string {