aboutsummaryrefslogtreecommitdiff
path: root/test/parallel/test-tls-enable-trace-cli.js
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2019-05-23 10:56:41 -0700
committerSam Roberts <vieuxtech@gmail.com>2019-05-30 12:34:30 +0200
commitb1bd9e3dd210d6b20d94c50758e12e93d9dbb3db (patch)
tree1fcefc3c4fa399e590d4dd0354c4031267966d57 /test/parallel/test-tls-enable-trace-cli.js
parent490c7e060644a8d0d1d0c92bbe6f0e8922a08093 (diff)
downloadandroid-node-v8-b1bd9e3dd210d6b20d94c50758e12e93d9dbb3db.tar.gz
android-node-v8-b1bd9e3dd210d6b20d94c50758e12e93d9dbb3db.tar.bz2
android-node-v8-b1bd9e3dd210d6b20d94c50758e12e93d9dbb3db.zip
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: https://github.com/nodejs/node/issues/27636 PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'test/parallel/test-tls-enable-trace-cli.js')
-rw-r--r--test/parallel/test-tls-enable-trace-cli.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/test/parallel/test-tls-enable-trace-cli.js b/test/parallel/test-tls-enable-trace-cli.js
index d41334a0f5..4d3065e757 100644
--- a/test/parallel/test-tls-enable-trace-cli.js
+++ b/test/parallel/test-tls-enable-trace-cli.js
@@ -36,8 +36,8 @@ child.on('close', common.mustCall((code, signal) => {
assert.strictEqual(signal, null);
assert.strictEqual(stdout.trim(), '');
assert(/Warning: Enabling --trace-tls can expose sensitive/.test(stderr));
+ assert(/Sent Record/.test(stderr));
assert(/Received Record/.test(stderr));
- assert(/ClientHello/.test(stderr));
}));
function test() {
@@ -55,12 +55,14 @@ function test() {
key: keys.agent6.key
},
}, common.mustCall((err, pair, cleanup) => {
- if (err) {
- console.error(err);
- console.error(err.opensslErrorStack);
- console.error(err.reason);
- assert(err);
+ if (pair.server.err) {
+ console.trace('server', pair.server.err);
}
+ if (pair.client.err) {
+ console.trace('client', pair.client.err);
+ }
+ assert.ifError(pair.server.err);
+ assert.ifError(pair.client.err);
return cleanup();
}));