Skip to content

Commit

Permalink
http: attach reused parser to correct domain
Browse files Browse the repository at this point in the history
Reused parsers can be attached to the domain that corresponds to the
active domain when the underlying socket was created, which is not
necessarily correct.

Instead, we attach parsers to the active domain if there is one when
they're reused from the pool.

Refs: nodejs/node#25456
  • Loading branch information
Julien Gilli committed Jan 11, 2019
1 parent 852d25b commit fdcb150
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 6 deletions.
9 changes: 3 additions & 6 deletions lib/_http_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -509,12 +509,6 @@ function parserOnIncomingClient(res, shouldKeepAlive) {
var socket = this.socket;
var req = socket._httpMessage;

// propagate "domain" setting...
if (req.domain && !res.domain) {
debug('setting "res.domain"');
res.domain = req.domain;
}

debug('AGENT incoming response!');

if (req.res) {
Expand Down Expand Up @@ -629,6 +623,9 @@ function tickOnSocket(req, socket) {
req.socket = socket;
req.connection = socket;
parser.reinitialize(HTTPParser.RESPONSE, parser[is_reused_symbol]);
if (process.domain) {
process.domain.add(parser);
}
parser.socket = socket;
parser.incoming = null;
parser.outgoing = req;
Expand Down
80 changes: 80 additions & 0 deletions test/parallel/test-http-parser-reuse-domain.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
'use strict';

const common = require('../common');
const domain = require('domain');
const http = require('http');

const agent = new http.Agent({
// keepAlive is important here so that the underlying socket of all requests
// is reused and tied to the same domain.
keepAlive: true
});

function performHttpRequest(opts, cb) {
const req = http.get({ port: server.address().port, agent }, (res) => {
// Consume the data from the response to make sure the 'end' event is
// emitted.
res.on('data', function noop() {});
res.on('end', () => {
if (opts.shouldThrow) {
throw new Error('boom');
} else {
cb();
}
});

res.on('error', (resErr) => {
process.exit(1);
});

}).on('error', (reqErr) => {
process.exit(1);
});

req.end();
}

function performHttpRequestInNewDomain(opts, cb) {
const d = domain.create();
d._id = opts.id;
d.run(() => {
performHttpRequest(opts, cb);
});

return d;
}

const server = http.createServer((req, res) => {
res.end();
});

server.listen(0, common.mustCall(function() {
const d1 = performHttpRequestInNewDomain({
shouldThrow: false
}, common.mustCall((firstReqErr) => {
// We want to schedule the second request on the next turn of the event
// loop so that the parser from the first request is actually reused.
setImmediate(common.mustCall(() => {
const d2 = performHttpRequestInNewDomain({
shouldThrow: true
}, (secondReqErr) => {
// Since this request throws before its callback has the chance
// to be called, we mark the test as failed if this callback is
// called.
process.exit(1);
});

// The second request throws when its response's end event is
// emitted. So we expect its domain to emit an error event.
d2.on('error', common.mustCall((d2err) => {
server.close();
}, 1));
}));
}));

d1.on('error', (d1err) => {
// d1 is the domain attached to the first request, which doesn't throw,
// so we don't expect its error handler to be called.
process.exit(1);
});
}));

0 comments on commit fdcb150

Please sign in to comment.