Skip to content

fix: disallow js execution for op_import_sync #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsherret wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: disallow js execution for op_import_sync #1218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions core/ops_builtin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use std::io::Write;
use std::io::stderr;
use std::io::stdout;
use std::rc::Rc;
use v8::DisallowJavascriptExecutionScope;

macro_rules! builtin_ops {
( $($op:ident $(:: $sub:ident)*),* ) => {
Expand Down Expand Up @@ -602,12 +603,23 @@ fn op_import_sync<'s>(
let module_map_rc = JsRealm::module_map_from(scope);

// no js execution within block_on
let module_id = futures::executor::block_on(do_load_job(
scope,
module_map_rc.clone(),
specifier,
code,
))?;
let module_id = {
let scope = &mut v8::TryCatch::new(scope);
let module_id = futures::executor::block_on(do_load_job(
&mut DisallowJavascriptExecutionScope::new(
scope,
v8::OnFailure::ThrowOnFailure,
),
module_map_rc.clone(),
specifier,
code,
))?;
if let Some(exception) = scope.exception() {
return exception_to_err_result(scope, exception, false, false)
.map_err(|e| CoreErrorKind::Js(e).into_box());
}
module_id
};

let module = module_map_rc
.get_module(scope, module_id)
Expand Down
Loading