Sync DoS mitigations for React Flight

parent ecda06cd
......@@ -433,17 +433,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) {
parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference)
return (
(key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound },
resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
if (void 0 !== parentReference) {
key = writtenObjects.get(value);
if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound },
resolveToJSON
);
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if (
void 0 !== temporaryReferences &&
-1 === key.indexOf(":") &&
......@@ -735,10 +738,17 @@ function waitForReference(
value.then(fulfill, reject);
return;
}
value = value[path[i]];
var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
}
i = map(response, value, parentObject, key);
parentObject[key] = i;
"__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i);
if (
parentObject[0] === REACT_ELEMENT_TYPE &&
......@@ -820,7 +830,7 @@ function loadServerReference(response, metaData, parentObject, key) {
resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
}
registerBoundServerReference(resolvedValue, metaData.id, metaData.bound);
parentObject[key] = resolvedValue;
"__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue);
if (
parentObject[0] === REACT_ELEMENT_TYPE &&
......@@ -1137,8 +1147,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk));
} else {
chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response);
chunk$52.then(
var chunk$53 = createPendingChunk(response);
chunk$53.then(
function (v) {
return controller.enqueue(v);
},
......@@ -1146,10 +1156,10 @@ function startReadableStream(response, id, type) {
return controller.error(e);
}
);
previousBlockedChunk = chunk$52;
previousBlockedChunk = chunk$53;
chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null);
resolveModelChunk(chunk$52, json);
previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(chunk$53, json);
});
}
},
......@@ -1284,8 +1294,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) {
var chunk = buffer[i$53];
for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$54];
byteLength.set(chunk, i);
i += chunk.byteLength;
}
......@@ -1475,42 +1485,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
}
function createFromJSONCallback(response) {
return function (key, value) {
if ("string" === typeof value)
return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) {
if (value[0] === REACT_ELEMENT_TYPE) {
if (
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
if ("__proto__" !== key) {
if ("string" === typeof value)
return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) {
if (value[0] === REACT_ELEMENT_TYPE) {
if (
((value = initializingHandler),
(initializingHandler = value.parent),
value.errored)
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
(key = createErrorChunk(response, value.value)),
(key = createLazyChunkWrapper(key));
else if (0 < value.deps) {
var blockedChunk = new ReactPromise(
"blocked",
null,
null,
response
);
value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
if (
((value = initializingHandler),
(initializingHandler = value.parent),
value.errored)
)
(key = createErrorChunk(response, value.value)),
(key = createLazyChunkWrapper(key));
else if (0 < value.deps) {
var blockedChunk = new ReactPromise(
"blocked",
null,
null,
response
);
value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
}
return value;
}
return value;
};
}
function createResponseFromOptions(options) {
......
......@@ -454,17 +454,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) {
parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference)
return (
(key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound },
resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
if (void 0 !== parentReference) {
key = writtenObjects.get(value);
if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound },
resolveToJSON
);
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if (
void 0 !== temporaryReferences &&
-1 === key.indexOf(":") &&
......@@ -905,10 +908,17 @@ function waitForReference(
value.then(fulfill, reject);
return;
}
value = value[path[i]];
var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
}
i = map(response, value, parentObject, key);
parentObject[key] = i;
"__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i);
if (
parentObject[0] === REACT_ELEMENT_TYPE &&
......@@ -1005,7 +1015,7 @@ function loadServerReference(response, metaData, parentObject, key) {
metaData.bound,
response._encodeFormAction
);
parentObject[key] = resolvedValue;
"__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue);
if (
parentObject[0] === REACT_ELEMENT_TYPE &&
......@@ -1327,8 +1337,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk));
} else {
chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response);
chunk$52.then(
var chunk$53 = createPendingChunk(response);
chunk$53.then(
function (v) {
return controller.enqueue(v);
},
......@@ -1336,10 +1346,10 @@ function startReadableStream(response, id, type) {
return controller.error(e);
}
);
previousBlockedChunk = chunk$52;
previousBlockedChunk = chunk$53;
chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null);
resolveModelChunk(chunk$52, json);
previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(chunk$53, json);
});
}
},
......@@ -1474,8 +1484,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) {
var chunk = buffer[i$53];
for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$54];
byteLength.set(chunk, i);
i += chunk.byteLength;
}
......@@ -1665,42 +1675,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
}
function createFromJSONCallback(response) {
return function (key, value) {
if ("string" === typeof value)
return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) {
if (value[0] === REACT_ELEMENT_TYPE) {
if (
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
if ("__proto__" !== key) {
if ("string" === typeof value)
return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) {
if (value[0] === REACT_ELEMENT_TYPE) {
if (
((value = initializingHandler),
(initializingHandler = value.parent),
value.errored)
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
(key = createErrorChunk(response, value.value)),
(key = createLazyChunkWrapper(key));
else if (0 < value.deps) {
var blockedChunk = new ReactPromise(
"blocked",
null,
null,
response
);
value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
if (
((value = initializingHandler),
(initializingHandler = value.parent),
value.errored)
)
(key = createErrorChunk(response, value.value)),
(key = createLazyChunkWrapper(key));
else if (0 < value.deps) {
var blockedChunk = new ReactPromise(
"blocked",
null,
null,
response
);
value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
}
return value;
}
return value;
};
}
function noServerCall() {
......
......@@ -455,17 +455,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) {
parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference)
return (
(key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound },
resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
if (void 0 !== parentReference) {
key = writtenObjects.get(value);
if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound },
resolveToJSON
);
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if (
void 0 !== temporaryReferences &&
-1 === key.indexOf(":") &&
......@@ -906,10 +909,17 @@ function waitForReference(
value.then(fulfill, reject);
return;
}
value = value[path[i]];
var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
}
i = map(response, value, parentObject, key);
parentObject[key] = i;
"__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i);
if (
parentObject[0] === REACT_ELEMENT_TYPE &&
......@@ -1006,7 +1016,7 @@ function loadServerReference(response, metaData, parentObject, key) {
metaData.bound,
response._encodeFormAction
);
parentObject[key] = resolvedValue;
"__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue);
if (
parentObject[0] === REACT_ELEMENT_TYPE &&
......@@ -1328,8 +1338,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk));
} else {
chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response);
chunk$52.then(
var chunk$53 = createPendingChunk(response);
chunk$53.then(
function (v) {
return controller.enqueue(v);
},
......@@ -1337,10 +1347,10 @@ function startReadableStream(response, id, type) {
return controller.error(e);
}
);
previousBlockedChunk = chunk$52;
previousBlockedChunk = chunk$53;
chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null);
resolveModelChunk(chunk$52, json);
previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(chunk$53, json);
});
}
},
......@@ -1475,8 +1485,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) {
var chunk = buffer[i$53];
for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$54];
byteLength.set(chunk, i);
i += chunk.byteLength;
}
......@@ -1666,42 +1676,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
}
function createFromJSONCallback(response) {
return function (key, value) {
if ("string" === typeof value)
return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) {
if (value[0] === REACT_ELEMENT_TYPE) {
if (
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
if ("__proto__" !== key) {
if ("string" === typeof value)
return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) {
if (value[0] === REACT_ELEMENT_TYPE) {
if (
((value = initializingHandler),
(initializingHandler = value.parent),
value.errored)
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
(key = createErrorChunk(response, value.value)),
(key = createLazyChunkWrapper(key));
else if (0 < value.deps) {
var blockedChunk = new ReactPromise(
"blocked",
null,
null,
response
);
value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
if (
((value = initializingHandler),
(initializingHandler = value.parent),
value.errored)
)
(key = createErrorChunk(response, value.value)),
(key = createLazyChunkWrapper(key));
else if (0 < value.deps) {
var blockedChunk = new ReactPromise(
"blocked",
null,
null,
response
);
value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
}
return value;
}
return value;
};
}
function noServerCall() {
......
......@@ -48,7 +48,7 @@
"neo-async": "^2.6.1"
},
"peerDependencies": {
"react": "0.0.0-experimental-5e960585-20251211",
"react-dom": "0.0.0-experimental-5e960585-20251211"
"react": "0.0.0-experimental-c5586591-20260123",
"react-dom": "0.0.0-experimental-c5586591-20260123"
}
}
\ No newline at end of file
......@@ -432,17 +432,20 @@ function processReply(
if ("undefined" === typeof value) return "$undefined";
if ("function" === typeof value) {
parentReference = knownServerReferences.get(value);
if (void 0 !== parentReference)
return (
(key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound },
resolveToJSON
)),
null === formData && (formData = new FormData()),
(parentReference = nextPartId++),
formData.set(formFieldPrefix + parentReference, key),
"$h" + parentReference.toString(16)
if (void 0 !== parentReference) {
key = writtenObjects.get(value);
if (void 0 !== key) return key;
key = JSON.stringify(
{ id: parentReference.id, bound: parentReference.bound },
resolveToJSON
);
null === formData && (formData = new FormData());
parentReference = nextPartId++;
formData.set(formFieldPrefix + parentReference, key);
key = "$h" + parentReference.toString(16);
writtenObjects.set(value, key);
return key;
}
if (
void 0 !== temporaryReferences &&
-1 === key.indexOf(":") &&
......@@ -731,10 +734,17 @@ function waitForReference(
value.then(fulfill, reject);
return;
}
value = value[path[i]];
var name = path[i];
if (
"object" === typeof value &&
null !== value &&
hasOwnProperty.call(value, name)
)
value = value[name];
else throw Error("Invalid reference.");
}
i = map(response, value, parentObject, key);
parentObject[key] = i;
"__proto__" !== key && (parentObject[key] = i);
"" === key && null === handler.value && (handler.value = i);
if (
parentObject[0] === REACT_ELEMENT_TYPE &&
......@@ -816,7 +826,7 @@ function loadServerReference(response, metaData, parentObject, key) {
resolvedValue = resolvedValue.bind.apply(resolvedValue, boundArgs);
}
registerBoundServerReference(resolvedValue, metaData.id, metaData.bound);
parentObject[key] = resolvedValue;
"__proto__" !== key && (parentObject[key] = resolvedValue);
"" === key && null === handler.value && (handler.value = resolvedValue);
if (
parentObject[0] === REACT_ELEMENT_TYPE &&
......@@ -1133,8 +1143,8 @@ function startReadableStream(response, id, type) {
(previousBlockedChunk = chunk));
} else {
chunk = previousBlockedChunk;
var chunk$52 = createPendingChunk(response);
chunk$52.then(
var chunk$53 = createPendingChunk(response);
chunk$53.then(
function (v) {
return controller.enqueue(v);
},
......@@ -1142,10 +1152,10 @@ function startReadableStream(response, id, type) {
return controller.error(e);
}
);
previousBlockedChunk = chunk$52;
previousBlockedChunk = chunk$53;
chunk.then(function () {
previousBlockedChunk === chunk$52 && (previousBlockedChunk = null);
resolveModelChunk(chunk$52, json);
previousBlockedChunk === chunk$53 && (previousBlockedChunk = null);
resolveModelChunk(chunk$53, json);
});
}
},
......@@ -1280,8 +1290,8 @@ function mergeBuffer(buffer, lastChunk) {
for (var l = buffer.length, byteLength = lastChunk.length, i = 0; i < l; i++)
byteLength += buffer[i].byteLength;
byteLength = new Uint8Array(byteLength);
for (var i$53 = (i = 0); i$53 < l; i$53++) {
var chunk = buffer[i$53];
for (var i$54 = (i = 0); i$54 < l; i$54++) {
var chunk = buffer[i$54];
byteLength.set(chunk, i);
i += chunk.byteLength;
}
......@@ -1460,42 +1470,44 @@ function processFullBinaryRow(response, id, tag, buffer, chunk) {
}
function createFromJSONCallback(response) {
return function (key, value) {
if ("string" === typeof value)
return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) {
if (value[0] === REACT_ELEMENT_TYPE) {
if (
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
if ("__proto__" !== key) {
if ("string" === typeof value)
return parseModelString(response, this, key, value);
if ("object" === typeof value && null !== value) {
if (value[0] === REACT_ELEMENT_TYPE) {
if (
((value = initializingHandler),
(initializingHandler = value.parent),
value.errored)
((key = {
$$typeof: REACT_ELEMENT_TYPE,
type: value[1],
key: value[2],
ref: null,
props: value[3]
}),
null !== initializingHandler)
)
(key = new ReactPromise("rejected", null, value.value, response)),
(key = createLazyChunkWrapper(key));
else if (0 < value.deps) {
var blockedChunk = new ReactPromise(
"blocked",
null,
null,
response
);
value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
if (
((value = initializingHandler),
(initializingHandler = value.parent),
value.errored)
)
(key = new ReactPromise("rejected", null, value.value, response)),
(key = createLazyChunkWrapper(key));
else if (0 < value.deps) {
var blockedChunk = new ReactPromise(
"blocked",
null,
null,
response
);
value.value = key;
value.chunk = blockedChunk;
key = createLazyChunkWrapper(blockedChunk);
}
} else key = value;
return key;
}
return value;
}
return value;
};
}
function createResponseFromOptions(options) {
......
......@@ -48,7 +48,7 @@
"neo-async": "^2.6.1"
},
"peerDependencies": {
"react": "19.2.0-canary-5e960585-20251211",
"react-dom": "19.2.0-canary-5e960585-20251211"
"react": "19.2.0-canary-c5586591-20260123",
"react-dom": "19.2.0-canary-c5586591-20260123"
}
}
\ No newline at end of file
......@@ -33,8 +33,9 @@ function _arrayLikeToArray(arr, len) {
return arr2;
}
function _createForOfIteratorHelper(o, allowArrayLike) {
var it;
if ("undefined" === typeof Symbol || null == o[Symbol.iterator]) {
var it =
("undefined" !== typeof Symbol && o[Symbol.iterator]) || o["@@iterator"];
if (!it) {
if (
Array.isArray(o) ||
(it = _unsupportedIterableToArray(o)) ||
......@@ -63,7 +64,7 @@ function _createForOfIteratorHelper(o, allowArrayLike) {
err;
return {
s: function () {
it = o[Symbol.iterator]();
it = it.call(o);
},
n: function () {
var step = it.next();
......
......@@ -64,8 +64,8 @@
"webpack-sources": "^3.2.0"
},
"peerDependencies": {
"react": "0.0.0-experimental-5e960585-20251211",
"react-dom": "0.0.0-experimental-5e960585-20251211",
"react": "0.0.0-experimental-c5586591-20260123",
"react-dom": "0.0.0-experimental-c5586591-20260123",
"webpack": "^5.59.0"
}
}
\ No newline at end of file
......@@ -33,8 +33,9 @@ function _arrayLikeToArray(arr, len) {
return arr2;
}
function _createForOfIteratorHelper(o, allowArrayLike) {
var it;
if ("undefined" === typeof Symbol || null == o[Symbol.iterator]) {
var it =
("undefined" !== typeof Symbol && o[Symbol.iterator]) || o["@@iterator"];
if (!it) {
if (
Array.isArray(o) ||
(it = _unsupportedIterableToArray(o)) ||
......@@ -63,7 +64,7 @@ function _createForOfIteratorHelper(o, allowArrayLike) {
err;
return {
s: function () {
it = o[Symbol.iterator]();
it = it.call(o);
},
n: function () {
var step = it.next();
......
......@@ -64,8 +64,8 @@
"webpack-sources": "^3.2.0"
},
"peerDependencies": {
"react": "19.2.0-canary-5e960585-20251211",
"react-dom": "19.2.0-canary-5e960585-20251211",
"react": "19.2.0-canary-c5586591-20260123",
"react-dom": "19.2.0-canary-c5586591-20260123",
"webpack": "^5.59.0"
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment