github/FlareSolverr
1
1
Fork 0
mirror of https://github.com/FlareSolverr/FlareSolverr.git synced 2025-06-09 04:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Cloudflare resolver

Browse Source
This commit is contained in:
ngosang 2021-10-16 19:32:52 +02:00
parent 5dd563e003
commit ca3f84f458
1 changed files with 75 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/providers/cloudflare.ts
View File

@ -4,7 +4,7 @@ import {Page, Response} from 'puppeteer'
/** /**
* This class contains the logic to solve protections provided by CloudFlare * This class contains the logic to solve protections provided by CloudFlare
**/ **/
const CHALLENGE_SELECTORS = ['#trk_jschal_js', '.ray_id', '.attack-box', '#cf-please-wait']; const CHALLENGE_SELECTORS = ['#trk_jschal_js', '.ray_id', '.attack-box', '#cf-please-wait'];
const TOKEN_INPUT_NAMES = ['g-recaptcha-response', 'h-captcha-response']; const TOKEN_INPUT_NAMES = ['g-recaptcha-response', 'h-captcha-response'];
@ -18,29 +18,31 @@ export default async function resolveChallenge(url: string, page: Page, response
} }
log.info('Cloudflare detected'); log.info('Cloudflare detected');
if (await page.$('span[data-translate="error"]') || (await page.content()).includes('error code: 1020')) { if (await page.$('span[data-translate="error"]')) {
throw new Error('Cloudflare has blocked this request. Probably your IP is banned for this site, check in your web browser.') throw new Error('Cloudflare has blocked this request. Probably your IP is banned for this site, check in your web browser.')
} }
let selectorFoundCount = 0; let selectorFound = false;
if (response.status() > 400) { if (response.status() > 400) {
// detect cloudflare wait 5s
for (const selector of CHALLENGE_SELECTORS) { // find Cloudflare selectors
const cfChallengeElem = await page.$(selector) let selector: string = await findAnySelector(page, CHALLENGE_SELECTORS)
if (cfChallengeElem) { if (selector) {
selectorFoundCount++ selectorFound = true;
log.debug(`Javascript challenge element '${selector}' detected.`) log.debug(`Javascript challenge element '${selector}' detected.`)
log.debug('Waiting for Cloudflare challenge...') log.debug('Waiting for Cloudflare challenge...')
while (true) { while (true) {
try { try {
// catch Execution context was destroyed
const cfChallengeElem = await page.$(selector) selector = await findAnySelector(page, CHALLENGE_SELECTORS)
if (!cfChallengeElem) { if (!selector) {
// solved! // solved!
log.debug('Challenge element not found.') log.debug('Challenge element not found.')
break break
} else { } else {
log.debug(`Javascript challenge element '${selector}' detected.`)
// new Cloudflare Challenge #cf-please-wait // new Cloudflare Challenge #cf-please-wait
const displayStyle = await page.evaluate((selector) => { const displayStyle = await page.evaluate((selector) => {
return getComputedStyle(document.querySelector(selector)).getPropertyValue("display"); return getComputedStyle(document.querySelector(selector)).getPropertyValue("display");
@ -68,6 +70,7 @@ export default async function resolveChallenge(url: string, page: Page, response
} }
} }
log.debug('Found challenge element again.') log.debug('Found challenge element again.')
} catch (error) } catch (error)
{ {
log.debug("Unexpected error: " + error); log.debug("Unexpected error: " + error);
@ -81,16 +84,14 @@ export default async function resolveChallenge(url: string, page: Page, response
} }
log.debug('Validating HTML code...') log.debug('Validating HTML code...')
break
} else { } else {
log.debug(`No '${selector}' challenge element detected.`) log.debug(`No challenge element detected.`)
} }
}
log.debug("Javascript challenge selectors found: " + selectorFoundCount + ", total selectors: " + CHALLENGE_SELECTORS.length)
} else { } else {
// some sites use cloudflare but there is no challenge // some sites use cloudflare but there is no challenge
log.debug(`Javascript challenge not detected. Status code: ${response.status()}`); log.debug(`Javascript challenge not detected. Status code: ${response.status()}`);
selectorFoundCount = 1; selectorFound = true;
} }
// it seems some captcha pages return 200 sometimes // it seems some captcha pages return 200 sometimes
@ -180,17 +181,33 @@ export default async function resolveChallenge(url: string, page: Page, response
throw new Error('Captcha detected but no automatic solver is configured.'); throw new Error('Captcha detected but no automatic solver is configured.');
} }
} else { } else {
if (selectorFoundCount == 0) if (!selectorFound)
{ {
throw new Error('No challenge selectors found, unable to proceed') throw new Error('No challenge selectors found, unable to proceed')
} else { } else {
// reload the page to make sure we get the real response // reload the page to make sure we get the real response
// do not use page.reload() to avoid #162 #143 // do not use page.reload() to avoid #162 #143
response = await page.goto(url, { waitUntil: 'domcontentloaded' }) response = await page.goto(url, { waitUntil: 'domcontentloaded' })
await page.content() await page.content()
// log.info(response.headers())
// while (response.headers() == null) {
// await page.waitFor(1000)
// }
log.info('Challenge solved.'); log.info('Challenge solved.');
} }
} }
return response; return response;
} }
async function findAnySelector(page: Page, selectors: string[]) {
for (const selector of selectors) {
const cfChallengeElem = await page.$(selector)
if (cfChallengeElem) {
return selector;
}
}
return null;
}