http2: callback valid check before closing request #19061

trivikr · 2018-02-28T15:34:28Z

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
tests and/or benchmarks are included
commit message follows commit guidelines

Affected core subsystem(s)

http2

trivikr · 2018-02-28T15:35:14Z

Fixes #18855

cjihrig · 2018-02-28T15:48:27Z

lib/internal/http2/core.js

@@ -1764,6 +1764,8 @@ class Http2Stream extends Duplex {
      throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'code', 'number');
    if (code < 0 || code > kMaxInt)
      throw new errors.RangeError('ERR_OUT_OF_RANGE', 'code');
+    if (callback && typeof callback !== 'function')


Can you change the first part of this line to callback !== undefined

mcollina

LGTM

mcollina · 2018-02-28T15:50:22Z

CI: https://ci.nodejs.org/job/node-test-pull-request/13410/

cjihrig · 2018-02-28T15:58:06Z

test/parallel/test-http2-client-rststream-before-connect.js

@@ -28,6 +28,18 @@ server.listen(0, common.mustCall(() => {
  );
  assert.strictEqual(req.closed, false);

+  [true, 1, {}, [], 'test'].forEach((notFunction) => {


Sorry, I should have said this before: can you add null here.

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError Fixes: nodejs#18855

mcollina · 2018-03-01T11:39:25Z

CI: https://ci.nodejs.org/job/node-test-pull-request/13419/

apapirovski

I think it's debatable whether this change is correct or not. The callback is not a requirement to closing a stream and this can introduce a resource leak for someone that might be handling this type of error via a domain or an uncaughtException (as dubious as that is). It's also worth noting that the existing version matches other usage in the codebase where a callback is only provided as an event notification mechanism.

mcollina · 2018-03-02T14:06:22Z

@apapirovski the code is called synchronously from user code. If there a wrong value as a callback they need to crash. The alternative here is that if it's not a function it gets skipped,
as its done in streams (https://github.com/nodejs/node/blob/master/lib/_stream_writable.js#L273-L274).

I think we should validate synchronously when close() is called, and in case validation of that parameter fail we might decide either to throw or to replace it with a function() {}. I think throwing leads to better code.

Anyway, are you objecting?

apapirovski · 2018-03-04T12:24:20Z

Landed in caaf7e3

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError PR-URL: #19061 Fixes: #18855 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Shingo Inoue <leko.noor@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

MylesBorins · 2018-03-06T21:38:13Z

Should this be backported to v9.x-staging? If yes please follow the guide and raise a backport PR, if not let me know or add the dont-land-on label.

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError PR-URL: nodejs#19061 Fixes: nodejs#18855 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Shingo Inoue <leko.noor@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

trivikr · 2018-03-08T14:43:58Z

@MylesBorins v9.x backport PR created at #19229

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError Backport-PR-URL: #19229 PR-URL: #19061 Fixes: #18855 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Shingo Inoue <leko.noor@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError Backport-PR-URL: nodejs#19229 PR-URL: nodejs#19061 Fixes: nodejs#18855 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Shingo Inoue <leko.noor@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError Backport-PR-URL: #19229 Backport-PR-URL: #20456 PR-URL: #19061 Fixes: #18855 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Shingo Inoue <leko.noor@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError PR-URL: nodejs#19061 Fixes: nodejs#18855 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Shingo Inoue <leko.noor@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError Backport-PR-URL: #19229 Backport-PR-URL: #20456 PR-URL: #19061 Fixes: #18855 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Shingo Inoue <leko.noor@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>

nodejs-github-bot added dont-land-on-v4.x http2 Issues or PRs related to the http2 subsystem. labels Feb 28, 2018

trivikr mentioned this pull request Feb 28, 2018

http2: check if callback is valid before closing the request? #18855

Closed

cjihrig reviewed Feb 28, 2018

View reviewed changes

mcollina approved these changes Feb 28, 2018

View reviewed changes

trivikr force-pushed the close-callback-check branch from 55ed924 to d202b72 Compare February 28, 2018 15:53

cjihrig approved these changes Feb 28, 2018

View reviewed changes

http2: callback valid check before closing request

4bb2142

Do not close the request if callback is not a function, and throw ERR_INVALID_CALLBACK TypeError Fixes: nodejs#18855

trivikr force-pushed the close-callback-check branch from d202b72 to 4bb2142 Compare February 28, 2018 16:08

jasnell approved these changes Feb 28, 2018

View reviewed changes

BridgeAR approved these changes Mar 1, 2018

View reviewed changes

BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Mar 1, 2018

apapirovski reviewed Mar 2, 2018

View reviewed changes

Leko approved these changes Mar 3, 2018

View reviewed changes

tniessen approved these changes Mar 4, 2018

View reviewed changes

apapirovski closed this Mar 4, 2018

trivikr deleted the close-callback-check branch March 4, 2018 19:43

MylesBorins added the backport-requested-v9.x label Mar 6, 2018

trivikr mentioned this pull request Mar 8, 2018

[v9.x backport] http2: callback valid check before closing request #19229

Closed

4 tasks

targos removed the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Mar 24, 2018

targos added backported-to-v9.x and removed backport-requested-v9.x labels Apr 4, 2018

targos mentioned this pull request Apr 4, 2018

v9.11.0 proposal #19799

Merged

MylesBorins mentioned this pull request May 2, 2018

v8.11.2 proposal #20478

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

http2: callback valid check before closing request #19061

http2: callback valid check before closing request #19061

trivikr commented Feb 28, 2018

trivikr commented Feb 28, 2018

cjihrig Feb 28, 2018

trivikr Feb 28, 2018

mcollina left a comment

mcollina commented Feb 28, 2018

cjihrig Feb 28, 2018

trivikr Feb 28, 2018

mcollina commented Mar 1, 2018

apapirovski left a comment

mcollina commented Mar 2, 2018

apapirovski commented Mar 4, 2018

MylesBorins commented Mar 6, 2018

trivikr commented Mar 8, 2018

http2: callback valid check before closing request #19061

http2: callback valid check before closing request #19061

Conversation

trivikr commented Feb 28, 2018

Checklist

Affected core subsystem(s)

trivikr commented Feb 28, 2018

cjihrig Feb 28, 2018

Choose a reason for hiding this comment

trivikr Feb 28, 2018

Choose a reason for hiding this comment

mcollina left a comment

Choose a reason for hiding this comment

mcollina commented Feb 28, 2018

cjihrig Feb 28, 2018

Choose a reason for hiding this comment

trivikr Feb 28, 2018

Choose a reason for hiding this comment

mcollina commented Mar 1, 2018

apapirovski left a comment

Choose a reason for hiding this comment

mcollina commented Mar 2, 2018

apapirovski commented Mar 4, 2018

MylesBorins commented Mar 6, 2018

trivikr commented Mar 8, 2018