feat: support chrome extensions in sandboxed renderer (#16218)
* Add content script injector to sandboxed renderer * Fix 'getRenderProcessPreferences' binding to the wrong object * Pass getRenderProcessPreferences to content-scripts-injector * Emit document-start and document-end events in sandboxed renderer * Use GetContext from RendererClientBase * Prevent script context crash caused by lazily initialization * Remove frame filtering logic for onExit callback Since we're keeping track of which frames we've injected the bundle into, this logic is redundant. * Add initial content script tests * Add contextIsolation variants to content script tests * Add set include * Fix already loaded extension error * Add tests for content scripts 'run_at' options * Catch script injection eval error when CSP forbids it This can occur in a rendered sandbox when a CSP is enabled. We'll need to switch to using isolated worlds to fix this. * Fix content script tests not properly cleaning up extensions * Fix lint and type errors
This commit is contained in:
parent
825e526456
commit
42b7b25ac3
12 changed files with 215 additions and 26 deletions
|
@ -176,6 +176,38 @@ void AtomSandboxedRendererClient::RenderViewCreated(
|
|||
RendererClientBase::RenderViewCreated(render_view);
|
||||
}
|
||||
|
||||
void AtomSandboxedRendererClient::RunScriptsAtDocumentStart(
|
||||
content::RenderFrame* render_frame) {
|
||||
if (injected_frames_.find(render_frame) == injected_frames_.end())
|
||||
return;
|
||||
|
||||
auto* isolate = blink::MainThreadIsolate();
|
||||
v8::HandleScope handle_scope(isolate);
|
||||
|
||||
v8::Local<v8::Context> context =
|
||||
GetContext(render_frame->GetWebFrame(), isolate);
|
||||
v8::Context::Scope context_scope(context);
|
||||
|
||||
InvokeIpcCallback(context, "onDocumentStart",
|
||||
std::vector<v8::Local<v8::Value>>());
|
||||
}
|
||||
|
||||
void AtomSandboxedRendererClient::RunScriptsAtDocumentEnd(
|
||||
content::RenderFrame* render_frame) {
|
||||
if (injected_frames_.find(render_frame) == injected_frames_.end())
|
||||
return;
|
||||
|
||||
auto* isolate = blink::MainThreadIsolate();
|
||||
v8::HandleScope handle_scope(isolate);
|
||||
|
||||
v8::Local<v8::Context> context =
|
||||
GetContext(render_frame->GetWebFrame(), isolate);
|
||||
v8::Context::Scope context_scope(context);
|
||||
|
||||
InvokeIpcCallback(context, "onDocumentEnd",
|
||||
std::vector<v8::Local<v8::Value>>());
|
||||
}
|
||||
|
||||
void AtomSandboxedRendererClient::DidCreateScriptContext(
|
||||
v8::Handle<v8::Context> context,
|
||||
content::RenderFrame* render_frame) {
|
||||
|
@ -195,6 +227,8 @@ void AtomSandboxedRendererClient::DidCreateScriptContext(
|
|||
if (!should_load_preload)
|
||||
return;
|
||||
|
||||
injected_frames_.insert(render_frame);
|
||||
|
||||
// Wrap the bundle into a function that receives the binding object as
|
||||
// argument.
|
||||
auto* isolate = context->GetIsolate();
|
||||
|
@ -239,12 +273,9 @@ void AtomSandboxedRendererClient::SetupMainWorldOverrides(
|
|||
void AtomSandboxedRendererClient::WillReleaseScriptContext(
|
||||
v8::Handle<v8::Context> context,
|
||||
content::RenderFrame* render_frame) {
|
||||
// Only allow preload for the main frame
|
||||
// Or for sub frames when explicitly enabled
|
||||
if (!render_frame->IsMainFrame() &&
|
||||
!base::CommandLine::ForCurrentProcess()->HasSwitch(
|
||||
switches::kNodeIntegrationInSubFrames))
|
||||
if (injected_frames_.find(render_frame) == injected_frames_.end())
|
||||
return;
|
||||
injected_frames_.erase(render_frame);
|
||||
|
||||
auto* isolate = context->GetIsolate();
|
||||
v8::HandleScope handle_scope(isolate);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue