Open-source AI browser agent for Chrome and Firefox (monorepo) ðŸ§
JavaScript ai-agentai-agentsai-toolsbrowser-aibrowser-automationbrowser-extensionchrome-aichrome-devtoolschrome-extensionchrome-extensionsfirefox-addonfirefox-addonsfirefox-extensionfirefox-extensionsgemmagemma4minimaxoffline-aioffline-llmqwen
fix(captcha): ignore empty callback placeholders when applying solutions
Codex release-state test39042da7c6fd
diff --git a/package-lock.json b/package-lock.jsonindex 493b7397f..9a6c9c38a 100644--- a/package-lock.json+++ b/package-lock.json@@ -1,12 +1,12 @@{"name": "webbrain",- "version": "38.0.9",+ "version": "38.0.10","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "webbrain",- "version": "38.0.9",+ "version": "38.0.10","license": "GPL-3.0-or-later","devDependencies": {"playwright": "^1.48.0",diff --git a/package.json b/package.jsonindex 8865b7e40..607862e51 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "webbrain",- "version": "38.0.9",+ "version": "38.0.10","description": "Open-source AI browser agent \u2014 chat with pages, automate tasks, multi-provider LLM support.","private": true,"type": "module",diff --git a/src/chrome/ARCHITECTURE.md b/src/chrome/ARCHITECTURE.mdindex 3f1747b95..2d2fe8158 100644--- a/src/chrome/ARCHITECTURE.md+++ b/src/chrome/ARCHITECTURE.md@@ -1,6 +1,6 @@# WebBrain Chrome/Edge Extension — Architecture-> Version 38.0.9 · Manifest V3 · Service Worker background+> Version 38.0.10 · Manifest V3 · Service Worker background## High-Level Overviewdiff --git a/src/chrome/manifest.json b/src/chrome/manifest.jsonindex ff80875e2..ed382eb64 100644--- a/src/chrome/manifest.json+++ b/src/chrome/manifest.json@@ -1,7 +1,7 @@{"manifest_version": 3,"name": "WebBrain",- "version": "38.0.9",+ "version": "38.0.10","description": "Open-source AI browser agent — chat with pages, automate tasks, multi-provider LLM support.","permissions": ["sidePanel",diff --git a/src/chrome/src/agent/captcha-callback-binding.js b/src/chrome/src/agent/captcha-callback-binding.jsnew file mode 100644index 000000000..70db55d76--- /dev/null+++ b/src/chrome/src/agent/captcha-callback-binding.js@@ -0,0 +1,9 @@+// Models may populate an optional callback with empty schema placeholders.+// Share this definition between application and permission checks so an unused+// callback cannot block cookie/field/click bindings or request extra capability.+export function isEmptyCaptchaCallback(callback) {+ return callback !== null && typeof callback === 'object' && !Array.isArray(callback)+ && Object.keys(callback).every(key => key === 'name' || key === 'path')+ && [callback.name, callback.path].every(value => value == null+ || (typeof value === 'string' && value.trim() === ''));+}diff --git a/src/chrome/src/agent/captcha-solution-application.js b/src/chrome/src/agent/captcha-solution-application.jsindex b35e1fcbf..60fff67d0 100644--- a/src/chrome/src/agent/captcha-solution-application.js+++ b/src/chrome/src/agent/captcha-solution-application.js@@ -1,3 +1,5 @@+import { isEmptyCaptchaCallback } from './captcha-callback-binding.js';+// Apply only values from a completed solve. Provider responses are untrusted// data: never evaluate returned JavaScript or navigate to a returned URL.function valueAt(solution, path = '') {@@ -30,9 +32,9 @@ export function prepareCaptchaApplication(solution, application) {if (fields.some(b => typeof b.selector !== 'string' || !b.selector)) throw new Error('Every response field needs an observed selector.');if (cookies.some(b => !/^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/.test(b.name) || /[\r\n;]/.test(b.value))) throw new Error('Invalid CAPTCHA cookie binding.');let callback = null;- if (application.callback) {+ if (application.callback && !isEmptyCaptchaCallback(application.callback)) {const { name, path = '' } = application.callback;- if (!/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*$/.test(name) || name.split('.').some(k => ['__proto__','prototype','constructor','eval','Function','location'].includes(k))) throw new Error('Use an observed named CAPTCHA callback.');+ if (typeof name !== 'string' || !/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*$/.test(name) || name.split('.').some(k => ['__proto__','prototype','constructor','eval','Function','location'].includes(k))) throw new Error('Use an observed named CAPTCHA callback. Omit callback when applying only cookies, fields, or clicks. Correct the binding and reuse the stored answer; do not request another solve.');callback = { name, value: valueAt(solution, path) };}const clicks = (application.clicks || []).map(binding => {diff --git a/src/chrome/src/agent/permission-gate.js b/src/chrome/src/agent/permission-gate.jsindex f3c1ac65e..912ff039d 100644--- a/src/chrome/src/agent/permission-gate.js+++ b/src/chrome/src/agent/permission-gate.js@@ -1,3 +1,5 @@+import { isEmptyCaptchaCallback } from './captcha-callback-binding.js';+/*** Deterministic capability × origin permission gate for the WebBrain agent.*@@ -500,7 +502,7 @@ export function capabilitiesFor(name, args) {if (name === 'apply_captcha_solution') return [...(args.fields?.length ? [Capability.TYPE] : []),...(args.clicks?.length ? [Capability.CLICK] : []),- ...(args.callback || args.cookies?.length ? [Capability.EXECUTE_JS] : []),+ ...((args.callback && !isEmptyCaptchaCallback(args.callback)) || args.cookies?.length ? [Capability.EXECUTE_JS] : []),];if (name === 'chat_send') return [Capability.TYPE, Capability.CLICK];if (name === 'delegate_research') {diff --git a/src/chrome/src/agent/tools.js b/src/chrome/src/agent/tools.jsindex 21a6c3d72..64c4ed575 100644--- a/src/chrome/src/agent/tools.js+++ b/src/chrome/src/agent/tools.js@@ -1313,6 +1313,7 @@ export const AGENT_TOOLS = [},"callback": {"type": "object",+ "description": "Optional. Omit when applying only cookies, response fields, or recognition clicks. An empty name and path are treated as omitted. Otherwise use only an observed named page callback; never invent one.","properties": {"name": {"type": "string"diff --git a/src/chrome/src/ui/settings.js b/src/chrome/src/ui/settings.jsindex 0287b6561..88c9d1f35 100644--- a/src/chrome/src/ui/settings.js+++ b/src/chrome/src/ui/settings.js@@ -88,7 +88,7 @@ const SUBSCRIPTION_GUIDE_PRODUCTS = Object.freeze({// Version shown in the subtitle. Kept here so it only needs one update per// release; the subtitle string itself is translated.-const EXT_VERSION = '38.0.9';+const EXT_VERSION = '38.0.10';const providersContainer = document.getElementById('providers');const displaySettings = document.getElementById('display-settings');diff --git a/src/firefox/ARCHITECTURE.md b/src/firefox/ARCHITECTURE.mdindex f7ea73f0d..7018b15d6 100644--- a/src/firefox/ARCHITECTURE.md+++ b/src/firefox/ARCHITECTURE.md@@ -1,6 +1,6 @@# WebBrain Firefox Extension — Architecture-> Version 38.0.9 · Manifest V2 · Background Page+> Version 38.0.10 · Manifest V2 · Background Page## How Firefox Differs from Chromediff --git a/src/firefox/manifest.json b/src/firefox/manifest.jsonindex e1fdbcf75..58abf819f 100644--- a/src/firefox/manifest.json+++ b/src/firefox/manifest.json@@ -1,7 +1,7 @@{"manifest_version": 2,"name": "WebBrain",- "version": "38.0.9",+ "version": "38.0.10","description": "Open-source AI browser agent — chat with pages, automate tasks, multi-provider LLM support.","permissions": ["activeTab",diff --git a/src/firefox/src/agent/captcha-callback-binding.js b/src/firefox/src/agent/captcha-callback-binding.jsnew file mode 100644index 000000000..70db55d76--- /dev/null+++ b/src/firefox/src/agent/captcha-callback-binding.js@@ -0,0 +1,9 @@+// Models may populate an optional callback with empty schema placeholders.+// Share this definition between application and permission checks so an unused+// callback cannot block cookie/field/click bindings or request extra capability.+export function isEmptyCaptchaCallback(callback) {+ return callback !== null && typeof callback === 'object' && !Array.isArray(callback)+ && Object.keys(callback).every(key => key === 'name' || key === 'path')+ && [callback.name, callback.path].every(value => value == null+ || (typeof value === 'string' && value.trim() === ''));+}diff --git a/src/firefox/src/agent/captcha-solution-application.js b/src/firefox/src/agent/captcha-solution-application.jsindex b35e1fcbf..60fff67d0 100644--- a/src/firefox/src/agent/captcha-solution-application.js+++ b/src/firefox/src/agent/captcha-solution-application.js@@ -1,3 +1,5 @@+import { isEmptyCaptchaCallback } from './captcha-callback-binding.js';+// Apply only values from a completed solve. Provider responses are untrusted// data: never evaluate returned JavaScript or navigate to a returned URL.function valueAt(solution, path = '') {@@ -30,9 +32,9 @@ export function prepareCaptchaApplication(solution, application) {if (fields.some(b => typeof b.selector !== 'string' || !b.selector)) throw new Error('Every response field needs an observed selector.');if (cookies.some(b => !/^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/.test(b.name) || /[\r\n;]/.test(b.value))) throw new Error('Invalid CAPTCHA cookie binding.');let callback = null;- if (application.callback) {+ if (application.callback && !isEmptyCaptchaCallback(application.callback)) {const { name, path = '' } = application.callback;- if (!/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*$/.test(name) || name.split('.').some(k => ['__proto__','prototype','constructor','eval','Function','location'].includes(k))) throw new Error('Use an observed named CAPTCHA callback.');+ if (typeof name !== 'string' || !/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*$/.test(name) || name.split('.').some(k => ['__proto__','prototype','constructor','eval','Function','location'].includes(k))) throw new Error('Use an observed named CAPTCHA callback. Omit callback when applying only cookies, fields, or clicks. Correct the binding and reuse the stored answer; do not request another solve.');callback = { name, value: valueAt(solution, path) };}const clicks = (application.clicks || []).map(binding => {diff --git a/src/firefox/src/agent/permission-gate.js b/src/firefox/src/agent/permission-gate.jsindex 3ddf4e0f2..6d993a061 100644--- a/src/firefox/src/agent/permission-gate.js+++ b/src/firefox/src/agent/permission-gate.js@@ -1,3 +1,5 @@+import { isEmptyCaptchaCallback } from './captcha-callback-binding.js';+/*** Deterministic capability × origin permission gate for the WebBrain agent.*@@ -485,7 +487,7 @@ export function capabilitiesFor(name, args) {if (name === 'apply_captcha_solution') return [...(args.fields?.length ? [Capability.TYPE] : []),...(args.clicks?.length ? [Capability.CLICK] : []),- ...(args.callback || args.cookies?.length ? [Capability.EXECUTE_JS] : []),+ ...((args.callback && !isEmptyCaptchaCallback(args.callback)) || args.cookies?.length ? [Capability.EXECUTE_JS] : []),];if (name === 'chat_send') return [Capability.TYPE, Capability.CLICK];if (name === 'delegate_research') {diff --git a/src/firefox/src/agent/tools.js b/src/firefox/src/agent/tools.jsindex 1836e63e9..074bee3c4 100644--- a/src/firefox/src/agent/tools.js+++ b/src/firefox/src/agent/tools.js@@ -1167,6 +1167,7 @@ export const AGENT_TOOLS = [},"callback": {"type": "object",+ "description": "Optional. Omit when applying only cookies, response fields, or recognition clicks. An empty name and path are treated as omitted. Otherwise use only an observed named page callback; never invent one.","properties": {"name": {"type": "string"diff --git a/src/firefox/src/ui/settings.js b/src/firefox/src/ui/settings.jsindex f92b33ba2..3d021a189 100644--- a/src/firefox/src/ui/settings.js+++ b/src/firefox/src/ui/settings.js@@ -80,7 +80,7 @@ const SUBSCRIPTION_GUIDE_PRODUCTS = Object.freeze({// Version shown in the subtitle. Kept here so it only needs one update per// release; the subtitle string itself is translated.-const EXT_VERSION = '38.0.9';+const EXT_VERSION = '38.0.10';const providersContainer = document.getElementById('providers');const displaySettings = document.getElementById('display-settings');diff --git a/test/captcha-application-ui.mjs b/test/captcha-application-ui.mjsindex 4e4f95081..58f98f93f 100644--- a/test/captcha-application-ui.mjs+++ b/test/captcha-application-ui.mjs@@ -3,7 +3,6 @@ import assert from 'node:assert/strict';import { createServer } from 'node:http';import { readFile, mkdir } from 'node:fs/promises';import { resolve, extname } from 'node:path';-import { applyNativeCaptchaSolution, prepareCaptchaApplication } from '../src/chrome/src/agent/captcha-solution-application.js';const root=resolve('web');const output='/tmp/webbrain-captcha-review';await mkdir(output,{recursive:true});const server=createServer(async(req,res)=>{@@ -18,6 +17,7 @@ await new Promise(r=>server.listen(0,'127.0.0.1',r));const origin=`http://127.0.0.1:${server.address().port}`;try {for(const [name,engine] of [['chrome',chromium],['firefox',firefox]]) {+ const { applyNativeCaptchaSolution, prepareCaptchaApplication } = await import(`../src/${name}/src/agent/captcha-solution-application.js`);const browser=await engine.launch();try {const page=await browser.newPage();@@ -37,6 +37,11 @@ try {const points=await page.evaluate(()=>({points:clickPoints,rect:document.querySelector('#grid').getBoundingClientRect().toJSON()}));assert.deepEqual(points.points,[[points.rect.left+50,points.rect.top+50],[points.rect.left+250,points.rect.top+150]]);await assert.rejects(applyNativeCaptchaSolution(1,record,{frameId:0,frameUrl:page.url()}),/unapplied/);+ const awsRecord={documents,pageUrl:page.url(),createdAt:Date.now(),solution:{cookie:'aws-answer'}};+ const aws=await applyNativeCaptchaSolution(1,awsRecord,{frameId:0,frameUrl:page.url(),fields:[],clicks:[],cookies:[{name:'aws-waf-token',path:'cookie',encoding:'text'}],callback:{name:'',path:''}});+ assert.equal(aws.success,true);assert.equal(aws.cookiesUpdated,1);assert.equal(aws.calledCallback,false);+ assert.equal(cookies.at(-1).name,'aws-waf-token');assert.equal(cookies.at(-1).value,'aws-answer');+ assert.deepEqual(await page.evaluate(()=>answers),[{lot_number:'lot'}]);const base={documents,pageUrl:page.url(),createdAt:Date.now(),solution:{token:'x'}};const ambiguous=await applyNativeCaptchaSolution(1,{...base},{frameId:0,frameUrl:page.url(),fields:[{selector:'input, #grid',path:'token'}]});assert.equal(ambiguous.success,false);const rejectedNative=await applyNativeCaptchaSolution(1,{...base},{frameId:0,frameUrl:page.url(),callback:{name:'setTimeout',path:'token'}});assert.equal(rejectedNative.success,false);diff --git a/test/captcha-aws-recovery.mjs b/test/captcha-aws-recovery.mjsindex 2db37adb0..5de9ba75e 100644--- a/test/captcha-aws-recovery.mjs+++ b/test/captcha-aws-recovery.mjs@@ -125,6 +125,41 @@ for (const build of ['chrome', 'firefox']) {assert.equal(f.requests.length, 1);});+ test(`${build}: trace-shaped AWS cookie application ignores an empty callback without another solve`, async t => {+ const f = fixture(t);+ const solved = await f.agent._executeToolImpl(1, 'solve_captcha', { inject: false, providerTasks: [{+ provider: 'capsolver', method: 'AntiAwsWafTaskProxyLess', parameters: {+ websiteURL: f.url, awsKey: f.observed.websiteKey, awsIv: f.observed.iv,+ awsContext: f.observed.context, awsChallengeJS: f.observed.challengeScript,+ },+ }] });+ assert.equal(solved.applicationRequired, true);+ const binding = { clicks: [], frameId: 0, frameUrl: f.url, fields: [],+ cookies: [{ path: 'cookie', encoding: 'text', name: 'aws-waf-token' }], callback: { name: '', path: '' } };+ const result = await f.agent._executeToolImpl(1, 'apply_captcha_solution', binding);+ assert.equal(result.success, true, JSON.stringify(result));+ assert.equal(result.dispatched, true); assert.equal(result.cookiesUpdated, 1);+ assert.equal(f.cookies.length, 1); assert.equal(f.cookies[0].value, 'primary-cookie');+ assert.equal(f.requests.length, 1);+ assert.equal((await f.agent._executeToolImpl(1, 'apply_captcha_solution', binding)).success, false);+ assert.equal(f.cookies.length, 1); assert.equal(f.requests.length, 1);+ });++ test(`${build}: correcting an invalid callback reuses the paid answer without a cookie write on failure`, async t => {+ const f = fixture(t);+ await f.agent._executeToolImpl(1, 'solve_captcha', { type: 'aws_waf', inject: false });+ const binding = { frameId: 0, frameUrl: f.url,+ cookies: [{ path: 'cookie', name: 'aws-waf-token' }], callback: { name: '', path: 'cookie' } };+ const invalid = await f.agent._executeToolImpl(1, 'apply_captcha_solution', binding);+ assert.equal(invalid.success, false); assert.equal(invalid.dispatched, false);+ assert.equal(invalid.applicationRetryable, true);+ assert.match(invalid.error, /Omit callback.*reuse the stored answer/);+ assert.equal(f.cookies.length, 0);+ delete binding.callback;+ assert.equal((await f.agent._executeToolImpl(1, 'apply_captcha_solution', binding)).success, true);+ assert.equal(f.cookies.length, 1); assert.equal(f.requests.length, 1);+ });+test(`${build}: AWS token-only requests do not mutate the cookie store`, async t => {const f = fixture(t);const result = await f.agent._executeToolImpl(1, 'solve_captcha', { type: 'aws_waf', inject: false });diff --git a/test/captcha-native-providers.mjs b/test/captcha-native-providers.mjsindex 0d43fdf31..8740b3243 100644--- a/test/captcha-native-providers.mjs+++ b/test/captcha-native-providers.mjs@@ -306,6 +306,31 @@ for (const browser of ['chrome','firefox']) {const result=await native.solveNativeCaptchaTasks(native.prepareNativeCaptchaTasks(providers,[{provider:'solvecaptcha',method:'geetest_v4',parameters:{pageurl:url,captcha_id:'id'}}]));assert.equal(calls[0].body.method,'geetest_v4');assert.equal(calls[0].body.key,'secret-solvecaptcha');assert.equal(result.solution.lot_number,'lot');assert.equal(calls.length,2);});+ test(`${browser}: unused callback placeholders preserve cookie, field and recognition bindings`, () => {+ const solution = { cookie: 'clearance', token: 'answer', points: [1] };+ const bindings = [+ { cookies: [{ name: 'aws-waf-token', path: 'cookie' }] },+ { fields: [{ selector: '#response', path: 'token' }] },+ { clicks: [{ selector: '#grid', path: 'points', mode: 'grid', rows: 2, columns: 2 }] },+ ];+ for (const callback of [{ name: '', path: '' }, {}, { name: ' ', path: '\t' }, { name: null, path: null }, null]) {+ for (const binding of bindings) assert.deepEqual(+ apply.prepareCaptchaApplication(solution, { ...binding, callback }),+ apply.prepareCaptchaApplication(solution, binding),+ );+ assert.throws(() => apply.prepareCaptchaApplication(solution, { callback }), /Specify response fields, cookies/);+ }+ });+ test(`${browser}: nonempty or malformed callback bindings still reject before cookie application`, () => {+ for (const callback of [+ { name: '', path: 'cookie' }, { name: ' ', path: 'cookie' },+ { name: 'eval', path: 'cookie' }, { name: 'captcha.constructor', path: 'cookie' },+ { name: 'captcha.done()', path: 'cookie' }, { name: 42, path: '' },+ { name: '', path: '', extra: 'unexpected' }, [], 'not-an-object',+ ]) assert.throws(() => apply.prepareCaptchaApplication({ cookie: 'clearance' }, {+ cookies: [{ name: 'aws-waf-token', path: 'cookie' }], callback,+ }), /Omit callback.*reuse the stored answer/);+ });test(`${browser}: solution binding preserves structured callback values and blocks arbitrary scripts/prototype paths`,()=>{const solution={token:'answer',cookie:'clearance',structured:{lot:'x'},coordinates:[{x:0,y:0}]};assert.deepEqual(apply.prepareCaptchaApplication(solution,{fields:[{selector:'#response',path:'token'}],cookies:[{name:'cf_clearance',path:'cookie'}],callback:{name:'captcha.done',path:'structured'}}),{fields:[{selector:'#response',value:'answer'}],cookies:[{name:'cf_clearance',value:'clearance'}],callback:{name:'captcha.done',value:{lot:'x'}}});@@ -316,7 +341,7 @@ for (const browser of ['chrome','firefox']) {});}test('native CAPTCHA modules stay mirrored',async()=>{- for(const name of ['captcha-catalog.js','captcha-native-providers.js','captcha-solution-application.js','captcha-hcaptcha-providers.js','captcha-json-api.js']) assert.equal(await readFile(`src/chrome/src/agent/${name}`,'utf8'),await readFile(`src/firefox/src/agent/${name}`,'utf8'),name);+ for(const name of ['captcha-catalog.js','captcha-native-providers.js','captcha-solution-application.js','captcha-callback-binding.js','captcha-hcaptcha-providers.js','captcha-json-api.js']) assert.equal(await readFile(`src/chrome/src/agent/${name}`,'utf8'),await readFile(`src/firefox/src/agent/${name}`,'utf8'),name);});for (const browser of ['chrome', 'firefox']) {diff --git a/test/captcha-runtime-policy.mjs b/test/captcha-runtime-policy.mjsindex 6b5c94bca..24c9d382c 100644--- a/test/captcha-runtime-policy.mjs+++ b/test/captcha-runtime-policy.mjs@@ -26,6 +26,13 @@ for (const build of ['chrome', 'firefox']) {assert.deepEqual(requiredHosts(Capability.EXECUTE_JS, args, 'https://main.example.test/', 'apply_captcha_solution'), ['captcha.example.test']);assert.deepEqual(requiredHosts(Capability.CLICK, args, 'https://main.example.test/', 'apply_captcha_solution'), ['captcha.example.test']);assert.deepEqual(capabilitiesFor('apply_captcha_solution', { ...args, callback: undefined }), []);+ for (const callback of [{ name: '', path: '' }, {}, { name: ' ', path: '\t' }, { name: null, path: null }]) {+ assert.deepEqual(capabilitiesFor('apply_captcha_solution', { callback }), []);+ assert.deepEqual(capabilitiesFor('apply_captcha_solution', { callback, fields: [{}] }), [Capability.TYPE]);+ assert.deepEqual(capabilitiesFor('apply_captcha_solution', { callback, clicks: [{}] }), [Capability.CLICK]);+ assert.deepEqual(capabilitiesFor('apply_captcha_solution', { callback, cookies: [{}] }), [Capability.EXECUTE_JS]);+ }+ assert.deepEqual(capabilitiesFor('apply_captcha_solution', { callback: { name: '', path: 'token' } }), [Capability.EXECUTE_JS]);assert.deepEqual(requiredHosts(Capability.EXECUTE_JS, { ...args, frameUrl: '' }, 'https://main.example.test/', 'apply_captcha_solution'), []);});test(`${build}: hCaptcha Enterprise rqdata is optional in the model-visible tool schema`, () => {