Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6ee2578

Browse filesBrowse files
preyunkBethGriggs
preyunk
authored and
BethGriggs
committed
http2: add maxHeaderSize option to http2
add maxHeaderSize to http2 as an alias for maxHeaderListSize. Fixes: #33517 PR-URL: #33636 Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Pranshu Srivastava <rexagod@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent b933eef commit 6ee2578
Copy full SHA for 6ee2578

File tree

Expand file treeCollapse file tree

7 files changed

+54
-26
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

7 files changed

+54
-26
lines changed
Open diff view settings
Collapse file

‎doc/api/http2.md‎

Copy file name to clipboardExpand all lines: doc/api/http2.md
+1Lines changed: 1 addition & 0 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -2570,6 +2570,7 @@ properties.
25702570
* `maxHeaderListSize` {number} Specifies the maximum size (uncompressed octets)
25712571
of header list that will be accepted. The minimum allowed value is 0. The
25722572
maximum allowed value is 2<sup>32</sup>-1. **Default:** `65535`.
2573+
* `maxHeaderSize` {number} Alias for `maxHeaderListSize`.
25732574
* `enableConnectProtocol`{boolean} Specifies `true` if the "Extended Connect
25742575
Protocol" defined by [RFC 8441][] is to be enabled. This setting is only
25752576
meaningful if sent by the server. Once the `enableConnectProtocol` setting
Collapse file

‎lib/internal/http2/core.js‎

Copy file name to clipboardExpand all lines: lib/internal/http2/core.js
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,9 @@ const validateSettings = hideStackFrames((settings) => {
908908
assertWithinRange('maxHeaderListSize',
909909
settings.maxHeaderListSize,
910910
0, kMaxInt);
911+
assertWithinRange('maxHeaderSize',
912+
settings.maxHeaderSize,
913+
0, kMaxInt);
911914
if (settings.enablePush !== undefined &&
912915
typeof settings.enablePush !== 'boolean') {
913916
throw new ERR_HTTP2_INVALID_SETTING_VALUE('enablePush',
@@ -3102,7 +3105,7 @@ function getUnpackedSettings(buf, options = {}) {
31023105
settings.maxFrameSize = value;
31033106
break;
31043107
case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
3105-
settings.maxHeaderListSize = value;
3108+
settings.maxHeaderListSize = settings.maxHeaderSize = value;
31063109
break;
31073110
case NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL:
31083111
settings.enableConnectProtocol = value !== 0;
Collapse file

‎lib/internal/http2/util.js‎

Copy file name to clipboardExpand all lines: lib/internal/http2/util.js
+15-4Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ function getDefaultSettings() {
300300

301301
if ((flags & (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) ===
302302
(1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) {
303-
holder.maxHeaderListSize =
303+
holder.maxHeaderListSize = holder.maxHeaderSize =
304304
settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE];
305305
}
306306

@@ -328,6 +328,7 @@ function getSettings(session, remote) {
328328
maxFrameSize: settingsBuffer[IDX_SETTINGS_MAX_FRAME_SIZE],
329329
maxConcurrentStreams: settingsBuffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS],
330330
maxHeaderListSize: settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE],
331+
maxHeaderSize: settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE],
331332
enableConnectProtocol:
332333
!!settingsBuffer[IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL]
333334
};
@@ -355,10 +356,20 @@ function updateSettingsBuffer(settings) {
355356
settingsBuffer[IDX_SETTINGS_MAX_FRAME_SIZE] =
356357
settings.maxFrameSize;
357358
}
358-
if (typeof settings.maxHeaderListSize === 'number') {
359+
if (typeof settings.maxHeaderListSize === 'number' ||
360+
typeof settings.maxHeaderSize === 'number') {
359361
flags |= (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE);
360-
settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE] =
361-
settings.maxHeaderListSize;
362+
if (settings.maxHeaderSize !== undefined &&
363+
(settings.maxHeaderSize !== settings.maxHeaderListSize)) {
364+
process.emitWarning(
365+
'settings.maxHeaderSize overwrite settings.maxHeaderListSize'
366+
);
367+
settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE] =
368+
settings.maxHeaderSize;
369+
} else {
370+
settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE] =
371+
settings.maxHeaderListSize;
372+
}
362373
}
363374
if (typeof settings.enablePush === 'boolean') {
364375
flags |= (1 << IDX_SETTINGS_ENABLE_PUSH);
Collapse file

‎test/parallel/test-http2-client-settings-before-connect.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http2-client-settings-before-connect.js
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ server.listen(0, common.mustCall(() => {
3232
['maxConcurrentStreams', 2 ** 32, RangeError],
3333
['maxHeaderListSize', -1, RangeError],
3434
['maxHeaderListSize', 2 ** 32, RangeError],
35+
['maxHeaderSize', -1, RangeError],
36+
['maxHeaderSize', 2 ** 32, RangeError],
3537
['enablePush', 'a', TypeError],
3638
['enablePush', 1, TypeError],
3739
['enablePush', 0, TypeError],
Collapse file

‎test/parallel/test-http2-getpackedsettings.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http2-getpackedsettings.js
+8-2Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ assert.deepStrictEqual(val, check);
2626
['maxConcurrentStreams', 0],
2727
['maxConcurrentStreams', 2 ** 31 - 1],
2828
['maxHeaderListSize', 0],
29-
['maxHeaderListSize', 2 ** 32 - 1]
29+
['maxHeaderListSize', 2 ** 32 - 1],
30+
['maxHeaderSize', 0],
31+
['maxHeaderSize', 2 ** 32 - 1]
3032
].forEach((i) => {
3133
// Valid options should not throw.
3234
http2.getPackedSettings({ [i[0]]: i[1] });
@@ -45,7 +47,9 @@ http2.getPackedSettings({ enablePush: false });
4547
['maxConcurrentStreams', -1],
4648
['maxConcurrentStreams', 2 ** 32],
4749
['maxHeaderListSize', -1],
48-
['maxHeaderListSize', 2 ** 32]
50+
['maxHeaderListSize', 2 ** 32],
51+
['maxHeaderSize', -1],
52+
['maxHeaderSize', 2 ** 32]
4953
].forEach((i) => {
5054
assert.throws(() => {
5155
http2.getPackedSettings({ [i[0]]: i[1] });
@@ -97,6 +101,7 @@ http2.getPackedSettings({ enablePush: false });
97101
maxFrameSize: 20000,
98102
maxConcurrentStreams: 200,
99103
maxHeaderListSize: 100,
104+
maxHeaderSize: 100,
100105
enablePush: true,
101106
enableConnectProtocol: false,
102107
foo: 'ignored'
@@ -149,6 +154,7 @@ http2.getPackedSettings({ enablePush: false });
149154
assert.strictEqual(settings.maxFrameSize, 20000);
150155
assert.strictEqual(settings.maxConcurrentStreams, 200);
151156
assert.strictEqual(settings.maxHeaderListSize, 100);
157+
assert.strictEqual(settings.maxHeaderSize, 100);
152158
assert.strictEqual(settings.enablePush, true);
153159
assert.strictEqual(settings.enableConnectProtocol, false);
154160
}
Collapse file

‎test/parallel/test-http2-session-settings.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http2-session-settings.js
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ server.on(
1919
assert.strictEqual(typeof settings.maxFrameSize, 'number');
2020
assert.strictEqual(typeof settings.maxConcurrentStreams, 'number');
2121
assert.strictEqual(typeof settings.maxHeaderListSize, 'number');
22+
assert.strictEqual(typeof settings.maxHeaderSize, 'number');
2223
};
2324

2425
const localSettings = stream.session.localSettings;
@@ -100,7 +101,9 @@ server.listen(
100101
['maxFrameSize', 16383],
101102
['maxFrameSize', 2 ** 24],
102103
['maxHeaderListSize', -1],
103-
['maxHeaderListSize', 2 ** 32]
104+
['maxHeaderListSize', 2 ** 32],
105+
['maxHeaderSize', -1],
106+
['maxHeaderSize', 2 ** 32]
104107
].forEach((i) => {
105108
const settings = {};
106109
settings[i[0]] = i[1];
Collapse file

‎test/parallel/test-http2-too-large-headers.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http2-too-large-headers.js
+20-18Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,26 @@ const {
99
NGHTTP2_ENHANCE_YOUR_CALM
1010
} = http2.constants;
1111

12-
const server = http2.createServer({ settings: { maxHeaderListSize: 100 } });
13-
server.on('stream', common.mustNotCall());
12+
for (const prototype of ['maxHeaderListSize', 'maxHeaderSize']) {
13+
const server = http2.createServer({ settings: { [prototype]: 100 } });
14+
server.on('stream', common.mustNotCall());
1415

15-
server.listen(0, common.mustCall(() => {
16-
const client = http2.connect(`http://localhost:${server.address().port}`);
16+
server.listen(0, common.mustCall(() => {
17+
const client = http2.connect(`http://localhost:${server.address().port}`);
1718

18-
client.on('remoteSettings', () => {
19-
const req = client.request({ 'foo': 'a'.repeat(1000) });
20-
req.on('error', common.expectsError({
21-
code: 'ERR_HTTP2_STREAM_ERROR',
22-
name: 'Error',
23-
message: 'Stream closed with error code NGHTTP2_ENHANCE_YOUR_CALM'
24-
}));
25-
req.on('close', common.mustCall(() => {
26-
assert.strictEqual(req.rstCode, NGHTTP2_ENHANCE_YOUR_CALM);
27-
server.close();
28-
client.close();
29-
}));
30-
});
19+
client.on('remoteSettings', () => {
20+
const req = client.request({ 'foo': 'a'.repeat(1000) });
21+
req.on('error', common.expectsError({
22+
code: 'ERR_HTTP2_STREAM_ERROR',
23+
name: 'Error',
24+
message: 'Stream closed with error code NGHTTP2_ENHANCE_YOUR_CALM'
25+
}));
26+
req.on('close', common.mustCall(() => {
27+
assert.strictEqual(req.rstCode, NGHTTP2_ENHANCE_YOUR_CALM);
28+
server.close();
29+
client.close();
30+
}));
31+
});
3132

32-
}));
33+
}));
34+
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.