github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: ignore non-absolute session preload script paths when sandboxed (#19066)

Browse Source
This commit is contained in:
Milan Burda
2019-07-03 17:05:45 +02:00
committed by John Kleinschmidt
parent 50b9c7051e
commit 69ea0b4ebf
10 changed files with 46 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/browser/rpc-server.js
View File

@@ -519,12 +519,10 @@ if (features.isDesktopCapturerEnabled()) {
const getPreloadScript = async function (preloadPath) {
let preloadSrc = null
let preloadError = null
if (preloadPath) {
try {
preloadSrc = (await fs.promises.readFile(preloadPath)).toString()
} catch (err) {
preloadError = errorUtils.serialize(err)
}
try {
preloadSrc = (await fs.promises.readFile(preloadPath)).toString()
} catch (err) {
preloadError = errorUtils.serialize(err)
}
return { preloadPath, preloadSrc, preloadError }
}
@@ -532,10 +530,7 @@ const getPreloadScript = async function (preloadPath) {
ipcMainUtils.handle('ELECTRON_GET_CONTENT_SCRIPTS', () => getContentScripts())
ipcMainUtils.handle('ELECTRON_BROWSER_SANDBOX_LOAD', async function (event) {
const preloadPaths = [
...(event.sender.session ? event.sender.session.getPreloads() : []),
event.sender._getPreloadPath()
]
const preloadPaths = event.sender._getPreloadPaths()
return {
contentScripts: getContentScripts(),