summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Pinca <luigipinca@gmail.com>2018-11-30 19:27:26 +0100
committerRuben Bridgewater <ruben@bridgewater.de>2018-12-05 20:07:12 +0100
commit1f8787c32df9219e3a3ef9abe43206ffb1415e99 (patch)
tree2268bf09786e7194c4bccd53ec57cb8c1725d1b9
parent997c0e05a49d00520eef8c41781b35cc240ca256 (diff)
downloadnode-new-1f8787c32df9219e3a3ef9abe43206ffb1415e99.tar.gz
http: destroy the socket on parse error
Destroy the socket if the `'clientError'` event is emitted and there is no listener for it. Fixes: https://github.com/nodejs/node/issues/24586 PR-URL: https://github.com/nodejs/node/pull/24757 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
-rw-r--r--lib/_http_server.js3
-rw-r--r--test/parallel/test-http-server-destroy-socket-on-client-error.js45
2 files changed, 46 insertions, 2 deletions
diff --git a/lib/_http_server.js b/lib/_http_server.js
index 8902c1f656..fec1b95052 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -509,8 +509,7 @@ function socketOnError(e) {
if (!this.server.emit('clientError', e, this)) {
if (this.writable) {
- this.end(badRequestResponse);
- return;
+ this.write(badRequestResponse);
}
this.destroy(e);
}
diff --git a/test/parallel/test-http-server-destroy-socket-on-client-error.js b/test/parallel/test-http-server-destroy-socket-on-client-error.js
new file mode 100644
index 0000000000..9d51364183
--- /dev/null
+++ b/test/parallel/test-http-server-destroy-socket-on-client-error.js
@@ -0,0 +1,45 @@
+'use strict';
+
+const { expectsError, mustCall } = require('../common');
+
+// Test that the request socket is destroyed if the `'clientError'` event is
+// emitted and there is no listener for it.
+
+const assert = require('assert');
+const { createServer } = require('http');
+const { createConnection } = require('net');
+
+const server = createServer();
+
+server.on('connection', mustCall((socket) => {
+ socket.on('error', expectsError({
+ type: Error,
+ message: 'Parse Error',
+ code: 'HPE_INVALID_METHOD',
+ bytesParsed: 0,
+ rawPacket: Buffer.from('FOO /\r\n')
+ }));
+}));
+
+server.listen(0, () => {
+ const chunks = [];
+ const socket = createConnection({
+ allowHalfOpen: true,
+ port: server.address().port
+ });
+
+ socket.on('connect', mustCall(() => {
+ socket.write('FOO /\r\n');
+ }));
+
+ socket.on('data', (chunk) => {
+ chunks.push(chunk);
+ });
+
+ socket.on('end', mustCall(() => {
+ const expected = Buffer.from('HTTP/1.1 400 Bad Request\r\n\r\n');
+ assert(Buffer.concat(chunks).equals(expected));
+
+ server.close();
+ }));
+});