github/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

launcher: finish allowRedirects

Browse Source
This commit is contained in:
Oj 2023-02-07 13:12:21 +00:00
parent 58e2ed219b
commit 06fa10b09c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/launcher/inject.js
View File

@ -42,18 +42,23 @@ export default async (CDP, proc, injectionType = 'browser', { dataPath, browserN
if (msg.method === 'Page.frameScheduledNavigation' || msg.method === 'Page.frameNavigated') { if (msg.method === 'Page.frameScheduledNavigation' || msg.method === 'Page.frameNavigated') {
let newUrl = msg.params?.frame?.url ?? msg.params?.url; let newUrl = msg.params?.frame?.url ?? msg.params?.url;
if (allowRedirects === true) return; if (allowRedirects === true) return; // always allow redirects
if (allowRedirects === 'same-origin' && new URL(newUrl).origin === new URL(url).origin) return; if (allowRedirects === 'same-origin' && new URL(newUrl).origin === new URL(url).origin) return; // only allow if same origin
if (allowRedirects === false && newUrl === url) return; if (allowRedirects === false && newUrl === url) return; // only allow if identical open() url
if (newUrl === 'about:blank') return; // allow blank urls
CDP.sendMessage('Page.stopLoading', {}, sessionId); CDP.sendMessage('Page.stopLoading', {}, sessionId);
if (msg.method === 'Page.frameNavigated') { if (msg.method === 'Page.frameNavigated') {
CDP.sendMessage('Page.navigate', { url: 'about:blank' }, sessionId); // Page.frameNavigated will never be fired if we intercept the scheduled navigation
// but Firefox does not support that so this is a fallback
// load about:blank whilst we do things
// CDP.sendMessage('Page.navigate', { url: 'about:blank' }, sessionId);
const history = await CDP.sendMessage('Page.getNavigationHistory', {}, sessionId); const history = await CDP.sendMessage('Page.getNavigationHistory', {}, sessionId);
let oldUrl = history.entries[history.currentIndex - 1].url; let oldUrl = history.entries[history.currentIndex - 1].url;
if (oldUrl === 'about:blank') oldUrl = history.entries[history.currentIndex - 2].url; // if (oldUrl === 'about:blank') oldUrl = history.entries[history.currentIndex - 2].url;
CDP.sendMessage('Page.navigate', { CDP.sendMessage('Page.navigate', {
url: oldUrl, url: oldUrl,