summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Collina <hello@matteocollina.com>2019-10-01 18:06:22 +0200
committerMatteo Collina <hello@matteocollina.com>2019-12-03 12:14:55 +0100
commited8619899735df53f9463bac0b10524f3c15a218 (patch)
tree424ac3907a335336240df5731f4ddb4f3c1385e4
parent8508edbf322bf0240f41a86fa379eb63550e5ec2 (diff)
downloadandroid-node-v8-ed8619899735df53f9463bac0b10524f3c15a218.tar.gz
android-node-v8-ed8619899735df53f9463bac0b10524f3c15a218.tar.bz2
android-node-v8-ed8619899735df53f9463bac0b10524f3c15a218.zip
tls: implement capture rejections for 'secureConnection' event
PR-URL: https://github.com/nodejs/node/pull/27867 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaƫl Zasso <targos@protonmail.com>
-rw-r--r--lib/_tls_wrap.js14
-rw-r--r--test/parallel/test-tls-server-capture-rejection.js34
2 files changed, 48 insertions, 0 deletions
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index 530a41a1e8..4379287cc4 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -37,6 +37,7 @@ assertCrypto();
const { setImmediate } = require('timers');
const assert = require('internal/assert');
const crypto = require('crypto');
+const EE = require('events');
const net = require('net');
const tls = require('tls');
const common = require('_tls_common');
@@ -1284,6 +1285,19 @@ Server.prototype.addContext = function(servername, context) {
this._contexts.push([re, tls.createSecureContext(context).context]);
};
+Server.prototype[EE.captureRejectionSymbol] = function(
+ err, event, sock) {
+
+ switch (event) {
+ case 'secureConnection':
+ sock.destroy(err);
+ break;
+ default:
+ net.Server.prototype[Symbol.for('nodejs.rejection')]
+ .call(this, err, event, sock);
+ }
+};
+
function SNICallback(servername, callback) {
const contexts = this.server._contexts;
diff --git a/test/parallel/test-tls-server-capture-rejection.js b/test/parallel/test-tls-server-capture-rejection.js
new file mode 100644
index 0000000000..f9bd3320e1
--- /dev/null
+++ b/test/parallel/test-tls-server-capture-rejection.js
@@ -0,0 +1,34 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
+
+const assert = require('assert');
+const events = require('events');
+const fixtures = require('../common/fixtures');
+const { createServer, connect } = require('tls');
+const cert = fixtures.readKey('rsa_cert.crt');
+const key = fixtures.readKey('rsa_private.pem');
+
+events.captureRejections = true;
+
+const server = createServer({ cert, key }, common.mustCall(async (sock) => {
+ server.close();
+
+ const _err = new Error('kaboom');
+ sock.on('error', common.mustCall((err) => {
+ assert.strictEqual(err, _err);
+ }));
+ throw _err;
+}));
+
+server.listen(0, common.mustCall(() => {
+ const sock = connect({
+ port: server.address().port,
+ host: server.address().host,
+ rejectUnauthorized: false
+ });
+
+ sock.on('close', common.mustCall());
+}));