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

chore: simplify code for modules internally using remote.require in sandbox (#16104)

Browse source
This commit is contained in:
Milan Burda 2018-12-17 20:47:41 +01:00 committed by Alexey Kuzmin
parent c64b4a3926
commit 7a6fe00f49
7 changed files with 8 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
BUILD.gn
View file

@ -62,14 +62,6 @@ npm_action("atom_browserify_sandbox") {
"lib/sandboxed_renderer/init.js", "lib/sandboxed_renderer/init.js",
"-r", "-r",
"./lib/sandboxed_renderer/api/exports/electron.js:electron", "./lib/sandboxed_renderer/api/exports/electron.js:electron",
"-r",
"./lib/sandboxed_renderer/api/exports/fs.js:fs",
"-r",
"./lib/sandboxed_renderer/api/exports/os.js:os",
"-r",
"./lib/sandboxed_renderer/api/exports/path.js:path",
"-r",
"./lib/sandboxed_renderer/api/exports/child_process.js:child_process",
"-t", "-t",
"aliasify", "aliasify",
] ]
@ -80,10 +72,6 @@ npm_action("atom_browserify_sandbox") {
# Use a script to generate all dependencies and put them here. # Use a script to generate all dependencies and put them here.
"lib/sandboxed_renderer/init.js", "lib/sandboxed_renderer/init.js",
"lib/sandboxed_renderer/api/exports/electron.js", "lib/sandboxed_renderer/api/exports/electron.js",
"lib/sandboxed_renderer/api/exports/fs.js",
"lib/sandboxed_renderer/api/exports/os.js",
"lib/sandboxed_renderer/api/exports/path.js",
"lib/sandboxed_renderer/api/exports/child_process.js",
] ]
outputs = [ outputs = [
"$target_gen_dir/js2c/preload_bundle.js", "$target_gen_dir/js2c/preload_bundle.js",

8
lib/renderer/remote.js
View file

@ -9,16 +9,16 @@ exports.getRemote = function (name) {
return remote[name] return remote[name]
} }
exports.getRemoteFor = function (usage) { exports.remoteRequire = function (name) {
if (!remote) { if (!remote) {
throw new Error(`${usage} requires remote, which is not enabled`) throw new Error(`${name} requires remote, which is not enabled`)
} }
return remote return remote.require(name)
} }
exports.potentiallyRemoteRequire = function (name) { exports.potentiallyRemoteRequire = function (name) {
if (process.sandboxed) { if (process.sandboxed) {
return exports.getRemoteFor(name).require(name) return exports.remoteRequire(name)
} else { } else {
return require(name) return require(name)
} }

8
lib/sandboxed_renderer/api/exports/child_process.js
View file

@ -1,8 +0,0 @@
'use strict'
const { deprecate } = require('electron')
deprecate.warn(`require('child_process')`, `remote.require('child_process')`)
const { getRemoteFor } = require('@electron/internal/renderer/remote')
module.exports = getRemoteFor('child_process').require('child_process')

8
lib/sandboxed_renderer/api/exports/fs.js
View file

@ -1,8 +0,0 @@
'use strict'
const { deprecate } = require('electron')
deprecate.warn(`require('fs')`, `remote.require('fs')`)
const { getRemoteFor } = require('@electron/internal/renderer/remote')
module.exports = getRemoteFor('fs').require('fs')

8
lib/sandboxed_renderer/api/exports/os.js
View file

@ -1,8 +0,0 @@
'use strict'
const { deprecate } = require('electron')
deprecate.warn(`require('os')`, `remote.require('os')`)
const { getRemoteFor } = require('@electron/internal/renderer/remote')
module.exports = getRemoteFor('os').require('os')

8
lib/sandboxed_renderer/api/exports/path.js
View file

@ -1,8 +0,0 @@
'use strict'
const { deprecate } = require('electron')
deprecate.warn(`require('path')`, `remote.require('path')`)
const { getRemoteFor } = require('@electron/internal/renderer/remote')
module.exports = getRemoteFor('path').require('path')

5
lib/sandboxed_renderer/init.js
View file

@ -91,13 +91,16 @@ Object.defineProperty(preloadProcess, 'noDeprecation', {
process.on('exit', () => preloadProcess.emit('exit')) process.on('exit', () => preloadProcess.emit('exit'))
const { remoteRequire } = require('@electron/internal/renderer/remote')
// This is the `require` function that will be visible to the preload script // This is the `require` function that will be visible to the preload script
function preloadRequire (module) { function preloadRequire (module) {
if (loadedModules.has(module)) { if (loadedModules.has(module)) {
return loadedModules.get(module) return loadedModules.get(module)
} }
if (remoteModules.has(module)) { if (remoteModules.has(module)) {
return require(module) electron.deprecate.warn(`require('${module}')`, `remote.require('${module}')`)
return remoteRequire(module)
} }
throw new Error('module not found') throw new Error('module not found')
} }