github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-27 08:18:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable sandbox on webview

Browse Source
This commit is contained in:
Hari Juturu
2017-05-31 23:01:14 -07:00
parent 6a9de535c7
commit b5239754ba
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
atom/app/atom_main_delegate.cc
View File

@@ -130,9 +130,6 @@ void AtomMainDelegate::PreSandboxStartup() {
// Disable setuid sandbox since it is not longer required on linux(namespace
// sandbox is available on most distros).
command_line->AppendSwitch(::switches::kDisableSetuidSandbox);
} else {
// Disable renderer sandbox for most of node's functions.
command_line->AppendSwitch(::switches::kNoSandbox);
}
// Allow file:// URIs to read other file:// URIs by default.

14
atom/browser/web_contents_preferences.cc
View File

@@ -108,11 +108,15 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
command_line->AppendSwitchASCII(switches::kWebviewTag,
webview_tag ? "true" : "false");
// If the `sandbox` option was passed to the BrowserWindow's webPreferences,
// pass `--enable-sandbox` to the renderer so it won't have any node.js
// integration.
if (IsSandboxed(web_contents))
command_line->AppendSwitch(switches::kEnableSandbox);
if (IsSandboxed(web_contents)) {
// pass `--enable-sandbox` to the renderer so it won't have any node.js
// integration.
command_line->AppendSwitch(switches::kEnableSandbox);
}
else {
// Disable renderer sandbox for most of node's functions.
command_line->AppendSwitch(::switches::kNoSandbox);
}
if (web_preferences.GetBoolean("nativeWindowOpen", &b) && b)
command_line->AppendSwitch(switches::kNativeWindowOpen);