Skip to content

Commit

Permalink
http2: setting shuttingDown=true after validation
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
  • Loading branch information
trivikr authored and MylesBorins committed Oct 11, 2017
1 parent ae91ffe commit df271f4
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/internal/http2/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -982,9 +982,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') {
Expand Down Expand Up @@ -1022,6 +1019,9 @@ class Http2Session extends EventEmitter {
options.lastStreamID);
}

debug(`[${sessionName(this[kType])}] initiating shutdown`);
this[kState].shuttingDown = true;

if (callback) {
this.on('shutdown', callback);
}
Expand Down
62 changes: 62 additions & 0 deletions test/parallel/test-http2-server-shutdown-options-errors.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// Flags: --expose-http2
'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 df271f4

Please sign in to comment.