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

window: rename allowRedirects to allowNavigation

Browse Source
This commit is contained in:
CanadaHonk 2023-02-08 16:31:46 +00:00
parent 9f3a2ea1fa
commit 901e5d443a
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gluon.d.ts vendored
View File

@ -521,14 +521,14 @@ type OpenOptions = {
allowHTTP?: false | 'mixed' | true, allowHTTP?: false | 'mixed' | true,
/** /**
* Set what redirects are allowed in the window. * Set what top-level navigation is allowed in the window.
* Options: * Options:
* - `false`: **No** redirects are allowed. * - `false`: **No** navigation is allowed.
* - `same-origin`: Redirects are **allowed if the redirect URL is the same origin** (as the URL given to `open()`). * - `same-origin`: Navigation is allowed **if the redirect URL is the same origin** (as the URL given to `open()`).
* - `true`: **All** redirects are allowed. **Not recommended.** * - `true`: **All** navigation is allowed. **Not recommended.**
* @default 'same-origin' * @default 'same-origin'
*/ */
allowRedirects?: false | 'same-origin' | true, allowNavigation?: false | 'same-origin' | true,
/** /**
* Set the Content Security Policy when using Local (giving open() a path). * Set the Content Security Policy when using Local (giving open() a path).

8
src/index.js
View File

@ -194,7 +194,7 @@ const defaultCSP = [ 'upgrade-insecure-requests' ].concat(
[ 'connect-src', 'prefetch-src', 'font-src', 'img-src', 'media-src', 'style-src', 'form-action' ].map(x => `${x} ${csp_allowAll}`) [ 'connect-src', 'prefetch-src', 'font-src', 'img-src', 'media-src', 'style-src', 'form-action' ].map(x => `${x} ${csp_allowAll}`)
).join('; '); ).join('; ');
const startBrowser = async (url, { allowHTTP = false, allowRedirects = 'same-origin', windowSize, forceBrowser, forceEngine, localCSP = defaultCSP }) => { const startBrowser = async (url, { allowHTTP = false, allowNavigation = 'same-origin', windowSize, forceBrowser, forceEngine, localCSP = defaultCSP }) => {
const [ browserPath, browserName ] = await findBrowserPath(forceBrowser, forceEngine); const [ browserPath, browserName ] = await findBrowserPath(forceBrowser, forceEngine);
const browserFriendlyName = getFriendlyName(browserName); const browserFriendlyName = getFriendlyName(browserName);
@ -229,16 +229,16 @@ const startBrowser = async (url, { allowHTTP = false, allowRedirects = 'same-ori
closeHandlers, closeHandlers,
browserType, browserType,
dataPath, dataPath,
allowRedirects, allowNavigation,
localCSP localCSP
}); });
return Window; return Window;
}; };
const checkForDangerousOptions = ({ allowHTTP, allowRedirects }) => { const checkForDangerousOptions = ({ allowHTTP, allowNavigation }) => {
if (allowHTTP === true) dangerousAPI('Gluon.open', 'allowHTTP', 'true'); if (allowHTTP === true) dangerousAPI('Gluon.open', 'allowHTTP', 'true');
if (allowRedirects === true) dangerousAPI('Gluon.open', 'allowRedirects', 'true'); if (allowNavigation === true) dangerousAPI('Gluon.open', 'allowNavigation', 'true');
}; };
export const open = async (url, opts = {}) => { export const open = async (url, opts = {}) => {

9
src/launcher/inject.js
View File

@ -27,7 +27,7 @@ const acquireTarget = async (CDP, filter = () => true) => {
})).sessionId; })).sessionId;
}; };
export default async (CDP, proc, injectionType = 'browser', { dataPath, browserName, browserType, openingLocal, url, basePath, allowRedirects, localCSP, closeHandlers }) => { export default async (CDP, proc, injectionType = 'browser', { dataPath, browserName, browserType, openingLocal, url, basePath, allowNavigation, localCSP, closeHandlers }) => {
let pageLoadCallback, pageLoadPromise = new Promise(res => pageLoadCallback = res); let pageLoadCallback, pageLoadPromise = new Promise(res => pageLoadCallback = res);
let frameLoadCallback = () => {}, onWindowMessage = () => {}; let frameLoadCallback = () => {}, onWindowMessage = () => {};
CDP.onMessage(async msg => { CDP.onMessage(async msg => {
@ -42,9 +42,10 @@ 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; // always allow redirects
if (allowRedirects === 'same-origin' && new URL(newUrl).origin === new URL(url).origin) return; // only allow if same origin if (allowNavigation === true) return; // always allow redirects
if (allowRedirects === false && newUrl === url) return; // only allow if identical open() url if (allowNavigation === 'same-origin' && new URL(newUrl).origin === new URL(url).origin) return; // only allow if same origin
if (allowNavigation === false && newUrl === url) return; // only allow if identical open() url
if (newUrl === 'about:blank') return; // allow blank urls if (newUrl === 'about:blank') return; // allow blank urls
CDP.sendMessage('Page.stopLoading', {}, sessionId); CDP.sendMessage('Page.stopLoading', {}, sessionId);