Skip to content

http2: add maxHeaderSize option to http2 #33636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
preyunk wants to merge 7 commits into from
Closed

http2: add maxHeaderSize option to http2 #33636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
984132d
http2: add maxHeaderSize option to http2
preyunk May 29, 2020
3ba02da
test: add tests for maxHeaderSize setting in http2
preyunk May 29, 2020
205f38a
http2: added more tests for maxHeaderSize
preyunk May 29, 2020
2f3782c
http2: fixed linting issues
preyunk May 29, 2020
5857ca5
http2: fixed failing tests
preyunk May 30, 2020
8f6c4aa
http2: added doc for maxHeaderSize
preyunk May 31, 2020
2a506c8
http2: maxHeaderSize overwrites maxHeaderListSize
preyunk Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
http2: added more tests for maxHeaderSize 
Refs: #33636
  • Loading branch information
@preyunk
preyunk committed May 29, 2020
commit 205f38ab750f9e76afe9fe636aad90ecbe3ef0d5
15 changes: 5 additions & 10 deletions lib/internal/http2/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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
);
}
Comment thread
himself65 marked this conversation as resolved.
settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE] =
settings.maxHeaderListSize !== undefined ?
Expand Down
2 changes: 2 additions & 0 deletions test/parallel/test-http2-client-settings-before-connect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
5 changes: 4 additions & 1 deletion test/parallel/test-http2-session-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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];
Expand Down
5 changes: 4 additions & 1 deletion test/parallel/test-http2-too-large-headers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Comment thread
himself65 marked this conversation as resolved.
Outdated
server = http2.createServer({ settings: {maxHeaderSize: 100 } });
server.on('stream', common.mustNotCall());

server.listen(0, common.mustCall(() => {
Expand Down