summaryrefslogtreecommitdiff
path: root/ext/fetch
diff options
context:
space:
mode:
authorKenta Moriuchi <moriken@kimamass.com>2024-01-04 13:12:38 +0900
committerGitHub <noreply@github.com>2024-01-04 09:42:38 +0530
commitb2cd254c35b6b1b128beea0eacdb8e814d91e003 (patch)
treed55fa5910e32d8a664aff5b680e07debea93181e /ext/fetch
parent48556748577ba46db5f9212d14a0fcaa90d632f6 (diff)
fix: strict type check for cross realms (#21669)
Deno v1.39 introduces `vm.runInNewContext`. This may cause problems when using `Object.prototype.isPrototypeOf` to check built-in types. ```js import vm from "node:vm"; const err = new Error(); const crossErr = vm.runInNewContext(`new Error()`); console.assert( !(crossErr instanceof Error) ); console.assert( Object.getPrototypeOf(err) !== Object.getPrototypeOf(crossErr) ); ``` This PR changes to check using internal slots solves them. --- current: ``` > import vm from "node:vm"; undefined > vm.runInNewContext(`new Error("message")`) Error {} > vm.runInNewContext(`new Date("2018-12-10T02:26:59.002Z")`) Date {} ``` this PR: ``` > import vm from "node:vm"; undefined > vm.runInNewContext(`new Error("message")`) Error: message at <anonymous>:1:1 > vm.runInNewContext(`new Date("2018-12-10T02:26:59.002Z")`) 2018-12-10T02:26:59.002Z ``` --------- Co-authored-by: Bartek IwaƄczuk <biwanczuk@gmail.com>
Diffstat (limited to 'ext/fetch')
-rw-r--r--ext/fetch/22_body.js15
-rw-r--r--ext/fetch/26_fetch.js4
-rw-r--r--ext/fetch/27_eventsource.js2
3 files changed, 9 insertions, 12 deletions
diff --git a/ext/fetch/22_body.js b/ext/fetch/22_body.js
index b10540883..2d633ae39 100644
--- a/ext/fetch/22_body.js
+++ b/ext/fetch/22_body.js
@@ -37,7 +37,6 @@ import {
readableStreamThrowIfErrored,
} from "ext:deno_web/06_streams.js";
const {
- ArrayBufferPrototype,
ArrayBufferIsView,
ArrayPrototypeMap,
DataViewPrototypeGetBuffer,
@@ -46,8 +45,6 @@ const {
JSONParse,
ObjectDefineProperties,
ObjectPrototypeIsPrototypeOf,
- // TODO(lucacasonato): add SharedArrayBuffer to primordials
- // SharedArrayBufferPrototype
TypedArrayPrototypeGetBuffer,
TypedArrayPrototypeGetByteLength,
TypedArrayPrototypeGetByteOffset,
@@ -56,6 +53,10 @@ const {
TypeError,
Uint8Array,
} = primordials;
+const {
+ isAnyArrayBuffer,
+ isArrayBuffer,
+} = core;
/**
* @param {Uint8Array | string} chunk
@@ -412,7 +413,7 @@ function extractBody(object) {
);
}
source = TypedArrayPrototypeSlice(object);
- } else if (ObjectPrototypeIsPrototypeOf(ArrayBufferPrototype, object)) {
+ } else if (isArrayBuffer(object)) {
source = TypedArrayPrototypeSlice(new Uint8Array(object));
} else if (ObjectPrototypeIsPrototypeOf(FormDataPrototype, object)) {
const res = formDataToBlob(object);
@@ -461,11 +462,7 @@ webidl.converters["BodyInit_DOMString"] = (V, prefix, context, opts) => {
return webidl.converters["URLSearchParams"](V, prefix, context, opts);
}
if (typeof V === "object") {
- if (
- ObjectPrototypeIsPrototypeOf(ArrayBufferPrototype, V) ||
- // deno-lint-ignore prefer-primordials
- ObjectPrototypeIsPrototypeOf(SharedArrayBuffer.prototype, V)
- ) {
+ if (isAnyArrayBuffer(V)) {
return webidl.converters["ArrayBuffer"](V, prefix, context, opts);
}
if (ArrayBufferIsView(V)) {
diff --git a/ext/fetch/26_fetch.js b/ext/fetch/26_fetch.js
index 38605d5c9..b53013e49 100644
--- a/ext/fetch/26_fetch.js
+++ b/ext/fetch/26_fetch.js
@@ -51,7 +51,7 @@ const {
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypeError,
- Uint8ArrayPrototype,
+ TypedArrayPrototypeGetSymbolToStringTag,
} = primordials;
const REQUEST_BODY_HEADER_NAMES = [
@@ -131,7 +131,7 @@ async function mainFetch(req, recursive, terminator) {
const stream = req.body.streamOrStatic;
const body = stream.body;
- if (ObjectPrototypeIsPrototypeOf(Uint8ArrayPrototype, body)) {
+ if (TypedArrayPrototypeGetSymbolToStringTag(body) === "Uint8Array") {
reqBody = body;
} else if (typeof body === "string") {
reqBody = core.encode(body);
diff --git a/ext/fetch/27_eventsource.js b/ext/fetch/27_eventsource.js
index a7f8ba77d..fa1d928e5 100644
--- a/ext/fetch/27_eventsource.js
+++ b/ext/fetch/27_eventsource.js
@@ -7,7 +7,7 @@ import { core, primordials } from "ext:core/mod.js";
import * as webidl from "ext:deno_webidl/00_webidl.js";
import { createFilteredInspectProxy } from "ext:deno_console/01_console.js";
import { URL } from "ext:deno_url/00_url.js";
-import DOMException from "ext:deno_web/01_dom_exception.js";
+import { DOMException } from "ext:deno_web/01_dom_exception.js";
import {
defineEventHandler,
EventTarget,