From c1da968f82936ef9ddcc1c9627de97ae0e8b67dc Mon Sep 17 00:00:00 2001
From: Luigi Pinca <luigipinca@gmail.com>
Date: Fri, 30 Nov 2018 19:27:26 +0100
Subject: [PATCH] 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>
---
 lib/_http_server.js                           |  3 +-
 ...p-server-destroy-socket-on-client-error.js | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 test/parallel/test-http-server-destroy-socket-on-client-error.js

diff --git a/lib/_http_server.js b/lib/_http_server.js
index c171b1d3e78a41..cb62578f564a93 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -512,8 +512,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 00000000000000..9d51364183385b
--- /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();
+  }));
+});