Merge pull request #158 from mikelr/AddSNISupport

Send hostname as default SNI name
SAP · May 19, 2020 · 6d07cc3 · 6d07cc3
2 parents 2a186b5 + 02e2e91
commit 6d07cc3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/lib/protocol/tcp.js b/lib/protocol/tcp.js
@@ -24,10 +24,13 @@ exports.connect = function connect(options, cb) {
   if ('key' in options || 'cert' in options || 'ca' in options || 'pfx' in
     options || options.useTLS === true) {
     createSocket = exports.createSecureSocket;
+    if (!('servername' in options)) {
+      options.servername = options.host;
+    }
   } else {
     createSocket = exports.createSocket;
   }
   var socket = createSocket(options, cb);
   socket.setNoDelay(true);
   return socket;
-};
+};
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   ],
   "name": "hdb",
   "description": "SAP HANA Database Client for Node",
-  "version": "0.17.2",
+  "version": "0.18.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/SAP/node-hdb.git"

diff --git a/test/lib.tcp.js b/test/lib.tcp.js
@@ -30,11 +30,28 @@ describe('Lib', function () {
       tcp.createSecureSocket = function tlsConnect(options, cb) {
         tcp.createSecureSocket = createSecureSocket;
         options.allowHalfOpen.should.equal(false);
+        options.servername.should.equal(options.host);
         process.nextTick(cb);
         return socket;
       };
       tcp.connect({
-        pfx: true
+        pfx: true,
+        host: 'localhost'
+      }, done).should.equal(socket);
+    });
+
+    it('should override default servername', function (done) {
+      tcp.createSecureSocket = function tlsConnect(options, cb) {
+        tcp.createSecureSocket = createSecureSocket;
+        options.allowHalfOpen.should.equal(false);
+        options.servername.should.equal('customSNI');
+        process.nextTick(cb);
+        return socket;
+      };
+      tcp.connect({
+        pfx: true,
+        host: 'localhost',
+        servername: 'customSNI'
       }, done).should.equal(socket);
     });
 
@@ -49,4 +66,4 @@ describe('Lib', function () {
     });
 
   });
-});
+});