tls: TLSSocket options default isServer false

Upon creating a TLSSocket object, set the default isServer option to false Updated tls docs and added test-tls-socket-default-options PR-URL: #2614 Reviewed-By: Fedor Indutny <[email protected]>

Author: jhamhader

doc/api/tls.markdown

@@ -449,18 +449,19 @@ Or
 Wrapper for instance of [net.Socket][], replaces internal socket read/write
 routines to perform transparent encryption/decryption of incoming/outgoing data.
 
-## new tls.TLSSocket(socket, options)
+## new tls.TLSSocket(socket[, options])
 
 Construct a new TLSSocket object from existing TCP socket.
 
 `socket` is an instance of [net.Socket][]
 
-`options` is an object that might contain following properties:
+`options` is an optional object that might contain following properties:
 
 -`secureContext`: An optional TLS context object from
 `tls.createSecureContext( ... )`
 
--`isServer`: If true - TLS socket will be instantiated in server-mode
+-`isServer`: If `true` - TLS socket will be instantiated in server-mode.
+ Default: `false`
 
 -`server`: An optional [net.Server][] instance
 

lib/_tls_wrap.js

@@ -228,7 +228,10 @@ function initRead(tls, wrapped){
  */
 
 functionTLSSocket(socket,options){
-this._tlsOptions=options;
+if(options===undefined)
+this._tlsOptions={};
+else
+this._tlsOptions=options;
 this._secureEstablished=false;
 this._securePending=false;
 this._newSessionPending=false;
@@ -321,7 +324,7 @@ TLSSocket.prototype._wrapHandle = function(wrap){
 tls.createSecureContext();
 res=tls_wrap.wrap(handle._externalStream,
 context.context,
-options.isServer);
+!!options.isServer);
 res._parent=handle;
 res._parentWrap=wrap;
 res._secureContext=context;

test/parallel/test-tls-socket-default-options.js

@@ -0,0 +1,56 @@
+'use strict';
+constcommon=require('../common');
+constassert=require('assert');
+
+if(!common.hasCrypto){
+console.log('1..0 # Skipped: missing crypto');
+return;
+}
+consttls=require('tls');
+
+constfs=require('fs');
+constnet=require('net');
+
+constsent='hello world';
+
+constserverOptions={
+isServer: true,
+key: fs.readFileSync(common.fixturesDir+'/keys/agent1-key.pem'),
+cert: fs.readFileSync(common.fixturesDir+'/keys/agent1-cert.pem')
+};
+
+functiontestSocketOptions(socket,socketOptions){
+letreceived='';
+constserver=tls.createServer(serverOptions,function(s){
+s.on('data',function(chunk){
+received+=chunk;
+});
+
+s.on('end',function(){
+server.close();
+s.destroy();
+assert.equal(received,sent);
+setImmediate(runTests);
+});
+}).listen(common.PORT,function(){
+letc=newtls.TLSSocket(socket,socketOptions);
+c.connect(common.PORT,function(){
+c.end(sent);
+});
+});
+
+}
+
+consttestArgs=[
+[],
+[undefined,{}]
+];
+
+letn=0;
+functionrunTests(){
+if(n++<testArgs.length){
+testSocketOptions.apply(null,testArgs[n]);
+}
+}
+
+runTests();