Permalink
Browse files

http2: setting shuttingDown=true after validation

In shutdown(), shuttingDown was set to true before validating options.
If invalid options are passed, error was thrown and server remained in
shuttingDown state. This code change fixes it.

PR-URL: #15676
Fixes: #15666
Refs: #14985
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
  • Loading branch information...
trivikr authored and BridgeAR committed Sep 29, 2017
1 parent f547db1 commit 7f0183e6c3971a2b3e4ccde768326a03cacb7d07
Showing with 64 additions and 3 deletions.
  1. +3 −3 lib/internal/http2/core.js
  2. +61 −0 test/parallel/test-http2-server-shutdown-options-errors.js
@@ -983,9 +983,6 @@ class Http2Session extends EventEmitter {
if (this[kState].shutdown || this[kState].shuttingDown)
return;
debug(`[${sessionName(this[kType])}] initiating shutdown`);
this[kState].shuttingDown = true;
const type = this[kType];
if (typeof options === 'function') {
@@ -1023,6 +1020,9 @@ class Http2Session extends EventEmitter {
options.lastStreamID);
}
debug(`[${sessionName(this[kType])}] initiating shutdown`);
this[kState].shuttingDown = true;
if (callback) {
this.on('shutdown', callback);
}
@@ -0,0 +1,61 @@
'use strict';
const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');
const http2 = require('http2');
const server = http2.createServer();
const optionsToTest = {
opaqueData: 'Uint8Array',
graceful: 'boolean',
errorCode: 'number',
lastStreamID: 'number'
};
const types = {
boolean: true,
number: 1,
object: {},
array: [],
null: null,
Uint8Array: Buffer.from([0x1, 0x2, 0x3, 0x4, 0x5])
};
server.on(
'stream',
common.mustCall((stream) => {
Object.keys(optionsToTest).forEach((option) => {
Object.keys(types).forEach((type) => {
if (type === optionsToTest[option]) {
return;
}
common.expectsError(
() =>
stream.session.shutdown(
{ [option]: types[type] },
common.mustNotCall()
),
{
type: TypeError,
code: 'ERR_INVALID_OPT_VALUE',
message: `The value "${String(types[type])}" is invalid ` +
`for option "${option}"`
}
);
});
});
stream.session.destroy();
})
);
server.listen(
0,
common.mustCall(() => {
const client = http2.connect(`http://localhost:${server.address().port}`);
const req = client.request();
req.resume();
req.on('end', common.mustCall(() => server.close()));
})
);

0 comments on commit 7f0183e

Please sign in to comment.