Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
https: fix memory leak with https.request()
If calling `https.request()` with `options.headers.host` defined
and `options.servername` undefined, `https.Agent.createSocket` mutates
connection `options` after `https.Agent.addRequest` has created empty
socket pool array with mismatching connection name. This results in two
socket pool arrays being created and only the last one gets eventually
deleted by `removeSocket` - causing a memory leak.

This commit fixes the leak by making sure that `addRequest` does the
same modifications to `options` object as the `createSocket`.

`createSocket` is intentionally left unmodified to prevent userland
regressions.

Test case included.

Fixes: #6687
  • Loading branch information
imyller committed Sep 20, 2016
commit 4d68ae2fa0a9afd54b62600373f8bf19782990dc
8 changes: 8 additions & 0 deletions lib/_http_agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@ Agent.prototype.addRequest = function(req, options) {
options = util._extend({}, options);
options = util._extend(options, this.options);

if (!options.servername) {
options.servername = options.host;
const hostHeader = req.getHeader('host');
if (hostHeader) {
options.servername = hostHeader.replace(/:.*$/, '');
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer just using hostHeader.slice() and hostHeader.indexOf(), but if others are not comfortable with that, at the very least the regex should be /:[\s\S]*$/ to match any character (including newlines).

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left the hostHeader cleanup intentionally unmodified to match the original feature implemented PR #1110

I did not want to fix two unrelated issues in single PR dedicated to memory leak.

}
}

var name = this.getName(options);
if (!this.sockets[name]) {
this.sockets[name] = [];
Expand Down
52 changes: 52 additions & 0 deletions test/parallel/test-https-agent-sockets-leak.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
'use strict';

const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const fs = require('fs');
const https = require('https');
const assert = require('assert');

const options = {
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'),
ca: fs.readFileSync(common.fixturesDir + '/keys/ca1-cert.pem')
};

const server = https.Server(options, common.mustCall((req, res) => {
res.writeHead(200);
res.end('https\n');
}));

const agent = new https.Agent({
keepAlive: false
});

server.listen(0, common.mustCall(() => {
https.get({
host: server.address().host,
port: server.address().port,
headers: {host: 'agent1'},
rejectUnauthorized: true,
ca: options.ca,
agent: agent
}, common.mustCall((res) => {
res.resume();
server.close();

// Only one entry should exist in agent.sockets pool
// If there are more entries in agent.sockets,
// removeSocket will not delete them resulting in a resource leak
assert.strictEqual(Object.keys(agent.sockets).length, 1);

res.req.on('close', common.mustCall(() => {
// To verify that no leaks occur, check that no entries
// exist in agent.sockets pool after both request and socket
// has been closed.
assert.strictEqual(Object.keys(agent.sockets).length, 0);
}));
}));
}));