fix(browser): reject invalid tab indexes

steipete · steipete · commit 0bc591a7d781 · 2026-05-29T03:07:15.000-04:00
diff --git a/extensions/browser/src/browser/routes/tabs.test.ts b/extensions/browser/src/browser/routes/tabs.test.ts
@@ -335,6 +335,26 @@ describe("browser tab routes", () => {
     expect(navigationGuardMocks.assertBrowserNavigationResultAllowed).not.toHaveBeenCalled();
   });
 
+  it("rejects invalid tab action indexes instead of treating them as omitted", async () => {
+    const profileCtx = createProfileContext();
+
+    const closeResponse = await callTabsAction({
+      body: { action: "close", index: "nope" },
+      profileCtx,
+    });
+    const selectResponse = await callTabsAction({
+      body: { action: "select", index: "1e0" },
+      profileCtx,
+    });
+
+    expect(closeResponse.statusCode).toBe(400);
+    expect(closeResponse.body).toEqual({ error: "index must be a non-negative integer" });
+    expect(selectResponse.statusCode).toBe(400);
+    expect(selectResponse.body).toEqual({ error: "index must be a non-negative integer" });
+    expect(profileCtx.closeTab).not.toHaveBeenCalled();
+    expect(profileCtx.focusTab).not.toHaveBeenCalled();
+  });
+
   it("labels tabs by friendly target handles", async () => {
     const profileCtx = createProfileContext();
 
diff --git a/extensions/browser/src/browser/routes/tabs.ts b/extensions/browser/src/browser/routes/tabs.ts
@@ -1,3 +1,4 @@
+import { parseStrictNonNegativeInteger } from "openclaw/plugin-sdk/number-runtime";
 import { resolveBrowserNavigationProxyMode } from "../browser-proxy-mode.js";
 import {
   BrowserProfileUnavailableError,
@@ -12,13 +13,7 @@ import {
 import type { BrowserRouteContext, ProfileContext } from "../server-context.js";
 import { resolveTargetIdFromTabs } from "../target-id.js";
 import type { BrowserRequest, BrowserResponse, BrowserRouteRegistrar } from "./types.js";
-import {
-  asyncBrowserRoute,
-  getProfileContext,
-  jsonError,
-  toNumber,
-  toStringOrEmpty,
-} from "./utils.js";
+import { asyncBrowserRoute, getProfileContext, jsonError, toStringOrEmpty } from "./utils.js";
 
 function resolveTabsProfileContext(
   req: BrowserRequest,
@@ -136,6 +131,27 @@ function readOptionalTabLabel(body: unknown): string | undefined {
   return label || undefined;
 }
 
+function readTabIndex(
+  res: BrowserResponse,
+  body: unknown,
+  opts?: { required?: boolean },
+): number | null | undefined {
+  const record = body && typeof body === "object" ? (body as Record<string, unknown>) : {};
+  if (!Object.hasOwn(record, "index")) {
+    if (opts?.required) {
+      jsonError(res, 400, "index is required");
+      return null;
+    }
+    return undefined;
+  }
+  const index = parseStrictNonNegativeInteger(record.index);
+  if (index === undefined) {
+    jsonError(res, 400, "index must be a non-negative integer");
+    return null;
+  }
+  return index;
+}
+
 async function runTabTargetMutation(params: {
   req: BrowserRequest;
   res: BrowserResponse;
@@ -269,7 +285,6 @@ export function registerBrowserTabRoutes(app: BrowserRouteRegistrar, ctx: Browse
     "/tabs/action",
     asyncBrowserRoute(async (req, res) => {
       const action = toStringOrEmpty((req.body as { action?: unknown })?.action);
-      const index = toNumber((req.body as { index?: unknown })?.index);
 
       await withTabsProfileRoute({
         req,
@@ -320,6 +335,10 @@ export function registerBrowserTabRoutes(app: BrowserRouteRegistrar, ctx: Browse
             if (!(await ensureBrowserRunning(profileCtx, res))) {
               return;
             }
+            const index = readTabIndex(res, req.body);
+            if (index === null) {
+              return;
+            }
             const tabs = await profileCtx.listTabs();
             const target = resolveIndexedTab(tabs, index);
             if (!target) {
@@ -330,8 +349,9 @@ export function registerBrowserTabRoutes(app: BrowserRouteRegistrar, ctx: Browse
           }
 
           if (action === "select") {
-            if (typeof index !== "number") {
-              return jsonError(res, 400, "index is required");
+            const index = readTabIndex(res, req.body, { required: true });
+            if (index === null || index === undefined) {
+              return;
             }
             if (!(await ensureBrowserRunning(profileCtx, res))) {
               return;
