Skip to content

http2: check for valid headers #33193

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
rexagod wants to merge 6 commits into from
Closed

http2: check for valid headers #33193

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
388915a
http2: header field valid checks
rexagod May 1, 2020
d092e96
fixup: remove unnecessary error
rexagod May 2, 2020
a0575e0
test: add checks for writeHead
rexagod May 10, 2020
502c549
fixup: lint
rexagod May 10, 2020
49f5092
Update lib/internal/http2/core.js
rexagod May 23, 2020
32689ba
fixup: review suggestions
rexagod May 23, 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
fixup: remove unnecessary error
  • Loading branch information
@rexagod
rexagod committed May 2, 2020
commit d092e96b9f5eb5b53bc272eff2ac3bce8a3e5b76
5 changes: 0 additions & 5 deletions doc/api/errors.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,11 +1047,6 @@ An invalid value has been specified for an HTTP/2 setting.

An operation was performed on a stream that had already been destroyed.

<a id="ERR_HTTP2_INVALID_TOKEN"></a>
### `ERR_HTTP2_INVALID_TOKEN`

An invalid HTTP/2 header was specified.

<a id="ERR_HTTP2_MAX_PENDING_SETTINGS_ACK"></a>
### `ERR_HTTP2_MAX_PENDING_SETTINGS_ACK`

Expand Down
2 changes: 0 additions & 2 deletions lib/internal/errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,8 +861,6 @@ E('ERR_HTTP2_INVALID_SETTING_VALUE',
return `Invalid value for setting "${name}": ${actual}`;
}, TypeError, RangeError);
E('ERR_HTTP2_INVALID_STREAM', 'The stream has been destroyed', Error);
E('ERR_HTTP2_INVALID_TOKEN', '%s must be a valid HTTP2 token ["%s"]',
TypeError);
E('ERR_HTTP2_MAX_PENDING_SETTINGS_ACK',
'Maximum number of pending settings acknowledgements', Error);
E('ERR_HTTP2_NESTED_PUSH',
Expand Down
3 changes: 1 addition & 2 deletions lib/internal/http2/compat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const {
ERR_HTTP2_INFO_STATUS_NOT_ALLOWED,
ERR_HTTP2_INVALID_HEADER_VALUE,
ERR_HTTP2_INVALID_STREAM,
ERR_HTTP2_INVALID_TOKEN,
ERR_HTTP2_NO_SOCKET_MANIPULATION,
ERR_HTTP2_PSEUDOHEADER_NOT_ALLOWED,
ERR_HTTP2_STATUS_INVALID,
Expand Down Expand Up @@ -596,7 +595,7 @@ class Http2ServerResponse extends Stream {
if (name[0] === ':')
assertValidPseudoHeader(name);
else if (!checkIsHttpToken(name))
this.destroy(new ERR_HTTP2_INVALID_TOKEN('Header name', name));
this.destroy(new ERR_INVALID_HTTP_TOKEN('Header name', name));

this[kHeaders][name] = value;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/internal/http2/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ const {
ERR_HTTP2_INVALID_SESSION,
ERR_HTTP2_INVALID_SETTING_VALUE,
ERR_HTTP2_INVALID_STREAM,
ERR_HTTP2_INVALID_TOKEN,
ERR_HTTP2_MAX_PENDING_SETTINGS_ACK,
ERR_HTTP2_NESTED_PUSH,
ERR_HTTP2_NO_SOCKET_MANIPULATION,
Expand All @@ -92,6 +91,7 @@ const {
ERR_INVALID_ARG_TYPE,
ERR_INVALID_CALLBACK,
ERR_INVALID_CHAR,
ERR_INVALID_HTTP_TOKEN,
ERR_INVALID_OPT_VALUE,
ERR_OUT_OF_RANGE,
ERR_SOCKET_CLOSED
Expand Down Expand Up @@ -1631,7 +1631,7 @@ class ClientHttp2Session extends Http2Session {
if (i[0] === ':') {
assertValidPseudoHeader(i);
} else if (i && !checkIsHttpToken(i))
this.destroy(new ERR_HTTP2_INVALID_TOKEN('Header name', i));
this.destroy(new ERR_INVALID_HTTP_TOKEN('Header name', i));
}
Comment thread
rexagod marked this conversation as resolved.

assertIsObject(headers, 'headers');
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http2-invalidheaderfields-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ server1.listen(0, common.mustCall(() => {
const session = http2.connect(`http://localhost:${server1.address().port}`);
session.request({ 'no underscore': 123 });
session.on('error', common.mustCall((e) => {
assert.strictEqual(e.code, 'ERR_HTTP2_INVALID_TOKEN');
assert.strictEqual(e.code, 'ERR_INVALID_HTTP_TOKEN');
server1.close();
}));
}));
Expand Down