mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: isTrustedSender() in test-app (#24214)

Browse source
This commit is contained in:
Milan Burda 2020-06-22 14:14:20 +02:00 committed by GitHub
parent 48d1a70b52
commit 0629c6c2ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
default_app/default_app.ts
View file

@ -1,5 +1,6 @@
import { app, dialog, BrowserWindow, shell, ipcMain } from 'electron'; import { app, dialog, BrowserWindow, shell, ipcMain } from 'electron';
import * as path from 'path'; import * as path from 'path';
import * as url from 'url';
let mainWindow: BrowserWindow | null = null; let mainWindow: BrowserWindow | null = null;
@ -29,12 +30,11 @@ function isTrustedSender (webContents: Electron.WebContents) {
return false; return false;
} }
const parsedUrl = new URL(webContents.getURL()); try {
const urlPath = process.platform === 'win32' return url.fileURLToPath(webContents.getURL()) === indexPath;
// Strip the prefixed "/" that occurs on windows } catch {
? path.resolve(parsedUrl.pathname.substr(1)) return false;
: parsedUrl.pathname; }
return parsedUrl.protocol === 'file:' && urlPath === indexPath;
} }
ipcMain.handle('bootstrap', (event) => { ipcMain.handle('bootstrap', (event) => {