Chrome DevTools for coding agents
fix(cli): validate session ids (#2475)
Alex Rudenko5ca9121d1805
diff --git a/src/bin/chrome-devtools.ts b/src/bin/chrome-devtools.tsindex 84714cb8..812677cf 100644--- a/src/bin/chrome-devtools.ts+++ b/src/bin/chrome-devtools.ts@@ -20,7 +20,11 @@ import {verifyDaemonVersion,} from '../daemon/client.js';import type {DaemonStatusResult} from '../daemon/types.js';-import {isDaemonRunning, serializeArgs} from '../daemon/utils.js';+import {+ isDaemonRunning,+ serializeArgs,+ assertValidSessionId,+} from '../daemon/utils.js';import {logDisclaimers} from '../index.js';import {hideBin, yargs, type CallToolResult} from '../third_party/index.js';import {checkForUpdates} from '../utils/check-for-updates.js';@@ -76,6 +80,10 @@ const y = yargs(hideBin(process.argv))description: 'Session ID for daemon scoping',default: '',hidden: true,+ coerce: (sessionId: string) => {+ assertValidSessionId(sessionId);+ return sessionId;+ },}).demandCommand().version(VERSION)diff --git a/src/daemon/daemon.ts b/src/daemon/daemon.tsindex ab841a84..50690c87 100644--- a/src/daemon/daemon.ts+++ b/src/daemon/daemon.ts@@ -28,9 +28,11 @@ import {INDEX_SCRIPT_PATH,IS_WINDOWS,isDaemonRunning,+ assertValidSessionId,} from './utils.js';const sessionId = process.env.CHROME_DEVTOOLS_MCP_SESSION_ID || '';+assertValidSessionId(sessionId);logger?.(`Daemon sessionId: ${sessionId}`);if (isDaemonRunning(sessionId)) {logger?.('Another daemon process is running.');diff --git a/src/daemon/utils.ts b/src/daemon/utils.tsindex 8114071b..7e30c9c6 100644--- a/src/daemon/utils.ts+++ b/src/daemon/utils.ts@@ -23,8 +23,18 @@ export const INDEX_SCRIPT_PATH = path.join(const APP_NAME = 'chrome-devtools-mcp';export const DAEMON_CLIENT_NAME = 'chrome-devtools-cli-daemon';+export function assertValidSessionId(sessionId: string): void {+ if (!sessionId) {+ return;+ }+ if (!/^[a-fA-F0-9-]+$/.test(sessionId)) {+ throw new Error(`Invalid sessionId: ${sessionId}`);+ }+}+// Using these paths due to strict limits on the POSIX socket path length.export function getSocketPath(sessionId: string): string {+ assertValidSessionId(sessionId);const uid = os.userInfo().uid;const username = os.userInfo().username;const suffix = sessionId ? `-${sessionId}` : '';@@ -49,6 +59,7 @@ export function getSocketPath(sessionId: string): string {}export function getRuntimeHome(sessionId: string): string {+ assertValidSessionId(sessionId);const platform = os.platform();const uid = os.userInfo().uid;const suffix = sessionId ? `-${sessionId}` : '';@@ -72,11 +83,13 @@ export function getRuntimeHome(sessionId: string): string {export const IS_WINDOWS = os.platform() === 'win32';export function getPidFilePath(sessionId: string) {+ assertValidSessionId(sessionId);const runtimeDir = getRuntimeHome(sessionId);return path.join(runtimeDir, 'daemon.pid');}export function getDaemonPid(sessionId: string) {+ assertValidSessionId(sessionId);try {const pidFile = getPidFilePath(sessionId);logger?.(`Daemon pid file ${pidFile} sessionId=${sessionId}`);@@ -96,6 +109,7 @@ export function getDaemonPid(sessionId: string) {}export function isDaemonRunning(sessionId: string): boolean {+ assertValidSessionId(sessionId);const pid = getDaemonPid(sessionId);if (pid) {try {diff --git a/tests/daemon/utils.test.ts b/tests/daemon/utils.test.tsindex c0fb045c..41e13ab4 100644--- a/tests/daemon/utils.test.ts+++ b/tests/daemon/utils.test.ts@@ -8,9 +8,39 @@ import assert from 'node:assert';import {describe, it} from 'node:test';import type {ParsedArguments} from '../../src/bin/chrome-devtools-mcp-cli-options.js';-import {serializeArgs} from '../../src/daemon/utils.js';+import {serializeArgs, assertValidSessionId} from '../../src/daemon/utils.js';import type {YargsOptions} from '../../src/third_party/index.js';+describe('assertValidSessionId', () => {+ it('should not throw for empty sessionId', () => {+ assert.doesNotThrow(() => assertValidSessionId(''));+ });++ it('should not throw for valid UUID', () => {+ assert.doesNotThrow(() =>+ assertValidSessionId('123e4567-e89b-12d3-a456-426614174000'),+ );+ assert.doesNotThrow(() =>+ assertValidSessionId('aabbccdd-1122-3344-5566-77889900aabb'),+ );+ });++ it('should throw for invalid sessionId formats', () => {+ assert.throws(+ () => assertValidSessionId('../../../etc/passwd'),+ /Invalid sessionId/,+ );+ assert.throws(+ () => assertValidSessionId('sessionId_with_underscore'),+ /Invalid sessionId/,+ );+ assert.throws(+ () => assertValidSessionId('session@id'),+ /Invalid sessionId/,+ );+ });+});+describe('serializeArgs', () => {it('should ignore undefined or null values', () => {const options: Record<string, YargsOptions> = {