Skip to content

http2: don't expose the original socket through the socket proxy #22650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

http2: don't expose the original socket through the socket proxy #22650

wants to merge 1 commit into from

Conversation

@szmarczak
Copy link
Member

@szmarczak szmarczak commented Sep 2, 2018

These functions expose the original socket:

session.socket.ref()
session.socket.unref()
session.socket.setEncoding()
session.socket.setKeepAlive()
session.socket.setNoDelay()

To avoid that, forward session.socket.ref to session.ref, session.socket.unref to session.unref and throw ERR_HTTP2_NO_SOCKET_MANIPULATION when accessing setEncoding, setKeepAlive or setNoDelay.

Refs: #22486

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

@nodejs-github-bot nodejs-github-bot added dont-land-on-v6.x http2 Issues or PRs related to the http2 subsystem. labels Sep 2, 2018
@szmarczak szmarczak mentioned this pull request Sep 2, 2018
Closed
3 tasks
mcollina
mcollina approved these changes Sep 3, 2018
View reviewed changes
Copy link
Member

@mcollina mcollina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mcollina
Copy link
Member

mcollina commented Sep 3, 2018 •
edited by addaleax
Loading

Good work on your first contribution @szmarczak!

CI: https://ci.nodejs.org/job/node-test-pull-request/16980/ (:heavy_check_mark:)

apapirovski
apapirovski suggested changes Sep 4, 2018
View reviewed changes
Copy link
Contributor

@apapirovski apapirovski left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this!! Edit: ugh... mobile UI...

@szmarczak
Copy link
Member Author

szmarczak commented Sep 4, 2018

Thanks for doing this!! Edit: ugh... mobile UI...

Indeed, mobile UI doesn't look good :P

@mcollina
Copy link
Member

mcollina commented Sep 5, 2018

Landed in d6a4343

@mcollina mcollina closed this Sep 5, 2018
mcollina pushed a commit that referenced this pull request Sep 5, 2018
@szmarczak @mcollina
http2: don't expose the original socket through the socket proxy
d6a4343 
Refs: #22486

PR-URL: #22650
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
targos pushed a commit that referenced this pull request Sep 5, 2018
@szmarczak @targos
http2: don't expose the original socket through the socket proxy
4cdecc5 
Refs: #22486

PR-URL: #22650
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@targos targos mentioned this pull request Sep 5, 2018
Merged
targos pushed a commit that referenced this pull request Sep 6, 2018
@szmarczak @targos
http2: don't expose the original socket through the socket proxy
015a17f 
Refs: #22486

PR-URL: #22650
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This was referenced Sep 6, 2018
Closed
Closed
kjin pushed a commit to kjin/node that referenced this pull request Oct 3, 2018
@szmarczak @kjin
http2: don't expose the original socket through the socket proxy
275379e 
Refs: nodejs#22486

PR-URL: nodejs#22650
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
kjin pushed a commit to kjin/node that referenced this pull request Oct 16, 2018
@szmarczak @kjin
http2: don't expose the original socket through the socket proxy
62ce017 
Refs: nodejs#22486

PR-URL: nodejs#22650
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
BethGriggs pushed a commit that referenced this pull request Oct 17, 2018
@szmarczak @BethGriggs
http2: don't expose the original socket through the socket proxy
805bf40 
Refs: #22486

Backport-PR-URL: #22850
PR-URL: #22650
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@BethGriggs BethGriggs mentioned this pull request Oct 30, 2018
Merged
@beevelop beevelop mentioned this pull request Nov 20, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mcollina mcollina mcollina approved these changes

@jasnell jasnell jasnell approved these changes

@lpinca lpinca lpinca approved these changes

+1 more reviewer

@apapirovski apapirovski apapirovski approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

http2 Issues or PRs related to the http2 subsystem.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@szmarczak @mcollina @apapirovski @jasnell @lpinca @nodejs-github-bot