Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 82f7fa7545 |
31
main.js
31
main.js
@@ -659,37 +659,30 @@ ipcMain.on('create-view', async (_event, name, url, imageUrl, _zoom, useProxy) =
|
||||
trackNavigation(newUrl);
|
||||
});
|
||||
view.webContents.on('will-redirect', (_e, u) => trackNavigation(u));
|
||||
view.webContents.setWindowOpenHandler(({ url: newUrl, frameName, features }) => {
|
||||
view.webContents.setWindowOpenHandler(({ url: newUrl }) => {
|
||||
let newHostname = '';
|
||||
try { newHostname = new URL(newUrl).hostname; } catch (_) {}
|
||||
|
||||
// Trusted domain → open as real popup BrowserWindow with same session.
|
||||
// This is what OAuth flows need: window.opener.postMessage() works,
|
||||
// popup can close itself when done, parent stays on the original page.
|
||||
// Trusted domain (Google, Yandex, etc.) → navigate IN-PLACE, no popup.
|
||||
// 1.0.1 tried opening a real popup BrowserWindow here for OAuth postMessage
|
||||
// flows — turns out Google specifically detects popup-style embedded
|
||||
// browsers and blocks OAuth ("Возможно, этот браузер небезопасны").
|
||||
// YouTube-style login uses standard redirect flow, so in-place navigation
|
||||
// works AND avoids the popup fingerprint. 1.0.0 behavior, restored.
|
||||
if (newHostname && isTrustedDomain(newHostname)) {
|
||||
return {
|
||||
action: 'allow',
|
||||
overrideBrowserWindowOptions: {
|
||||
width: 520, height: 640,
|
||||
parent: mainWindow,
|
||||
autoHideMenuBar: true,
|
||||
webPreferences: {
|
||||
session: view.webContents.session,
|
||||
contextIsolation: true,
|
||||
nodeIntegration: false,
|
||||
},
|
||||
},
|
||||
};
|
||||
trackNavigation(newUrl);
|
||||
view.webContents.loadURL(newUrl);
|
||||
return { action: 'deny' };
|
||||
}
|
||||
|
||||
// Untrusted cross-domain → ask the user (original behavior).
|
||||
// Untrusted cross-domain → ask the user.
|
||||
if (origHostname && newHostname && newHostname !== origHostname) {
|
||||
pendingNavigate = { view, url: newUrl };
|
||||
setConfirm(`Перейти на "${newHostname}"?`, 'navigate-confirmed');
|
||||
return { action: 'deny' };
|
||||
}
|
||||
|
||||
// Same-origin popup → just navigate the current view.
|
||||
// Same-origin popup → navigate the current view.
|
||||
trackNavigation(newUrl);
|
||||
view.webContents.loadURL(newUrl);
|
||||
return { action: 'deny' };
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ESH-Media",
|
||||
"version": "1.0.8",
|
||||
"version": "1.0.9",
|
||||
"private": true,
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
|
||||
Reference in New Issue
Block a user