Skip to content

Open-source AI browser agent for Chrome and Firefox (monorepo) 🧠

Preserve DataDome and FunCaptcha sessions and GeeTest modes

Emre Sokullu7c4d918fb691
diff --git a/src/chrome/src/agent/captcha-native-providers.js b/src/chrome/src/agent/captcha-native-providers.js
index 948a89276..834f6ddf0 100644
--- a/src/chrome/src/agent/captcha-native-providers.js
+++ b/src/chrome/src/agent/captcha-native-providers.js
@@ -167,7 +167,8 @@ const FAMILY_IDENTIFIERS = {
['userCertifyId', 'metadata.UserCertifyId'], ['verifyType', 'metadata.verifyType'],
['region', 'metadata.region'], ['apiGetLib', 'metadata.apiGetLib'],
['metadata.punishUrl'], ['metadata.cookieRequired']],
- datadome: [['captchaUrl', 'captcha_url', 'metadata.captchaUrl']],
+ datadome: [['captchaUrl', 'captcha_url', 'metadata.captchaUrl'],
+ ['metadata.datadomeCookie'], ['metadata.datadomeVersion'], ['html']],
hunt: [['apiGetLib', 'metadata.apiGetLib'], ['data', 'metadata.data']],
imperva: [['incapsulaScriptUrl', 'metadata.incapsulaScriptUrl'],
['incapsulaCookies', 'metadata.incapsulaCookies'], ['reese84UrlEndpoint', 'metadata.reese84UrlEndpoint']],
@@ -175,7 +176,7 @@ const FAMILY_IDENTIFIERS = {
binance: [['validateId']],
yidun: [['challenge'], ['hcg'], ['hct'], ['yidunApiServerSubdomain'], ['yidunGetLib']],
hcaptcha: [['rqdata', 'data.rqdata']],
- funcaptcha: [['data']],
+ funcaptcha: [['data'], ['cookies']],
text_captcha: [['comment', 'textcaptcha']],
captchafox: [['apiServer', 'api_server']],
altcha: [['challengeURL', 'challenge_url'], ['challengeJSON', 'challenge_json']],
@@ -419,7 +420,14 @@ function validateFallbackIdentifiers(built) {
}
}
groups.push({ aliases: versions[0] === 4 ? ['captchaId', 'captcha_id', 'initParameters.captcha_id', 'gt'] : ['gt'], requireAll: true });
- if (versions[0] === 3) groups.push({ aliases: ['challenge'], requireAll: true });
+ groups.push({ aliases: ['geetestGetLib'], requireAll: true });
+ if (versions[0] === 3) {
+ groups.push({ aliases: ['challenge'], requireAll: true });
+ groups.push({ aliases: ['offline'], requireAll: true });
+ groups.push({ aliases: ['new_captcha'], requireAll: true });
+ } else {
+ groups.push({ aliases: ['riskType', 'risk_type'], requireAll: true });
+ }
}
for (const { aliases, requireAll } of groups) {
const valuesByTask = built.map(({task}) => aliases.map(path => at(task, path))
diff --git a/src/firefox/src/agent/captcha-native-providers.js b/src/firefox/src/agent/captcha-native-providers.js
index 948a89276..834f6ddf0 100644
--- a/src/firefox/src/agent/captcha-native-providers.js
+++ b/src/firefox/src/agent/captcha-native-providers.js
@@ -167,7 +167,8 @@ const FAMILY_IDENTIFIERS = {
['userCertifyId', 'metadata.UserCertifyId'], ['verifyType', 'metadata.verifyType'],
['region', 'metadata.region'], ['apiGetLib', 'metadata.apiGetLib'],
['metadata.punishUrl'], ['metadata.cookieRequired']],
- datadome: [['captchaUrl', 'captcha_url', 'metadata.captchaUrl']],
+ datadome: [['captchaUrl', 'captcha_url', 'metadata.captchaUrl'],
+ ['metadata.datadomeCookie'], ['metadata.datadomeVersion'], ['html']],
hunt: [['apiGetLib', 'metadata.apiGetLib'], ['data', 'metadata.data']],
imperva: [['incapsulaScriptUrl', 'metadata.incapsulaScriptUrl'],
['incapsulaCookies', 'metadata.incapsulaCookies'], ['reese84UrlEndpoint', 'metadata.reese84UrlEndpoint']],
@@ -175,7 +176,7 @@ const FAMILY_IDENTIFIERS = {
binance: [['validateId']],
yidun: [['challenge'], ['hcg'], ['hct'], ['yidunApiServerSubdomain'], ['yidunGetLib']],
hcaptcha: [['rqdata', 'data.rqdata']],
- funcaptcha: [['data']],
+ funcaptcha: [['data'], ['cookies']],
text_captcha: [['comment', 'textcaptcha']],
captchafox: [['apiServer', 'api_server']],
altcha: [['challengeURL', 'challenge_url'], ['challengeJSON', 'challenge_json']],
@@ -419,7 +420,14 @@ function validateFallbackIdentifiers(built) {
}
}
groups.push({ aliases: versions[0] === 4 ? ['captchaId', 'captcha_id', 'initParameters.captcha_id', 'gt'] : ['gt'], requireAll: true });
- if (versions[0] === 3) groups.push({ aliases: ['challenge'], requireAll: true });
+ groups.push({ aliases: ['geetestGetLib'], requireAll: true });
+ if (versions[0] === 3) {
+ groups.push({ aliases: ['challenge'], requireAll: true });
+ groups.push({ aliases: ['offline'], requireAll: true });
+ groups.push({ aliases: ['new_captcha'], requireAll: true });
+ } else {
+ groups.push({ aliases: ['riskType', 'risk_type'], requireAll: true });
+ }
}
for (const { aliases, requireAll } of groups) {
const valuesByTask = built.map(({task}) => aliases.map(path => at(task, path))
diff --git a/test/captcha-native-providers.mjs b/test/captcha-native-providers.mjs
index d2e8cb521..385b9e504 100644
--- a/test/captcha-native-providers.mjs
+++ b/test/captcha-native-providers.mjs
@@ -445,6 +445,52 @@ for (const browser of ['chrome', 'firefox']) {
}]), /same observed service host/);
assert.equal(calls.length, 0);
});
+ test(`${browser}: session-bound native fallbacks reject providers that cannot carry cookies`, t => {
+ const calls = mockApi(t, () => { throw new Error('Must not dispatch'); });
+ const enabled = ['2captcha', 'capmonster'].map(id => ({ id, apiKey: 'key' }));
+ const proxy = { proxyType: 'http', proxyAddress: 'proxy.test', proxyPort: 8080 };
+ const datadome = [
+ { provider: '2captcha', method: 'DataDomeSliderTask', parameters: {
+ websiteURL: url, captchaUrl: 'https://captcha.test/widget', userAgent: 'browser-UA', ...proxy,
+ } },
+ { provider: 'capmonster', method: 'CustomTask:DataDome', parameters: {
+ websiteURL: url, metadata: { captchaUrl: 'https://captcha.test/widget', datadomeCookie: 'datadome=session' },
+ userAgent: 'browser-UA', ...proxy,
+ } },
+ ];
+ assert.equal(native.prepareNativeCaptchaTasks(enabled, [datadome[0]]).length, 1);
+ assert.equal(native.prepareNativeCaptchaTasks(enabled, [datadome[1]]).length, 1);
+ assert.throws(() => native.prepareNativeCaptchaTasks(enabled, datadome), /same observed challenge/);
+ const funcaptcha = [
+ { provider: '2captcha', method: 'FunCaptchaTask', parameters: {
+ websiteURL: url, websitePublicKey: 'site', ...proxy,
+ } },
+ { provider: 'capmonster', method: 'FunCaptchaTask', parameters: {
+ websiteURL: url, websitePublicKey: 'site', cookies: 'SID=session', ...proxy,
+ } },
+ ];
+ assert.equal(native.prepareNativeCaptchaTasks(enabled, [funcaptcha[1]]).length, 1);
+ assert.throws(() => native.prepareNativeCaptchaTasks(enabled, funcaptcha), /same observed challenge/);
+ assert.equal(calls.length, 0);
+ });
+ test(`${browser}: GeeTest v4 fallback preserves risk type aliases`, t => {
+ const calls = mockApi(t, () => { throw new Error('Must not dispatch'); });
+ const enabled = ['capsolver', '2captcha'].map(id => ({ id, apiKey: 'key' }));
+ const capsolver = { provider: 'capsolver', method: 'GeeTestTaskProxyLess', parameters: {
+ websiteURL: url, captchaId: 'captcha', riskType: 'slide',
+ } };
+ const twoCaptcha = { provider: '2captcha', method: 'GeeTestTaskProxyless', parameters: {
+ websiteURL: url, version: 4, initParameters: { captcha_id: 'captcha' }, risk_type: 'slide',
+ } };
+ assert.equal(native.prepareNativeCaptchaTasks(enabled, [capsolver, twoCaptcha]).length, 2);
+ assert.throws(() => native.prepareNativeCaptchaTasks(enabled, [capsolver, {
+ ...twoCaptcha, parameters: { ...twoCaptcha.parameters, risk_type: 'match' },
+ }]), /same observed challenge/);
+ assert.throws(() => native.prepareNativeCaptchaTasks(enabled, [capsolver, {
+ ...twoCaptcha, parameters: { websiteURL: url, version: 4, initParameters: { captcha_id: 'captcha' } },
+ }]), /same observed challenge/);
+ assert.equal(calls.length, 0);
+ });
const actionBoundPairs = [
['DataDome User-Agent', ['2captcha', 'DataDomeSliderTask', { websiteURL: url, captchaUrl: 'https://example.test/captcha', userAgent: 'browser-UA', proxyType: 'http', proxyAddress: 'proxy.test', proxyPort: 8080 }], ['solvecaptcha', 'datadome', { pageurl: url, captcha_url: 'https://example.test/captcha', userAgent: 'browser-UA', proxy: 'proxy.test:8080', proxytype: 'http' }], 'userAgent'],
['DataDome proxy', ['2captcha', 'DataDomeSliderTask', { websiteURL: url, captchaUrl: 'https://example.test/captcha', userAgent: 'browser-UA', proxyType: 'http', proxyAddress: 'proxy.test', proxyPort: 8080 }], ['solvecaptcha', 'datadome', { pageurl: url, captcha_url: 'https://example.test/captcha', userAgent: 'browser-UA', proxy: 'proxy.test:8080', proxytype: 'http' }], 'proxy'],