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

Merge pull request #8804 from electron/isolated-world-origin

Browse source 
Set context isolation origin policy
This commit is contained in:
Kevin Sawicki 2017-03-02 09:16:51 -08:00 committed by GitHub
commit e51a4f0af1
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
atom/renderer/atom_renderer_client.cc
View file

@ -86,14 +86,21 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
} }
void CreateIsolatedWorldContext() { void CreateIsolatedWorldContext() {
auto frame = render_frame_->GetWebFrame();
// This maps to the name shown in the context combo box in the Console tab // This maps to the name shown in the context combo box in the Console tab
// of the dev tools. // of the dev tools.
render_frame_->GetWebFrame()->setIsolatedWorldHumanReadableName( frame->setIsolatedWorldHumanReadableName(
World::ISOLATED_WORLD, World::ISOLATED_WORLD,
blink::WebString::fromUTF8("Electron Isolated Context")); blink::WebString::fromUTF8("Electron Isolated Context"));
// Setup document's origin policy in isolated world
frame->setIsolatedWorldSecurityOrigin(
World::ISOLATED_WORLD, frame->document().getSecurityOrigin());
// Create initial script context in isolated world
blink::WebScriptSource source("void 0"); blink::WebScriptSource source("void 0");
render_frame_->GetWebFrame()->executeScriptInIsolatedWorld( frame->executeScriptInIsolatedWorld(
World::ISOLATED_WORLD, &source, 1, ExtensionGroup::MAIN_GROUP); World::ISOLATED_WORLD, &source, 1, ExtensionGroup::MAIN_GROUP);
} }

5
spec/fixtures/api/isolated-preload.js vendored
View file

@ -1,3 +1,8 @@
// Ensure fetch works from isolated world origin
fetch('http://localhost:1234')
fetch('https://localhost:1234')
fetch(`file://${__filename}`)
const {ipcRenderer, webFrame} = require('electron') const {ipcRenderer, webFrame} = require('electron')
window.foo = 3 window.foo = 3