Skip to content

[pull] master from apify:master #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 12, 2026
+70 −4
Merged

[pull] master from apify:master #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/playwright-crawler/src/internals/utils/playwright-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,9 +755,9 @@ async function handleCloudflareChallenge(

options.isChallengeCallback ??= async () => {
return await page.evaluate(async () => {
// Cloudflare nests the ray ID under varying wrapper elements, so we match by descendants
// instead of a direct-child chain (e.g. a `.footer-wrapper` was inserted in between).
return !!document.querySelector('.footer .footer-inner .diagnostic-wrapper .ray-id');
// Cloudflare keeps reshuffling the wrapper elements between `.footer-inner` and `.ray-id`,
// so only the stable outer classes are matched.
return !!document.querySelector('.footer .footer-inner .ray-id');
});
};

Expand Down
66 changes: 66 additions & 0 deletions test/core/playwright_utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,4 +433,70 @@ describe('playwrightUtils', () => {
await browser.close();
}
});

describe('handleCloudflareChallenge() challenge detection', () => {
// not a named export, only reachable via the internal `playwrightUtils` object
const { handleCloudflareChallenge } = playwrightUtils.playwrightUtils;
let browser: Browser;
let page: Page;

// no clicking or waiting, so an unsolved challenge fails fast instead of spending ~20s in the click loop
const fastOptions = () => ({
sleepSecs: 0,
preChallengeSleepSecs: 0,
clickCallback: async () => {},
});

// markup as rendered by the current (2026) Cloudflare challenge template
const currentChallengeBody = `
<div class="main-wrapper" role="main"><div class="main-content">
<h1>example.com</h1>
<h2>Performing security verification</h2>
<div style="display: grid;"><div><div><input type="hidden" name="cf-turnstile-response" id="cf-chl-widget-2swmi_response"></div></div></div>
</div></div>
<div class="footer" role="contentinfo"><div class="footer-inner"><div class="footer-wrapper">
<div><div class="ray-id">Ray ID: <code>a29d9a9cff4fb9e4</code></div></div>
<div class="footer-link-wrapper"><span class="footer-text">Performance and Security by Cloudflare</span></div>
</div></div></div>`;

// the older template, with the `.diagnostic-wrapper` element
const oldChallengeBody = `
<div class="main-wrapper" role="main"><div class="main-content">
<h1>example.com</h1>
<div><input type="hidden" name="cf-turnstile-response" id="cf-chl-widget-2swmi_response"></div>
</div></div>
<div class="footer" role="contentinfo"><div class="footer-inner"><div class="footer-wrapper"><div class="diagnostic-wrapper">
<div class="ray-id">Ray ID: <code>a29d9a9cff4fb9e4</code></div>
</div></div></div></div>`;

beforeAll(async () => {
browser = await chromium.launch({ headless: true });
page = await browser.newPage();
});

afterAll(async () => {
await browser.close();
});

test('detects the current challenge markup', async () => {
await page.setContent(`<html><body>${currentChallengeBody}</body></html>`);
await expect(
handleCloudflareChallenge(page, 'https://example.com', undefined, fastOptions()),
).rejects.toThrow(/Blocked by Cloudflare/);
});

test('detects the old challenge markup', async () => {
await page.setContent(`<html><body>${oldChallengeBody}</body></html>`);
await expect(
handleCloudflareChallenge(page, 'https://example.com', undefined, fastOptions()),
).rejects.toThrow(/Blocked by Cloudflare/);
});

test('resolves without detection on a regular page', async () => {
await page.setContent('<html><body><h1>Welcome</h1></body></html>');
await expect(
handleCloudflareChallenge(page, 'https://example.com', undefined, fastOptions()),
).resolves.toBeUndefined();
});
});
});
2 changes: 1 addition & 1 deletion test/e2e/camoufox-cloudflare/actor/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ await Actor.main(async () => {
async requestHandler({ page, parseWithCheerio }) {
const isBlocked = await page
.evaluate(async () => {
return !!document.querySelector('.footer .footer-inner .diagnostic-wrapper .ray-id');
return !!document.querySelector('.footer .footer-inner .ray-id');
})
.catch(() => false);
const $ = await parseWithCheerio();
Expand Down
Loading