Skip to content

Commit

Permalink
https: support disabling session caching
Browse files Browse the repository at this point in the history
Zero value of `maxCachedSessions` should disable TLS session caching in
`https.Agent`

PR-URL: #4252
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
  • Loading branch information
indutny committed Dec 12, 2015
1 parent f050cab commit acef181
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/https.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ Agent.prototype._getSession = function _getSession(key) {
};

Agent.prototype._cacheSession = function _cacheSession(key, session) {
// Cache is disabled
if (this.maxCachedSessions === 0)
return;

// Fast case - update existing entry
if (this._sessionCache.map[key]) {
this._sessionCache.map[key] = session;
Expand Down
60 changes: 60 additions & 0 deletions test/parallel/test-https-agent-disable-session-reuse.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
'use strict';
const common = require('../common');
const assert = require('assert');

if (!common.hasCrypto) {
console.log('1..0 # Skipped: missing crypto');
return;
}

const TOTAL_REQS = 2;

const https = require('https');
const crypto = require('crypto');

const fs = require('fs');

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

const clientSessions = [];
var serverRequests = 0;

const agent = new https.Agent({
maxCachedSessions: 0
});

const server = https.createServer(options, function(req, res) {
serverRequests++;
res.end('ok');
}).listen(common.PORT, function() {
var waiting = TOTAL_REQS;
function request() {
const options = {
agent: agent,
port: common.PORT,
rejectUnauthorized: false
};

https.request(options, function(res) {
clientSessions.push(res.socket.getSession());

res.resume();
res.on('end', function() {
if (--waiting !== 0)
return request();
server.close();
});
}).end();
}
request();
});

process.on('exit', function() {
assert.equal(serverRequests, TOTAL_REQS);
assert.equal(clientSessions.length, TOTAL_REQS);
assert.notEqual(clientSessions[0].toString('hex'),
clientSessions[1].toString('hex'));
});

0 comments on commit acef181

Please sign in to comment.