Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2021-03-23 17:44:21 +0300
committerRuy Adorno <ruyadorno@hotmail.com>2021-03-30 03:17:18 +0300
commita5bf7de6eb1acd1d1c10a4c8ad1331626ee23703 (patch)
treed7acbe720b51bf1b355b0291ab870694dd16db6b
parent364c8ac40d7d16440a7b737a74500ae22cf4eb62 (diff)
http2: fix setting options before handle exists
Currently, when a JS Http2Session object is created, we have to handle the situation in which the native object corresponding to it does not yet exist. As part of that, we create a typed array for storing options that are passed through the `AliasedStruct` mechanism, and up until now, we copied that typed array over the native one once the native one was available. This was not good, because it was overwriting the defaults that were set during construction of the native typed array with zeroes. In order to fix this, create a wrapper for the JS-created typed array that keeps track of which fields were changed, which enables us to only overwrite fields that were intentionally changed on the JS side. It is surprising that this behavior was not tested (which is, guessing from the commit history around these features, my fault). The subseqeuent commit introduces a test that would fail without this change. PR-URL: https://github.com/nodejs/node/pull/37875 Fixes: https://github.com/nodejs/node/issues/37849 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
-rw-r--r--lib/internal/http2/core.js54
1 files changed, 46 insertions, 8 deletions
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index bb1cc9e6c56..bfdb45ab7ba 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -19,14 +19,16 @@ const {
Promise,
PromisePrototypeCatch,
ReflectApply,
+ ReflectGet,
ReflectGetPrototypeOf,
+ ReflectSet,
RegExpPrototypeTest,
SafeArrayIterator,
SafeMap,
SafeSet,
StringPrototypeSlice,
Symbol,
- TypedArrayPrototypeSet,
+ TypedArrayPrototypeGetLength,
Uint32Array,
Uint8Array,
} = primordials;
@@ -959,6 +961,36 @@ const validateSettings = hideStackFrames((settings) => {
}
});
+// Wrap a typed array in a proxy, and allow selectively copying the entries
+// that have explicitly been set to another typed array.
+function trackAssignmentsTypedArray(typedArray) {
+ const typedArrayLength = TypedArrayPrototypeGetLength(typedArray);
+ const modifiedEntries = new Uint8Array(typedArrayLength);
+
+ function copyAssigned(target) {
+ for (let i = 0; i < typedArrayLength; i++) {
+ if (modifiedEntries[i]) {
+ target[i] = typedArray[i];
+ }
+ }
+ }
+
+ return new Proxy(typedArray, {
+ get(obj, prop, receiver) {
+ if (prop === 'copyAssigned') {
+ return copyAssigned;
+ }
+ return ReflectGet(obj, prop, receiver);
+ },
+ set(obj, prop, value) {
+ if (`${+prop}` === prop) {
+ modifiedEntries[prop] = 1;
+ }
+ return ReflectSet(obj, prop, value);
+ }
+ });
+}
+
// Creates the internal binding.Http2Session handle for an Http2Session
// instance. This occurs only after the socket connection has been
// established. Note: the binding.Http2Session will take over ownership
@@ -989,10 +1021,13 @@ function setupHandle(socket, type, options) {
handle.consume(socket._handle);
this[kHandle] = handle;
- if (this[kNativeFields])
- TypedArrayPrototypeSet(handle.fields, this[kNativeFields]);
- else
- this[kNativeFields] = handle.fields;
+ if (this[kNativeFields]) {
+ // If some options have already been set before the handle existed, copy
+ // those (and only those) that have manually been set over.
+ this[kNativeFields].copyAssigned(handle.fields);
+ }
+
+ this[kNativeFields] = handle.fields;
if (socket.encrypted) {
this[kAlpnProtocol] = socket.alpnProtocol;
@@ -1044,7 +1079,8 @@ function cleanupSession(session) {
session[kProxySocket] = undefined;
session[kSocket] = undefined;
session[kHandle] = undefined;
- session[kNativeFields] = new Uint8Array(kSessionUint8FieldCount);
+ session[kNativeFields] = trackAssignmentsTypedArray(
+ new Uint8Array(kSessionUint8FieldCount));
if (handle)
handle.ondone = null;
if (socket) {
@@ -1212,8 +1248,10 @@ class Http2Session extends EventEmitter {
setupFn();
}
- if (!this[kNativeFields])
- this[kNativeFields] = new Uint8Array(kSessionUint8FieldCount);
+ if (!this[kNativeFields]) {
+ this[kNativeFields] = trackAssignmentsTypedArray(
+ new Uint8Array(kSessionUint8FieldCount));
+ }
this.on('newListener', sessionListenerAdded);
this.on('removeListener', sessionListenerRemoved);