-
Notifications
You must be signed in to change notification settings - Fork 30.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
https: evict cached sessions on error
Instead of using the same session over and over, evict it when the socket emits error. This could be used as a mitigation of #3692, until OpenSSL fix will be merged/released. See: #3692 PR-URL: #4982 Reviewed-By: Evan Lucas <evanlucas@me.com> Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
- Loading branch information
Showing
2 changed files
with
104 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
'use strict'; | ||
|
||
const common = require('../common'); | ||
|
||
if (!common.hasCrypto) { | ||
console.log('1..0 # Skipped: missing crypto'); | ||
return; | ||
} | ||
|
||
const assert = require('assert'); | ||
const https = require('https'); | ||
const fs = require('fs'); | ||
const constants = require('constants'); | ||
|
||
const options = { | ||
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'), | ||
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'), | ||
secureOptions: constants.SSL_OP_NO_TICKET | ||
}; | ||
|
||
// Create TLS1.2 server | ||
https.createServer(options, function(req, res) { | ||
res.end('ohai'); | ||
}).listen(common.PORT, function() { | ||
first(this); | ||
}); | ||
|
||
// Do request and let agent cache the session | ||
function first(server) { | ||
const req = https.request({ | ||
port: common.PORT, | ||
rejectUnauthorized: false | ||
}, function(res) { | ||
res.resume(); | ||
|
||
server.close(function() { | ||
faultyServer(); | ||
}); | ||
}); | ||
req.end(); | ||
} | ||
|
||
// Create TLS1 server | ||
function faultyServer() { | ||
options.secureProtocol = 'TLSv1_method'; | ||
https.createServer(options, function(req, res) { | ||
res.end('hello faulty'); | ||
}).listen(common.PORT, function() { | ||
second(this); | ||
}); | ||
} | ||
|
||
// Attempt to request using cached session | ||
function second(server, session) { | ||
const req = https.request({ | ||
port: common.PORT, | ||
rejectUnauthorized: false | ||
}, function(res) { | ||
res.resume(); | ||
}); | ||
|
||
// Let it fail | ||
req.on('error', common.mustCall(function(err) { | ||
assert(/wrong version number/.test(err.message)); | ||
|
||
req.on('close', function() { | ||
third(server); | ||
}); | ||
})); | ||
req.end(); | ||
} | ||
|
||
// Try on more time - session should be evicted! | ||
function third(server) { | ||
const req = https.request({ | ||
port: common.PORT, | ||
rejectUnauthorized: false | ||
}, function(res) { | ||
res.resume(); | ||
assert(!req.socket.isSessionReused()); | ||
server.close(); | ||
}); | ||
req.on('error', function(err) { | ||
// never called | ||
assert(false); | ||
}); | ||
req.end(); | ||
} |
165b33f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will this be backported into 4.2?
165b33f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep.
165b33f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
165b33f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand how the first request put any session in the cache, since server is configured with
secureOptions: constants.SSL_OP_NO_TICKET
.I'm reading this test because it fails with #8491
165b33f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kapouer there are two types of sessions, old SSL sessions and new TLS tickets. That flag disables the latter ones so that the test could use first ones exclusively.