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

Merge pull request #10214 from psh0628/contextisolation-sandbox-fix

Browse source 
fix contextIsolation issue while webPreference sandbox is on
This commit is contained in:
Zeke Sikelianos 2017-08-28 21:20:04 -07:00 • committed by GitHub
commit c6918966c2
9 changed files with 73 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/renderer/atom_renderer_client.cc
View file

@ -41,8 +41,6 @@ AtomRendererClient::AtomRendererClient()
: node_integration_initialized_(false),
node_bindings_(NodeBindings::Create(NodeBindings::RENDERER)),
atom_bindings_(new AtomBindings(uv_default_loop())) {
isolated_world_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kContextIsolation);
}
AtomRendererClient::~AtomRendererClient() {
@ -171,14 +169,6 @@ void AtomRendererClient::WillDestroyWorkerContextOnWorkerThread(
}
}
v8::Local<v8::Context> AtomRendererClient::GetContext(
blink::WebFrame* frame, v8::Isolate* isolate) {
if (isolated_world())
return frame->WorldScriptContext(isolate, World::ISOLATED_WORLD);
else
return frame->MainWorldScriptContext();
}
void AtomRendererClient::SetupMainWorldOverrides(
v8::Handle<v8::Context> context) {
// Setup window overrides in the main world context

6
atom/renderer/atom_renderer_client.h
View file

@ -20,10 +20,6 @@ class AtomRendererClient : public RendererClientBase {
AtomRendererClient();
virtual ~AtomRendererClient();
// Get the context that the Electron API is running in.
v8::Local<v8::Context> GetContext(
blink::WebFrame* frame, v8::Isolate* isolate);
// atom::RendererClientBase:
void DidCreateScriptContext(
v8::Handle<v8::Context> context,
@ -32,7 +28,6 @@ class AtomRendererClient : public RendererClientBase {
v8::Handle<v8::Context> context,
content::RenderFrame* render_frame) override;
void SetupMainWorldOverrides(v8::Handle<v8::Context> context) override;
bool isolated_world() override { return isolated_world_; }
private:
enum NodeIntegration {
@ -64,7 +59,6 @@ class AtomRendererClient : public RendererClientBase {
std::unique_ptr<NodeBindings> node_bindings_;
std::unique_ptr<AtomBindings> atom_bindings_;
bool isolated_world_;
DISALLOW_COPY_AND_ASSIGN(AtomRendererClient);
};

1
atom/renderer/atom_sandboxed_renderer_client.h
View file

@ -27,7 +27,6 @@ class AtomSandboxedRendererClient : public RendererClientBase {
v8::Handle<v8::Context> context,
content::RenderFrame* render_frame) override;
void SetupMainWorldOverrides(v8::Handle<v8::Context> context) override { }
bool isolated_world() override { return false; }
// content::ContentRendererClient:
void RenderFrameCreated(content::RenderFrame*) override;
void RenderViewCreated(content::RenderView*) override;

10
atom/renderer/renderer_client_base.cc
View file

@ -69,6 +69,8 @@ RendererClientBase::RendererClientBase() {
ParseSchemesCLISwitch(switches::kStandardSchemes);
for (const std::string& scheme : standard_schemes_list)
url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
isolated_world_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kContextIsolation);
}
RendererClientBase::~RendererClientBase() {
@ -197,4 +199,12 @@ void RendererClientBase::AddSupportedKeySystems(
AddChromeKeySystems(key_systems);
}
v8::Local<v8::Context> RendererClientBase::GetContext(
blink::WebFrame* frame, v8::Isolate* isolate) {
if (isolated_world())
return frame->WorldScriptContext(isolate, World::ISOLATED_WORLD);
else
return frame->MainWorldScriptContext();
}
} // namespace atom

8
atom/renderer/renderer_client_base.h
View file

@ -25,7 +25,12 @@ class RendererClientBase : public content::ContentRendererClient {
v8::Handle<v8::Context> context, content::RenderFrame* render_frame) = 0;
virtual void DidClearWindowObject(content::RenderFrame* render_frame);
virtual void SetupMainWorldOverrides(v8::Handle<v8::Context> context) = 0;
virtual bool isolated_world() = 0;
bool isolated_world() { return isolated_world_; }
// Get the context that the Electron API is running in.
v8::Local<v8::Context> GetContext(
blink::WebFrame* frame, v8::Isolate* isolate);
protected:
void AddRenderBindings(v8::Isolate* isolate,
@ -51,6 +56,7 @@ class RendererClientBase : public content::ContentRendererClient {
private:
std::unique_ptr<PreferencesManager> preferences_manager_;
bool isolated_world_;
};
} // namespace atom