1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fixup test-http2-create-client-secure-session

Browse Source 
General improvements to test and verify that a secureConnect
handler is present

PR-URL: https://github.com/nodejs/node/pull/17328
Fixes: https://github.com/nodejs/node/issues/15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>
This commit is contained in:
James M Snell 2017-11-26 11:40:50 -08:00
parent 1b99542ea4
commit 5fe111a1d5
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
test/parallel/test-http2-create-client-secure-session.js
View File

@ -20,10 +20,7 @@ function loadKey(keyname) {
function onStream(stream, headers) { function onStream(stream, headers) {
const socket = stream.session[kSocket]; const socket = stream.session[kSocket];
assert(headers[':authority'].startsWith(socket.servername)); assert(headers[':authority'].startsWith(socket.servername));
stream.respond({ stream.respond({ 'content-type': 'application/json' });
'content-type': 'text/html',
':status': 200
});
stream.end(JSON.stringify({ stream.end(JSON.stringify({
servername: socket.servername, servername: socket.servername,
alpnProtocol: socket.alpnProtocol alpnProtocol: socket.alpnProtocol
@ -33,21 +30,19 @@ function onStream(stream, headers) {
function verifySecureSession(key, cert, ca, opts) { function verifySecureSession(key, cert, ca, opts) {
const server = h2.createSecureServer({ cert, key }); const server = h2.createSecureServer({ cert, key });
server.on('stream', common.mustCall(onStream)); server.on('stream', common.mustCall(onStream));
server.listen(0); server.listen(0, common.mustCall(() => {
server.on('listening', common.mustCall(function() { opts = opts || { };
const headers = { ':path': '/' };
if (!opts) {
opts = {};
}
opts.secureContext = tls.createSecureContext({ ca }); opts.secureContext = tls.createSecureContext({ ca });
const client = h2.connect(`https://localhost:${this.address().port}`, opts, function() { const client = h2.connect(`https://localhost:${server.address().port}`,
const req = client.request(headers); opts);
// Verify that a 'secureConnect' listener is attached
assert.strictEqual(client.socket.listenerCount('secureConnect'), 1);
const req = client.request();
req.on('response', common.mustCall(function(headers) { req.on('response', common.mustCall((headers) => {
assert.strictEqual(headers[':status'], 200, 'status code is set'); assert.strictEqual(headers[':status'], 200);
assert.strictEqual(headers['content-type'], 'text/html', assert.strictEqual(headers['content-type'], 'application/json');
'content type is set'); assert(headers['date']);
assert(headers['date'], 'there is a date');
})); }));
let data = ''; let data = '';
@ -55,13 +50,12 @@ function verifySecureSession(key, cert, ca, opts) {
req.on('data', (d) => data += d); req.on('data', (d) => data += d);
req.on('end', common.mustCall(() => { req.on('end', common.mustCall(() => {
const jsonData = JSON.parse(data); const jsonData = JSON.parse(data);
assert.strictEqual(jsonData.servername, opts.servername || 'localhost'); assert.strictEqual(jsonData.servername,
opts.servername || 'localhost');
assert.strictEqual(jsonData.alpnProtocol, 'h2'); assert.strictEqual(jsonData.alpnProtocol, 'h2');
server.close(); server.close();
client[kSocket].destroy(); client[kSocket].destroy();
})); }));
req.end();
});
})); }));
} }