http: remove 'data' and 'end' listener if client parser error · nodejs/node@555af5b · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 638
• Pull requests 748
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 555af5b

Browse filesBrowse the repository at this point in the historyBrowse files

mcollina

authored and

targos

committed

http: remove 'data' and 'end' listener if client parser error

There might be the case of some more data coming through after the parser has returned an error and we have destroyed the socket. We should also be removing the 'data' event handler. Fixes: #40242 PR-URL: #40244 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: James M Snell <jasnell@gmail.com>

1 parent 383dbe9 commit 555af5b
Copy full SHA for 555af5b

2 files changed

+6-1Lines changed: 6 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • _http_client.js
• test/parallel
  • test-http-client-parse-error.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/_http_client.js‎

Copy file name to clipboardExpand all lines: lib/_http_client.js

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -489,6 +489,8 @@ function socketOnData(d) {
489	489	prepareError(ret, parser, d);
490	490	debug('parse error', ret);
491	491	freeParser(parser, req, socket);
	492	+ socket.removeListener('data', socketOnData);
	493	+ socket.removeListener('end', socketOnEnd);
492	494	socket.destroy();
493	495	req.socket._hadError = true;
494	496	req.emit('error', ret);

Collapse file

‎test/parallel/test-http-client-parse-error.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-client-parse-error.js

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -23,6 +23,7 @@
23	23	const common = require('../common');
24	24	const http = require('http');
25	25	const net = require('net');
	26	+ const assert = require('assert');
26	27	const Countdown = require('../common/countdown');
27	28
28	29	const countdown = new Countdown(2, () => server.close());
@@ -38,10 +39,12 @@ const server =
38	39
39	40	server.listen(0, common.mustCall(() => {
40	41	for (let i = 0; i < 2; i++) {
41		- http.get({
	42	+ const req = http.get({
42	43	port: server.address().port,
43	44	path: '/'
44	45	}).on('error', common.mustCall((e) => {
	46	+ assert.strictEqual(req.socket.listenerCount('data'), 0);
	47	+ assert.strictEqual(req.socket.listenerCount('end'), 1);
45	48	common.expectsError({
46	49	code: 'HPE_INVALID_CONSTANT',
47	50	message: 'Parse Error: Expected HTTP/'

0 commit comments

Comments

0 (0)