diff --git a/src/hooks/claude-code-hooks/execute-http-hook-security.test.ts b/src/hooks/claude-code-hooks/execute-http-hook-security.test.ts index 243e6944a..c9b609896 100644 --- a/src/hooks/claude-code-hooks/execute-http-hook-security.test.ts +++ b/src/hooks/claude-code-hooks/execute-http-hook-security.test.ts @@ -1,3 +1,5 @@ +/// + import { describe, it, expect, mock, beforeEach, afterEach } from "bun:test" import type { HookHttp } from "./types" @@ -82,6 +84,20 @@ describe("executeHttpHook TLS security", () => { expect(mockFetch).toHaveBeenCalledTimes(1) }) + it("#when hook uses http://localhost #then does not log insecure warning", async () => { + mock.module("../../shared", () => ({ + log: mockLog, + })) + mockLog.mockReset() + const { executeHttpHook } = await importFreshExecuteHttpHook() + const hook: HookHttp = { type: "http", url: "http://localhost:8080/hooks" } + + const result = await executeHttpHook(hook, "{}") + + expect(result.exitCode).toBe(0) + expect(mockLog).not.toHaveBeenCalled() + }) + it("#when hook uses http://127.0.0.1 #then allows execution", async () => { const { executeHttpHook } = await import("./execute-http-hook") const hook: HookHttp = { type: "http", url: "http://127.0.0.1:8080/hooks" } @@ -139,7 +155,7 @@ describe("executeHttpHook TLS security", () => { expect(mockFetch).toHaveBeenCalledTimes(1) }) - it("#when hook uses plain http:// URL #then writes warning log", async () => { + it("#when hook uses plain remote http:// URL #then writes warning log", async () => { mock.module("../../shared", () => ({ log: mockLog, })) @@ -187,7 +203,7 @@ describe("executeHttpHook TLS security", () => { process.env = { ...originalEnv, NODE_ENV: "production" } }) - it("#when hook uses https:// URL #then fetch uses manual redirect handling", async () => { + it("#when hook uses https:// URL #then fetch rejects redirects manually", async () => { mockFetch.mockImplementation(() => Promise.resolve(new Response("redirect", { status: 302, statusText: "Found" })) ) diff --git a/src/hooks/claude-code-hooks/execute-http-hook.ts b/src/hooks/claude-code-hooks/execute-http-hook.ts index a50db4208..99cdb5498 100644 --- a/src/hooks/claude-code-hooks/execute-http-hook.ts +++ b/src/hooks/claude-code-hooks/execute-http-hook.ts @@ -4,7 +4,7 @@ import { log } from "../../shared" const DEFAULT_HTTP_HOOK_TIMEOUT_S = 30 const ALLOWED_SCHEMES = new Set(["http:", "https:"]) -const LOCALHOST_HOSTNAMES = new Set(["localhost", "127.0.0.1", "::1", "[::1]"]) +const LOCALHOST_HOSTNAMES = new Set(["localhost", "127.0.0.1", "[::1]"]) function isLocalhost(url: URL): boolean { return LOCALHOST_HOSTNAMES.has(url.hostname) @@ -64,8 +64,8 @@ export async function executeHttpHook( } if (isPlainHttp(parsed)) { - log("HTTP hook URL uses insecure protocol", { url: hook.url }) if (!isLocalhost(parsed)) { + log("HTTP hook URL uses insecure protocol", { url: hook.url }) return { exitCode: 1, stderr: "HTTP hook URL must use HTTPS. Plain HTTP is only allowed for localhost, 127.0.0.1, and ::1.", @@ -81,6 +81,7 @@ export async function executeHttpHook( method: "POST", headers, body: stdin, + // Reject all redirects so HTTPS hooks cannot be silently rewritten to a different origin or protocol. redirect: "manual", signal: AbortSignal.timeout(timeoutS * 1000), }) @@ -104,6 +105,7 @@ export async function executeHttpHook( return { exitCode: parsed.exitCode, stdout: body, stderr: "" } } } catch { + // Non-JSON bodies are allowed and returned as stdout below. } return { exitCode: 0, stdout: body, stderr: "" }