Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(web-search): address internal review regressions and bounded tooling
Alfredo Lopez8691c62bfd55
diff --git a/mcp-servers/web-search/package-lock.json b/mcp-servers/web-search/package-lock.jsonindex 4819338c3..99feada2e 100644--- a/mcp-servers/web-search/package-lock.json+++ b/mcp-servers/web-search/package-lock.json@@ -1,12 +1,12 @@{"name": "@clerum/web-search-mcp",- "version": "1.0.11",+ "version": "1.0.12","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "@clerum/web-search-mcp",- "version": "1.0.11",+ "version": "1.0.12","dependencies": {"@modelcontextprotocol/sdk": "^1.12.1","express": "^4.21.2"diff --git a/mcp-servers/web-search/package.json b/mcp-servers/web-search/package.jsonindex c3f6b17e5..214a33e63 100644--- a/mcp-servers/web-search/package.json+++ b/mcp-servers/web-search/package.json@@ -1,6 +1,6 @@{"name": "@clerum/web-search-mcp",- "version": "1.0.11",+ "version": "1.0.12","type": "module","main": "dist/index.js","scripts": {diff --git a/mcp-servers/web-search/src/fetchPage.ts b/mcp-servers/web-search/src/fetchPage.tsindex 8aea34756..3dcb0a8d7 100644--- a/mcp-servers/web-search/src/fetchPage.ts+++ b/mcp-servers/web-search/src/fetchPage.ts@@ -39,7 +39,9 @@ export function pageText(html: string): string {}function titleText(html: string): string {- const lower = html.toLowerCase()+ // HTML tag names are ASCII-case-insensitive. Unicode lowercasing can expand+ // characters and invalidate offsets subsequently applied to the original HTML.+ const lower = html.replace(/[A-Z]/g, character => character.toLowerCase())const start = lower.indexOf('<title')if (start === -1 || !/[\s>]/.test(lower[start + 6] ?? '')) return ''const body = lower.indexOf('>', start + 6)diff --git a/mcp-servers/web-search/test/destination.test.mjs b/mcp-servers/web-search/test/destination.test.mjsindex ea5ee652e..6aea08e4d 100644--- a/mcp-servers/web-search/test/destination.test.mjs+++ b/mcp-servers/web-search/test/destination.test.mjs@@ -1,6 +1,6 @@import assert from 'node:assert/strict'import { Resolver } from 'node:dns/promises'-import { mock, test } from 'node:test'+import { test } from 'node:test'import { isPublicAddress, parsePageUrl, resolvePageAddress } from '../dist/fetchPageDestination.js'const blocked = [diff --git a/mcp-servers/web-search/test/fetchPage.test.mjs b/mcp-servers/web-search/test/fetchPage.test.mjsindex 498278de1..a167fd8ea 100644--- a/mcp-servers/web-search/test/fetchPage.test.mjs+++ b/mcp-servers/web-search/test/fetchPage.test.mjs@@ -179,3 +179,13 @@ test('DNS host connects only to the validated address and preserves Host', asyncassert.equal(requests[0].hostname, '8.8.8.8')assert.equal(requests[0].headers.Host, 'fixture.test:8080')})++for (const [html, expectedTitle] of [+ ['<title>İstanbul</title><p>Hello</p>', 'İstanbul'],+ ['<!--İ--><title>Hello</title>', 'Hello'],+]) {+ test(`title offsets remain valid for Unicode: ${expectedTitle}`, async t => {+ upstream(t, [{ body: html }])+ assert.equal((await fetchPage('http://8.8.8.8', 100)).title, expectedTitle)+ })+}diff --git a/mcp-servers/web-search/test/run-network.mjs b/mcp-servers/web-search/test/run-network.mjsindex 2bd612f19..b2db64863 100644--- a/mcp-servers/web-search/test/run-network.mjs+++ b/mcp-servers/web-search/test/run-network.mjs@@ -8,6 +8,7 @@ import { fileURLToPath } from 'node:url'// Development-only: no external network, published ports, or credential mounts.if (process.versions.node.split('.')[0] !== '24') throw new Error('Use Node 24 for network tests')const root = realpathSync(fileURLToPath(new URL('..', import.meta.url)))+const deadlineRunner = path.resolve(root, '../../scripts/minikube/run-with-deadline.mjs')const image =process.argv[2] === '--image' && process.argv.length === 4 ? process.argv[3] : undefinedif (process.argv.length > 2 && !image)@@ -17,6 +18,7 @@ const endpoint =execFileSync('docker', ['context', 'inspect', '--format', '{{.Endpoints.docker.Host}}'], {encoding: 'utf8',timeout: 10000,+ killSignal: 'SIGKILL',}).trim()if (!endpoint.startsWith('unix:///') &&@@ -45,7 +47,7 @@ try {'-addext','subjectAltName=DNS:fixture.test,DNS:rebind.test,IP:11.198.0.2',],- { stdio: 'ignore', timeout: 10000 }+ { stdio: 'ignore', timeout: 10000, killSignal: 'SIGKILL' })// Linux bind mounts retain the runner UID. Container root with ALL caps// dropped cannot read its 0700 directory. Grant only the host group access@@ -89,7 +91,6 @@ try {'ip addr add 11.198.0.2/32 dev lo; ip -6 addr add 2606:4700::198/128 dev lo; test -z "$(ip -6 route show default)"; test -z "$(ip route show default)"; printf "nameserver 127.0.0.1\\n" > /etc/resolv.conf; node --test /app/test/mcp.network.mjs')let child- let timeoutlet interrupted = falseconst stop = () => {interrupted = true@@ -98,27 +99,46 @@ try {process.once('SIGINT', stop)process.once('SIGTERM', stop)try {- child = spawn('docker', args, { stdio: 'inherit' })- timeout = setTimeout(stop, 60000)+ // Docker can proxy SIGTERM without exiting. Reuse the canonical process+ // deadline/escalation before exact-name cleanup instead of waiting forever.+ child = spawn(+ process.execPath,+ [+ deadlineRunner,+ '--timeout-seconds',+ '60',+ '--kill-grace-seconds',+ '5',+ '--label',+ 'web-search-network',+ '--',+ 'docker',+ ...args,+ ],+ { stdio: 'inherit' }+ )const status = await new Promise((resolve, reject) => {child.once('error', reject)child.once('exit', resolve)})process.exitCode = interrupted || status !== 0 ? 1 : 0} finally {- clearTimeout(timeout)process.removeListener('SIGINT', stop)process.removeListener('SIGTERM', stop)// Random name belongs exclusively to this invocation, including on timeout.try {- execFileSync('docker', [...docker, 'rm', '-f', name], { stdio: 'ignore', timeout: 10000 })+ execFileSync('docker', [...docker, 'rm', '-f', name], {+ stdio: 'ignore',+ timeout: 10000,+ killSignal: 'SIGKILL',+ })} catch {// --rm may already have removed it. Prove absence; a Docker failure is not cleanup.try {const remaining = execFileSync('docker',[...docker, 'ps', '-aq', '--filter', `name=^/${name}$`],- { encoding: 'utf8', timeout: 10000 }+ { encoding: 'utf8', timeout: 10000, killSignal: 'SIGKILL' }).trim()if (remaining) throw new Error('The test container remains after cleanup')} catch {diff --git a/mcp-servers/web-search/test/runnerCancellation.test.mjs b/mcp-servers/web-search/test/runnerCancellation.test.mjsnew file mode 100644index 000000000..d54f8f652--- /dev/null+++ b/mcp-servers/web-search/test/runnerCancellation.test.mjs@@ -0,0 +1,94 @@+import assert from 'node:assert/strict'+import { execFileSync, spawn } from 'node:child_process'+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'+import { tmpdir } from 'node:os'+import path from 'node:path'+import { test } from 'node:test'+import { fileURLToPath } from 'node:url'++test(+ 'network runner escalates cancellation and cleans its exact container',+ { timeout: 25000 },+ async () => {+ const runner = fileURLToPath(new URL('./run-network.mjs', import.meta.url))+ const probe = mkdtempSync(path.join(tmpdir(), 'pr608-runner-'))+ const fake = path.join(probe, 'docker')+ writeFileSync(+ fake,+ `#!${process.execPath}+const fs = require('node:fs');+const dir = process.env.PR608_PROBE_DIR;+const args = process.argv.slice(2);+if (args.includes('run')) {+ const name = args[args.indexOf('--name')+1];+ process.on('SIGTERM',()=>{});+ setInterval(()=>{},1000);+ fs.writeFileSync(dir+'/running.json', JSON.stringify({name,pid:process.pid})); // Deliberately unresponsive external CLI fixture.+} else if (args.includes('rm')) {+ fs.writeFileSync(dir+'/removed.txt',args.at(-1));+} else if (args.includes('ps')) {+ process.exit(0);+} else process.exit(2);+`,+ { mode: 0o755 }+ )+ const child = spawn(process.execPath, [runner], {+ env: {+ PATH: probe + ':' + path.dirname(process.execPath) + ':/usr/bin:/bin',+ DOCKER_HOST: 'unix:///tmp/pr608-unused.sock',+ PR608_PROBE_DIR: probe,+ },+ stdio: ['ignore', 'pipe', 'pipe'],+ })+ let output = ''+ child.stdout.on('data', chunk => (output += chunk))+ child.stderr.on('data', chunk => (output += chunk))+ let fakePid+ try {+ await new Promise((resolve, reject) => {+ const limit = setTimeout(() => {+ clearInterval(poll)+ reject(new Error('fake CLI not reached: ' + output))+ }, 15000)+ const poll = setInterval(() => {+ if (existsSync(path.join(probe, 'running.json'))) {+ clearInterval(poll)+ clearTimeout(limit)+ resolve()+ }+ }, 10)+ })+ const started = JSON.parse(readFileSync(path.join(probe, 'running.json'), 'utf8'))+ fakePid = started.pid+ const start = performance.now()+ child.kill('SIGTERM')+ const code = await new Promise((resolve, reject) => {+ const limit = setTimeout(+ () => reject(new Error('runner did not stop within 8 seconds')),+ 8000+ )+ child.once('exit', code => {+ clearTimeout(limit)+ resolve(code)+ })+ })+ assert.notEqual(code, 0)+ assert.equal(readFileSync(path.join(probe, 'removed.txt'), 'utf8'), started.name)+ assert.throws(() => process.kill(fakePid, 0), { code: 'ESRCH' })+ console.log(+ 'RUNNER_CANCELLATION_CLEANUP_PASS elapsedMs=' + Math.round(performance.now() - start)+ )+ } finally {+ if (child.exitCode === null && child.signalCode === null) child.kill('SIGKILL')+ if (fakePid) {+ try {+ const command = execFileSync('ps', ['-ww', '-p', String(fakePid), '-o', 'command='], {+ encoding: 'utf8',+ })+ if (command.includes(fake)) process.kill(fakePid, 'SIGKILL')+ } catch {}+ }+ rmSync(probe, { recursive: true, force: true })+ }+ }+)diff --git a/scripts/tests/test-web-search-image.sh b/scripts/tests/test-web-search-image.shindex 25cb46668..333d0dd9b 100755--- a/scripts/tests/test-web-search-image.sh+++ b/scripts/tests/test-web-search-image.sh@@ -9,7 +9,8 @@ revision="$(git rev-parse HEAD)"image="evenfire-web-search-test:${revision}"node scripts/minikube/run-with-deadline.mjs --timeout-seconds 300 --heartbeat-seconds 20 --kill-grace-seconds 5 --label web-search-image-build -- \docker build --pull=false --label "org.opencontainers.image.revision=${revision}" -t "$image" mcp-servers/web-search-image_id="$(docker image inspect "$image" --format '{{.Id}}')"+image_id="$(node scripts/minikube/run-with-deadline.mjs --timeout-seconds 10 --heartbeat-seconds 5 --kill-grace-seconds 5 --label web-search-image-inspect -- \+ docker image inspect "$image" --format '{{.Id}}')"[[ "$image_id" =~ ^sha256:[a-f0-9]{64}$ ]] || { echo 'Invalid local image identity' >&2; exit 1; }printf 'WEB_SEARCH_TEST_REVISION=%s\nWEB_SEARCH_TEST_IMAGE=%s\n' "$revision" "$image_id"node scripts/minikube/run-with-deadline.mjs --timeout-seconds 120 --heartbeat-seconds 20 --kill-grace-seconds 5 --label web-search-image-test -- \