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

fix: exceptions in nested conversions live in the target world (#37895)

Browse source
This commit is contained in:
Samuel Attard 2023-04-10 14:58:27 -07:00 committed by GitHub
parent 1e206deec3
commit 6958668448
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
shell/renderer/api/electron_api_context_bridge.cc
View file

@ -241,10 +241,10 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
global_destination_context.IsEmpty()) global_destination_context.IsEmpty())
return; return;
context_bridge::ObjectCache object_cache; context_bridge::ObjectCache object_cache;
auto val = auto val = PassValueToOtherContext(
PassValueToOtherContext(global_source_context.Get(isolate), global_source_context.Get(isolate),
global_destination_context.Get(isolate), global_destination_context.Get(isolate), result, &object_cache,
result, &object_cache, false, 0); false, 0, BridgeErrorTarget::kSource);
if (!val.IsEmpty()) if (!val.IsEmpty())
proxied_promise->Resolve(val.ToLocalChecked()); proxied_promise->Resolve(val.ToLocalChecked());
}, },
@ -268,10 +268,10 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
global_destination_context.IsEmpty()) global_destination_context.IsEmpty())
return; return;
context_bridge::ObjectCache object_cache; context_bridge::ObjectCache object_cache;
auto val = auto val = PassValueToOtherContext(
PassValueToOtherContext(global_source_context.Get(isolate), global_source_context.Get(isolate),
global_destination_context.Get(isolate), global_destination_context.Get(isolate), result, &object_cache,
result, &object_cache, false, 0); false, 0, BridgeErrorTarget::kSource);
if (!val.IsEmpty()) if (!val.IsEmpty())
proxied_promise->Reject(val.ToLocalChecked()); proxied_promise->Reject(val.ToLocalChecked());
}, },
@ -324,7 +324,7 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
auto value_for_array = PassValueToOtherContext( auto value_for_array = PassValueToOtherContext(
source_context, destination_context, source_context, destination_context,
arr->Get(source_context, i).ToLocalChecked(), object_cache, arr->Get(source_context, i).ToLocalChecked(), object_cache,
support_dynamic_properties, recursion_depth + 1); support_dynamic_properties, recursion_depth + 1, error_target);
if (value_for_array.IsEmpty()) if (value_for_array.IsEmpty())
return v8::MaybeLocal<v8::Value>(); return v8::MaybeLocal<v8::Value>();
@ -358,7 +358,7 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
auto object_value = value.As<v8::Object>(); auto object_value = value.As<v8::Object>();
auto passed_value = CreateProxyForAPI( auto passed_value = CreateProxyForAPI(
object_value, source_context, destination_context, object_cache, object_value, source_context, destination_context, object_cache,
support_dynamic_properties, recursion_depth + 1); support_dynamic_properties, recursion_depth + 1, error_target);
if (passed_value.IsEmpty()) if (passed_value.IsEmpty())
return v8::MaybeLocal<v8::Value>(); return v8::MaybeLocal<v8::Value>();
return v8::MaybeLocal<v8::Value>(passed_value.ToLocalChecked()); return v8::MaybeLocal<v8::Value>(passed_value.ToLocalChecked());
@ -372,8 +372,9 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
: destination_context; : destination_context;
v8::Context::Scope error_scope(error_context); v8::Context::Scope error_scope(error_context);
// V8 serializer will throw an error if required // V8 serializer will throw an error if required
if (!gin::ConvertFromV8(error_context->GetIsolate(), value, &ret)) if (!gin::ConvertFromV8(error_context->GetIsolate(), value, &ret)) {
return v8::MaybeLocal<v8::Value>(); return v8::MaybeLocal<v8::Value>();
}
} }
{ {
@ -420,9 +421,9 @@ void ProxyFunctionWrapper(const v8::FunctionCallbackInfo<v8::Value>& info) {
args.GetRemaining(&original_args); args.GetRemaining(&original_args);
for (auto value : original_args) { for (auto value : original_args) {
auto arg = auto arg = PassValueToOtherContext(
PassValueToOtherContext(calling_context, func_owning_context, value, calling_context, func_owning_context, value, &object_cache,
&object_cache, support_dynamic_properties, 0); support_dynamic_properties, 0, BridgeErrorTarget::kSource);
if (arg.IsEmpty()) if (arg.IsEmpty())
return; return;
proxied_args.push_back(arg.ToLocalChecked()); proxied_args.push_back(arg.ToLocalChecked());
@ -485,7 +486,8 @@ v8::MaybeLocal<v8::Object> CreateProxyForAPI(
const v8::Local<v8::Context>& destination_context, const v8::Local<v8::Context>& destination_context,
context_bridge::ObjectCache* object_cache, context_bridge::ObjectCache* object_cache,
bool support_dynamic_properties, bool support_dynamic_properties,
int recursion_depth) { int recursion_depth,
BridgeErrorTarget error_target) {
gin_helper::Dictionary api(source_context->GetIsolate(), api_object); gin_helper::Dictionary api(source_context->GetIsolate(), api_object);
{ {
@ -526,14 +528,16 @@ v8::MaybeLocal<v8::Object> CreateProxyForAPI(
if (!getter.IsEmpty()) { if (!getter.IsEmpty()) {
if (!PassValueToOtherContext(source_context, destination_context, if (!PassValueToOtherContext(source_context, destination_context,
getter, object_cache, getter, object_cache,
support_dynamic_properties, 1) support_dynamic_properties, 1,
error_target)
.ToLocal(&getter_proxy)) .ToLocal(&getter_proxy))
continue; continue;
} }
if (!setter.IsEmpty()) { if (!setter.IsEmpty()) {
if (!PassValueToOtherContext(source_context, destination_context, if (!PassValueToOtherContext(source_context, destination_context,
setter, object_cache, setter, object_cache,
support_dynamic_properties, 1) support_dynamic_properties, 1,
error_target)
.ToLocal(&setter_proxy)) .ToLocal(&setter_proxy))
continue; continue;
} }
@ -551,7 +555,7 @@ v8::MaybeLocal<v8::Object> CreateProxyForAPI(
auto passed_value = PassValueToOtherContext( auto passed_value = PassValueToOtherContext(
source_context, destination_context, value, object_cache, source_context, destination_context, value, object_cache,
support_dynamic_properties, recursion_depth + 1); support_dynamic_properties, recursion_depth + 1, error_target);
if (passed_value.IsEmpty()) if (passed_value.IsEmpty())
return v8::MaybeLocal<v8::Object>(); return v8::MaybeLocal<v8::Object>();
proxy.Set(key, passed_value.ToLocalChecked()); proxy.Set(key, passed_value.ToLocalChecked());
@ -597,9 +601,9 @@ void ExposeAPIInWorld(v8::Isolate* isolate,
context_bridge::ObjectCache object_cache; context_bridge::ObjectCache object_cache;
v8::Context::Scope target_context_scope(target_context); v8::Context::Scope target_context_scope(target_context);
v8::MaybeLocal<v8::Value> maybe_proxy = v8::MaybeLocal<v8::Value> maybe_proxy = PassValueToOtherContext(
PassValueToOtherContext(electron_isolated_context, target_context, api, electron_isolated_context, target_context, api, &object_cache, false, 0,
&object_cache, false, 0); BridgeErrorTarget::kSource);
if (maybe_proxy.IsEmpty()) if (maybe_proxy.IsEmpty())
return; return;
auto proxy = maybe_proxy.ToLocalChecked(); auto proxy = maybe_proxy.ToLocalChecked();
@ -649,7 +653,7 @@ void OverrideGlobalValueFromIsolatedWorld(
context_bridge::ObjectCache object_cache; context_bridge::ObjectCache object_cache;
v8::MaybeLocal<v8::Value> maybe_proxy = PassValueToOtherContext( v8::MaybeLocal<v8::Value> maybe_proxy = PassValueToOtherContext(
value->GetCreationContextChecked(), main_context, value, &object_cache, value->GetCreationContextChecked(), main_context, value, &object_cache,
support_dynamic_properties, 1); support_dynamic_properties, 1, BridgeErrorTarget::kSource);
DCHECK(!maybe_proxy.IsEmpty()); DCHECK(!maybe_proxy.IsEmpty());
auto proxy = maybe_proxy.ToLocalChecked(); auto proxy = maybe_proxy.ToLocalChecked();
@ -685,14 +689,14 @@ bool OverrideGlobalPropertyFromIsolatedWorld(
if (!getter->IsNullOrUndefined()) { if (!getter->IsNullOrUndefined()) {
v8::MaybeLocal<v8::Value> maybe_getter_proxy = PassValueToOtherContext( v8::MaybeLocal<v8::Value> maybe_getter_proxy = PassValueToOtherContext(
getter->GetCreationContextChecked(), main_context, getter, getter->GetCreationContextChecked(), main_context, getter,
&object_cache, false, 1); &object_cache, false, 1, BridgeErrorTarget::kSource);
DCHECK(!maybe_getter_proxy.IsEmpty()); DCHECK(!maybe_getter_proxy.IsEmpty());
getter_proxy = maybe_getter_proxy.ToLocalChecked(); getter_proxy = maybe_getter_proxy.ToLocalChecked();
} }
if (!setter->IsNullOrUndefined() && setter->IsObject()) { if (!setter->IsNullOrUndefined() && setter->IsObject()) {
v8::MaybeLocal<v8::Value> maybe_setter_proxy = PassValueToOtherContext( v8::MaybeLocal<v8::Value> maybe_setter_proxy = PassValueToOtherContext(
getter->GetCreationContextChecked(), main_context, setter, getter->GetCreationContextChecked(), main_context, setter,
&object_cache, false, 1); &object_cache, false, 1, BridgeErrorTarget::kSource);
DCHECK(!maybe_setter_proxy.IsEmpty()); DCHECK(!maybe_setter_proxy.IsEmpty());
setter_proxy = maybe_setter_proxy.ToLocalChecked(); setter_proxy = maybe_setter_proxy.ToLocalChecked();
} }

5
shell/renderer/api/electron_api_context_bridge.h
View file

@ -39,7 +39,7 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
context_bridge::ObjectCache* object_cache, context_bridge::ObjectCache* object_cache,
bool support_dynamic_properties, bool support_dynamic_properties,
int recursion_depth, int recursion_depth,
BridgeErrorTarget error_target = BridgeErrorTarget::kSource); BridgeErrorTarget error_target);
v8::MaybeLocal<v8::Object> CreateProxyForAPI( v8::MaybeLocal<v8::Object> CreateProxyForAPI(
const v8::Local<v8::Object>& api_object, const v8::Local<v8::Object>& api_object,
@ -47,7 +47,8 @@ v8::MaybeLocal<v8::Object> CreateProxyForAPI(
const v8::Local<v8::Context>& destination_context, const v8::Local<v8::Context>& destination_context,
context_bridge::ObjectCache* object_cache, context_bridge::ObjectCache* object_cache,
bool support_dynamic_properties, bool support_dynamic_properties,
int recursion_depth); int recursion_depth,
BridgeErrorTarget error_target);
} // namespace electron::api } // namespace electron::api

2
shell/renderer/api/electron_api_web_frame.cc
View file

@ -142,7 +142,7 @@ class ScriptExecutionCallback {
context_bridge::ObjectCache object_cache; context_bridge::ObjectCache object_cache;
maybe_result = PassValueToOtherContext( maybe_result = PassValueToOtherContext(
result->GetCreationContextChecked(), promise_.GetContext(), result, result->GetCreationContextChecked(), promise_.GetContext(), result,
&object_cache, false, 0); &object_cache, false, 0, BridgeErrorTarget::kSource);
if (maybe_result.IsEmpty() || try_catch.HasCaught()) { if (maybe_result.IsEmpty() || try_catch.HasCaught()) {
success = false; success = false;
} }

3
shell/renderer/renderer_client_base.cc
View file

@ -608,7 +608,8 @@ void RendererClientBase::SetupMainWorldOverrides(
if (global.GetHidden("guestViewInternal", &guest_view_internal)) { if (global.GetHidden("guestViewInternal", &guest_view_internal)) {
api::context_bridge::ObjectCache object_cache; api::context_bridge::ObjectCache object_cache;
auto result = api::PassValueToOtherContext( auto result = api::PassValueToOtherContext(
source_context, context, guest_view_internal, &object_cache, false, 0); source_context, context, guest_view_internal, &object_cache, false, 0,
api::BridgeErrorTarget::kSource);
if (!result.IsEmpty()) { if (!result.IsEmpty()) {
isolated_api.Set("guestViewInternal", result.ToLocalChecked()); isolated_api.Set("guestViewInternal", result.ToLocalChecked());
} }

14
spec/api-context-bridge-spec.ts
View file

@ -806,6 +806,14 @@ describe('contextBridge', () => {
throwNotClonable: () => { throwNotClonable: () => {
return Object(Symbol('foo')); return Object(Symbol('foo'));
}, },
throwNotClonableNestedArray: () => {
return [Object(Symbol('foo'))];
},
throwNotClonableNestedObject: () => {
return {
bad: Object(Symbol('foo'))
};
},
argumentConvert: () => {} argumentConvert: () => {}
}); });
}); });
@ -821,10 +829,12 @@ describe('contextBridge', () => {
const normalIsError = Object.getPrototypeOf(getError(root.example.throwNormal)) === Error.prototype; const normalIsError = Object.getPrototypeOf(getError(root.example.throwNormal)) === Error.prototype;
const weirdIsError = Object.getPrototypeOf(getError(root.example.throwWeird)) === Error.prototype; const weirdIsError = Object.getPrototypeOf(getError(root.example.throwWeird)) === Error.prototype;
const notClonableIsError = Object.getPrototypeOf(getError(root.example.throwNotClonable)) === Error.prototype; const notClonableIsError = Object.getPrototypeOf(getError(root.example.throwNotClonable)) === Error.prototype;
const notClonableNestedArrayIsError = Object.getPrototypeOf(getError(root.example.throwNotClonableNestedArray)) === Error.prototype;
const notClonableNestedObjectIsError = Object.getPrototypeOf(getError(root.example.throwNotClonableNestedObject)) === Error.prototype;
const argumentConvertIsError = Object.getPrototypeOf(getError(() => root.example.argumentConvert(Object(Symbol('test'))))) === Error.prototype; const argumentConvertIsError = Object.getPrototypeOf(getError(() => root.example.argumentConvert(Object(Symbol('test'))))) === Error.prototype;
return [normalIsError, weirdIsError, notClonableIsError, argumentConvertIsError]; return [normalIsError, weirdIsError, notClonableIsError, notClonableNestedArrayIsError, notClonableNestedObjectIsError, argumentConvertIsError];
}); });
expect(result).to.deep.equal([true, true, true, true], 'should all be errors in the current context'); expect(result).to.deep.equal([true, true, true, true, true, true], 'should all be errors in the current context');
}); });
it('should not leak prototypes', async () => { it('should not leak prototypes', async () => {