Skip to content

Commit

Permalink
http: destroy the socket on parse error
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
lpinca authored and MylesBorins committed Dec 5, 2018
1 parent 4035ca1 commit fb99a4e
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 2 deletions.
3 changes: 1 addition & 2 deletions lib/_http_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -510,8 +510,7 @@ function socketOnError(e) {

if (!this.server.emit('clientError', e, this)) {
if (this.writable) {
this.end(badRequestResponse);
return;
this.write(badRequestResponse);
}
this.destroy(e);
}
Expand Down
45 changes: 45 additions & 0 deletions test/parallel/test-http-server-destroy-socket-on-client-error.js
Original file line number Diff line number Diff line change
@@ -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();
}));
});

0 comments on commit fb99a4e

Please sign in to comment.