http: destroy the socket on parse error

Destroy the socket if the `'clientError'` event is emitted and there is no listener for it. Fixes: #24586 PR-URL: #24757 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
nodejs · Nov 30, 2018 · 1f8787c32df9219e3a3ef9abe43206ffb1415e99 · 1f8787c
1 parent 997c0e0
commit 1f8787c32df9219e3a3ef9abe43206ffb1415e99
Unified Split

Showing with 46 additions and 2 deletions.

+1 −2 lib/_http_server.js

+45 −0 test/parallel/test-http-server-destroy-socket-on-client-error.js
diff --git 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
@@ -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();
+  
+  }));
+  
+});