http2: added more tests for maxHeaderSize

Refs: #33636
nodejs · May 29, 2020 · 205f38a · 205f38a
1 parent 3ba02da
commit 205f38a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js
@@ -297,10 +297,6 @@ function getDefaultSettings() {
     holder.maxHeaderListSize = holder.maxHeaderSize =
       settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE];
   }
-  if ((flags & (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) ===
-      (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) {
-    holder.maxHeaderSize = settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE];
-  }
 
   if ((flags & (1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) ===
       (1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) {
@@ -357,12 +353,11 @@ function updateSettingsBuffer(settings) {
   if (typeof settings.maxHeaderListSize === 'number' ||
       typeof settings.maxHeaderSize === 'number') {
     flags |= (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE);
-    if (settings.maxHeaderSize && settings.maxHeaderListSize) {
-      if (settings.maxHeaderSize !== settings.maxHeaderListSize) {
-        throw new ERR_HTTP2_INVALID_SETTING_VALUE.RangeError(
-          'maxHeaderListSize', settings.maxHeaderListSize
-        );
-      }
+    if(settings.maxHeaderListSize !== undefined &&
+      (settings.maxHeaderListSize !== maxHeaderSize)) {
+      throw new ERR_HTTP2_INVALID_SETTING_VALUE.RangeError(
+        'maxHeaderListSize', settings.maxHeaderListSize
+      );
     }
     settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE] =
       settings.maxHeaderListSize !== undefined ?

diff --git a/test/parallel/test-http2-client-settings-before-connect.js b/test/parallel/test-http2-client-settings-before-connect.js
@@ -32,6 +32,8 @@ server.listen(0, common.mustCall(() => {
     ['maxConcurrentStreams', 2 ** 32, RangeError],
     ['maxHeaderListSize', -1, RangeError],
     ['maxHeaderListSize', 2 ** 32, RangeError],
+    ['maxHeaderSize', -1, RangeError],
+    ['maxHeaderSize', 2 ** 32, RangeError],
     ['enablePush', 'a', TypeError],
     ['enablePush', 1, TypeError],
     ['enablePush', 0, TypeError],

diff --git a/test/parallel/test-http2-session-settings.js b/test/parallel/test-http2-session-settings.js
@@ -19,6 +19,7 @@ server.on(
       assert.strictEqual(typeof settings.maxFrameSize, 'number');
       assert.strictEqual(typeof settings.maxConcurrentStreams, 'number');
       assert.strictEqual(typeof settings.maxHeaderListSize, 'number');
+      assert.strictEqual(typeof settings.maxHeaderSize, 'number');
     };
 
     const localSettings = stream.session.localSettings;
@@ -100,7 +101,9 @@ server.listen(
         ['maxFrameSize', 16383],
         ['maxFrameSize', 2 ** 24],
         ['maxHeaderListSize', -1],
-        ['maxHeaderListSize', 2 ** 32]
+        ['maxHeaderListSize', 2 ** 32],
+        ['maxHeaderSize', -1],
+        ['maxHeaderSize', 2 ** 32]
       ].forEach((i) => {
         const settings = {};
         settings[i[0]] = i[1];

diff --git a/test/parallel/test-http2-too-large-headers.js b/test/parallel/test-http2-too-large-headers.js
@@ -9,7 +9,10 @@ const {
   NGHTTP2_ENHANCE_YOUR_CALM
 } = http2.constants;
 
-const server = http2.createServer({ settings: { maxHeaderListSize: 100 } });
+let server = http2.createServer({ settings: { maxHeaderListSize: 100 } });
+server.on('stream', common.mustNotCall());
+
+server = http2.createServer({ settings: {maxHeaderSize: 100 } });
 server.on('stream', common.mustNotCall());
 
 server.listen(0, common.mustCall(() => {