Skip to content
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.

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

Remove Object.prototype.__proto__ #4341

Merged
merged 5 commits into from
Mar 15, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
5 changes: 5 additions & 0 deletions cli/tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1426,6 +1426,11 @@ itest!(fix_js_imports {
output: "fix_js_imports.ts.out",
});

itest!(proto_exploit {
args: "run proto_exploit.js",
output: "proto_exploit.js.out",
});

#[test]
fn cafile_fetch() {
use deno::http_cache::url_to_filename;
Expand Down
5 changes: 5 additions & 0 deletions cli/tests/proto_exploit.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const payload = `{ "__proto__": null }`;
const obj = {};
console.log("Before: " + obj);
Object.assign(obj, JSON.parse(payload));
console.log("After: " + obj);
2 changes: 2 additions & 0 deletions cli/tests/proto_exploit.js.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Before: [object Object]
After: [object Object]
7 changes: 6 additions & 1 deletion deno_typescript/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,12 @@ pub fn mksnapshot_bundle(
js_check(
isolate.execute(&bundle_filename.to_string_lossy(), bundle_source_code),
);
let script = &format!("__instantiate(\"{}\");", main_module_name);
// instantiate the bundle and delete __proto__ for security reasons
// this is intentionally not compliant with ECMA-262 Annex B.2.2.1.
kitsonk marked this conversation as resolved.
Show resolved Hide resolved
let script = &format!(
"__instantiate(\"{}\");\n\ndelete Object.prototype.__proto__;",
main_module_name
);
kitsonk marked this conversation as resolved.
Show resolved Hide resolved
js_check(isolate.execute("anon", script));
write_snapshot(isolate, snapshot_filename)?;
Ok(())
Expand Down