Skip to content
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

Jump to bottom

avoid cloudflare detection of puppeteer when using browser profiles: #518

Merged
merged 1 commit into from Mar 28, 2024
Merged

avoid cloudflare detection of puppeteer when using browser profiles: #518

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/crawler.ts
View file
Open in desktop
Expand Up @@ -891,11 +891,7 @@ self.__bx_behaviors.selectMainBehavior();

data.loadState = LoadState.EXTRACTION_DONE;

if (data.status >= 400) {
return;
}

if (this.params.behaviorOpts) {
if (this.params.behaviorOpts && data.status < 400) {
if (!data.isHTMLPage) {
logger.debug(
"Skipping behaviors for non-HTML page",
Expand Down
17 changes: 12 additions & 5 deletions src/create-login-profile.ts
View file
Open in desktop
Expand Up @@ -223,15 +223,11 @@ async function main() {
);
}

logger.info(`Loading page: ${params.url}`);

await page.goto(params.url, { waitUntil });

if (!params.automated) {
const target = await cdp.send("Target.getTargetInfo");
const targetId = target.targetInfo.targetId;

new InteractiveBrowser(params, browser, page, cdp, targetId);
new InteractiveBrowser(params, browser, page, cdp, targetId, waitUntil);
} else {
await automatedProfile(params, browser, page, cdp, waitUntil);
}
Expand All @@ -248,6 +244,10 @@ async function automatedProfile(
) {
let u, p;

logger.info(`Loading page: ${params.url}`);

await page.goto(params.url, { waitUntil });

logger.debug("Looking for username and password entry fields on page...");

try {
Expand Down Expand Up @@ -372,6 +372,7 @@ class InteractiveBrowser {
page: Page,
cdp: CDPSession,
targetId: string,
waitUntil: PuppeteerLifeCycleEvent = "load",
) {
logger.info("Creating Profile Interactively...");
child_process.spawn("socat", [
Expand Down Expand Up @@ -427,6 +428,12 @@ class InteractiveBrowser {
} else {
logger.info("Screencasting with CDP on port 9222");
}

logger.info(`Loading page: ${params.url}`);

page.goto(params.url, { waitUntil, timeout: 0 }).finally(() => {
logger.info("Loaded!");
});
}

handlePageLoad() {
Expand Down
18 changes: 17 additions & 1 deletion src/util/browser.ts
View file
Open in desktop
Expand Up @@ -85,6 +85,10 @@ export class Browser {

const args = this.chromeArgs(chromeOptions);

if (recording) {
args.push("--disable-site-isolation-trials");
}

let defaultViewport = null;

if (process.env.GEOMETRY) {
Expand All @@ -107,11 +111,24 @@ export class Browser {
defaultViewport,
waitForInitialPage: false,
userDataDir: this.profileDir,
targetFilter: recording
? undefined
: (target) => this.targetFilter(target),
};

await this._init(launchOpts, ondisconnect, recording);
}

targetFilter(target: Target) {
const attach = !(!target.url() && target.type() === "other");
logger.debug(
"Target Filter",
{ url: target.url(), type: target.type(), attach },
"browser",
);
return attach;
}

async setupPage({ page }: { page: Page; cdp: CDPSession }) {
await this.addInitScript(
page,
Expand Down Expand Up @@ -215,7 +232,6 @@ export class Browser {
"--remote-debugging-port=9221",
"--remote-allow-origins=*",
"--autoplay-policy=no-user-gesture-required",
"--disable-site-isolation-trials",
`--user-agent=${userAgent || this.getDefaultUA()}`,
...extraArgs,
];
Expand Down