Skip to content
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.

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

tls: trace errors can show up as SSL errors #27841

Closed
wants to merge 2 commits into from

Conversation

@sam-github
Copy link
Member

commented May 23, 2019

Calls to TLS_trace might leave errors on the SSL error stack, which then
get reported as SSL errors instead of being ignored. Wrap TLS_trace to
keep the error stack unchanged.

Fixes: #27636

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
@nodejs-github-bot

This comment has been minimized.

src/tls_wrap.cc Outdated Show resolved Hide resolved
@nodejs-github-bot

This comment has been minimized.

@nodejs-github-bot

This comment has been minimized.

@nodejs-github-bot

This comment has been minimized.

@Trott
Trott approved these changes May 25, 2019
Copy link
Member

left a comment

Remove the entry for the flaky test from test/parallel/parallel.status?

@refack
Copy link
Member

left a comment

please better names

src/tls_wrap.cc Outdated Show resolved Hide resolved
@Trott

This comment has been minimized.

Copy link
Member

commented May 27, 2019

Looks like it needs a rebase?

@sam-github sam-github force-pushed the sam-github:fix-tls-trace-tests branch from 3b4cb96 to edec9af May 27, 2019

@nodejs-github-bot

This comment has been minimized.

tls: trace errors can show up as SSL errors
Calls to TLS_trace might leave errors on the SSL error stack, which then
get reported as SSL errors instead of being ignored. Wrap TLS_trace to
keep the error stack unchanged.

Fixes: #27636

@sam-github sam-github force-pushed the sam-github:fix-tls-trace-tests branch from edec9af to baff45b May 27, 2019

@refack
refack approved these changes May 27, 2019
@refack

This comment has been minimized.

Copy link
Member

commented May 27, 2019

Thank you for addressing my CR.

@nodejs-github-bot

This comment has been minimized.

@Trott

This comment has been minimized.

Copy link
Member

commented May 28, 2019

The test is still failing in CI. Not sure if that's expected (as perhaps it has multiple issues) or if that's a sign that this isn't quite a complete fix?

@sam-github

This comment has been minimized.

Copy link
Member Author

commented May 28, 2019

@Trott latest ci was all green, but I'll kick off another.

@nodejs-github-bot

This comment has been minimized.

@nodejs-github-bot

This comment has been minimized.

@sam-github

This comment has been minimized.

Copy link
Member Author

commented May 29, 2019

test-cpu-prof failed on FreeBSD, but that doesn't seem related. Resuming.

@nodejs-github-bot

This comment has been minimized.

@sam-github

This comment has been minimized.

Copy link
Member Author

commented May 29, 2019

@Trott I am not seeing signs of instability. Can I land this?

@Trott

This comment has been minimized.

Copy link
Member

commented May 29, 2019

@Trott I am not seeing signs of instability. Can I land this?

OMG yes, please! Sorry my erroneous observation caused a delay here.

@Trott

This comment has been minimized.

Copy link
Member

commented May 29, 2019

(Oh, wait, it wasn't erroneous. At the time, the most recent CI was https://ci.nodejs.org/job/node-test-pull-request/23424/ which shows the test still failing. But whatever, if it's all green now, let's land. Maybe this was needed in combination with something else that landed recently.

@sam-github

This comment has been minimized.

Copy link
Member Author

commented May 30, 2019

Landed in b1bd9e3

@sam-github sam-github closed this May 30, 2019

pull bot pushed a commit to zys-contribs/node that referenced this pull request May 30, 2019
tls: trace errors can show up as SSL errors
Calls to TLS_trace might leave errors on the SSL error stack, which then
get reported as SSL errors instead of being ignored. Wrap TLS_trace to
keep the error stack unchanged.

Fixes: nodejs#27636

PR-URL: nodejs#27841
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>

@sam-github sam-github deleted the sam-github:fix-tls-trace-tests branch May 30, 2019

targos added a commit that referenced this pull request May 31, 2019
tls: trace errors can show up as SSL errors
Calls to TLS_trace might leave errors on the SSL error stack, which then
get reported as SSL errors instead of being ignored. Wrap TLS_trace to
keep the error stack unchanged.

Fixes: #27636

PR-URL: #27841
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@targos targos referenced this pull request Jun 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.