From 92b13e455fb750b86ba8da2fb47f5474a710d4c0 Mon Sep 17 00:00:00 2001
From: Andreas Lind <andreas@one.com>
Date: Wed, 2 Nov 2016 23:20:12 +0100
Subject: [PATCH] https: Use secureProtocol in Agent#getName

Refs: https://github.com/nodejs/node/issues/9324
PR-URL: https://github.com/nodejs/node/pull/9452
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/https.js                                  |  4 ++
 test/parallel/test-https-agent-getname.js     |  4 +-
 .../test-https-agent-secure-protocol.js       | 60 +++++++++++++++++++
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 test/parallel/test-https-agent-secure-protocol.js

diff --git a/lib/https.js b/lib/https.js
index ef0c8dd04638b8..72d4deb34f1ab8 100644
--- a/lib/https.js
+++ b/lib/https.js
@@ -146,6 +146,10 @@ Agent.prototype.getName = function(options) {
   if (options.servername && options.servername !== options.host)
     name += options.servername;
 
+  name += ':';
+  if (options.secureProtocol)
+    name += options.secureProtocol;
+
   return name;
 };
 
diff --git a/test/parallel/test-https-agent-getname.js b/test/parallel/test-https-agent-getname.js
index 63473775b0e0f6..c89161ab142e58 100644
--- a/test/parallel/test-https-agent-getname.js
+++ b/test/parallel/test-https-agent-getname.js
@@ -9,7 +9,7 @@ const agent = new https.Agent();
 // empty options
 assert.strictEqual(
   agent.getName({}),
-  'localhost:::::::::'
+  'localhost::::::::::'
 );
 
 // pass all options arguments
@@ -28,5 +28,5 @@ const options = {
 
 assert.strictEqual(
   agent.getName(options),
-  '0.0.0.0:443:192.168.1.1:ca:cert:ciphers:key:pfx:false:localhost'
+  '0.0.0.0:443:192.168.1.1:ca:cert:ciphers:key:pfx:false:localhost:'
 );
diff --git a/test/parallel/test-https-agent-secure-protocol.js b/test/parallel/test-https-agent-secure-protocol.js
new file mode 100644
index 00000000000000..7cca682101fa0b
--- /dev/null
+++ b/test/parallel/test-https-agent-secure-protocol.js
@@ -0,0 +1,60 @@
+'use strict';
+const assert = require('assert');
+const common = require('../common');
+
+if (!common.hasCrypto) {
+  common.skip('missing crypto');
+  return;
+}
+
+const https = require('https');
+const fs = require('fs');
+
+const options = {
+  key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
+  cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'),
+  ca: fs.readFileSync(common.fixturesDir + '/keys/ca1-cert.pem')
+};
+
+const server = https.Server(options, function(req, res) {
+  res.writeHead(200);
+  res.end('hello world\n');
+});
+
+server.listen(0, common.mustCall(function() {
+  const port = this.address().port;
+  const globalAgent = https.globalAgent;
+  globalAgent.keepAlive = true;
+  https.get({
+    path: '/',
+    port: port,
+    ca: options.ca,
+    rejectUnauthorized: true,
+    servername: 'agent1',
+    secureProtocol: 'SSLv23_method'
+  }, common.mustCall(function(res) {
+    res.resume();
+    globalAgent.once('free', common.mustCall(function() {
+      https.get({
+        path: '/',
+        port: port,
+        ca: options.ca,
+        rejectUnauthorized: true,
+        servername: 'agent1',
+        secureProtocol: 'TLSv1_method'
+      }, common.mustCall(function(res) {
+        res.resume();
+        globalAgent.once('free', common.mustCall(function() {
+          // Verify that two keep-alived connections are created
+          // due to the different secureProtocol settings:
+          const keys = Object.keys(globalAgent.freeSockets);
+          assert.strictEqual(keys.length, 2);
+          assert.ok(keys[0].includes(':SSLv23_method'));
+          assert.ok(keys[1].includes(':TLSv1_method'));
+          globalAgent.destroy();
+          server.close();
+        }));
+      }));
+    }));
+  }));
+}));