if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

ELECTRON-1265 (Fix checks for handling links & pop-outs) (#662)

Browse Source 
* ELECTRON-1265 - Fix checks for handling links & pop-outs

* ELECTRON-1265 - Add logs
This commit is contained in:
Kiran Niranjan 2019-05-28 15:50:38 +05:30 committed by Vishwas Shashidhar
parent 15655d6cdb
commit a16bcfef62
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/app/child-window-handler.ts
View File

@ -6,6 +6,7 @@ import { isDevEnv, isWindowsOS } from '../common/env';
import { i18n } from '../common/i18n';
import { logger } from '../common/logger';
import { getGuid } from '../common/utils';
import { whitelistHandler } from '../common/whitelist-handler';
import { config } from './config-handler';
import { monitorWindowActions, removeWindowEventListener } from './window-actions';
import { ICustomBrowserWindow, windowHandler } from './window-handler';
@ -43,8 +44,8 @@ const getParsedUrl = (configURL: string): Url => {
export const handleChildWindow = (webContents: WebContents): void => {
const childWindow = (event, newWinUrl, frameName, disposition, newWinOptions): void => {
logger.info(`child-window-handler: trying to create new child window for url ${newWinUrl},
frame ${frameName}, disposition ${disposition}`);
logger.info(`child-window-handler: trying to create new child window for url: ${newWinUrl},
frame name: ${frameName || undefined}, disposition: ${disposition}`);
const mainWindow = windowHandler.getMainWindow();
if (!mainWindow || mainWindow.isDestroyed()) {
logger.info(`child-window-handler: main window is not available / destroyed, not creating child window!`);
@ -60,33 +61,29 @@ export const handleChildWindow = (webContents: WebContents): void => {
}
Object.assign(newWinOptions.webPreferences, webContents);
const newWinParsedUrl = getParsedUrl(newWinUrl);
const mainWinParsedUrl = getParsedUrl(windowHandler.url);
const newWinHost = newWinParsedUrl && newWinParsedUrl.host;
const mainWinHost = mainWinParsedUrl && mainWinParsedUrl.host;
// need this to extract other parameters
const newWinParsedUrl = getParsedUrl(newWinUrl);
const newWinUrlData = whitelistHandler.parseDomain(newWinUrl);
const mainWinUrlData = whitelistHandler.parseDomain(windowHandler.url);
const newWinDomainName = `${newWinUrlData.domain}${newWinUrlData.tld}`;
const mainWinDomainName = `${mainWinUrlData.domain}${mainWinUrlData.tld}`;
logger.info(`child-window-handler: main window url: ${mainWinUrlData.subdomain}.${mainWinUrlData.domain}.${mainWinUrlData.tld}`);
const emptyUrlString = 'about:blank';
const dispositionWhitelist = ['new-window', 'foreground-tab'];
const fullMainUrl = `${mainWinParsedUrl.protocol}//${mainWinParsedUrl.host}/`;
logger.info(`child-window-handler: full main url is ${fullMainUrl}`);
// If the main url and new window url are the same,
// we open that in a browser rather than a separate window
if (newWinUrl.startsWith(fullMainUrl)) {
event.preventDefault();
logger.info(`child-window-handler: the new window url ${newWinUrl} and the main url ${fullMainUrl}
are the same, so, redirecting to be opened in the default browser!`);
windowHandler.openUrlInDefaultBrowser(newWinUrl);
return;
}
// only allow window.open to succeed if it is coming from same host,
// only allow window.open to succeed is if coming from same host,
// otherwise open in default browser.
if ((newWinHost === mainWinHost || newWinUrl === emptyUrlString ||
(newWinHost && mainWinHost && newWinHost.indexOf(mainWinHost) !== -1 && frameName !== ''))
if ((newWinDomainName === mainWinDomainName || newWinUrl === emptyUrlString)
&& frameName !== ''
&& dispositionWhitelist.includes(disposition)) {
logger.info(`child-window-handler: opening pop-out window for ${newWinUrl}`);
const newWinKey = getGuid();
if (!frameName) {
logger.info(`child-window-handler: frame name missing! not opening the url ${newWinUrl}`);