From 378a0ad45f9170f6051d5072039ecfe558f01fac Mon Sep 17 00:00:00 2001 From: amerle Date: Mon, 26 Oct 2015 00:06:53 +0100 Subject: [PATCH 1/7] try use ssl --- lib/transport/binary/connection.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/transport/binary/connection.js b/lib/transport/binary/connection.js index 86ea9493..20c5f172 100644 --- a/lib/transport/binary/connection.js +++ b/lib/transport/binary/connection.js @@ -1,6 +1,7 @@ "use strict"; var net = require('net'), + tls = require('tls'), util = require('util'), utils = require('../../utils'), errors = require('../../errors'), @@ -13,6 +14,8 @@ var net = require('net'), function Connection (config) { EventEmitter.call(this); config = config || {}; + this.ssl = config.ssl || false; + this.ca = config.ssl-ca || ''; this.host = config.host || 'localhost'; this.port = +config.port || 2424; this.socket = null; @@ -126,7 +129,14 @@ Connection.prototype.cancel = function (err) { * @return {Socket} The socket. */ Connection.prototype.createSocket = function () { - var socket = net.createConnection(this.port, this.host); + var socket = null; + if (this.ssl) { + socket = tls.createConnection(this.port, this.host, { + ca: this.ca + }); + } + else + socket = net.createConnection(this.port, this.host); socket.setNoDelay(true); socket.setMaxListeners(100); return socket; From 10c663fa202d40fd69f1af6cf0e3a808319c294a Mon Sep 17 00:00:00 2001 From: amerle Date: Mon, 26 Oct 2015 00:08:37 +0100 Subject: [PATCH 2/7] change package name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f147a02e..b6863e74 100755 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "orientjs", + "name": "orientjsamerle", "description": "Official node.js driver for OrientDB. Fast, lightweight, uses the binary protocol.", "keywords": [ "orientdb", From 322a951fda012b10c10b1f1de99e78350102119a Mon Sep 17 00:00:00 2001 From: amerle Date: Mon, 26 Oct 2015 01:53:55 +0100 Subject: [PATCH 3/7] add ssl and sslca config --- lib/transport/binary/index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/transport/binary/index.js b/lib/transport/binary/index.js index 03d2be66..a7934419 100644 --- a/lib/transport/binary/index.js +++ b/lib/transport/binary/index.js @@ -21,6 +21,7 @@ function BinaryTransport (config) { this.setMaxListeners(Infinity); this.configure(config || {}); this.closing = false; + console.log(config); } util.inherits(BinaryTransport, EventEmitter); @@ -44,6 +45,8 @@ BinaryTransport.prototype.configure = function (config) { this.host = config.host || config.hostname || 'localhost'; this.port = config.port || 2424; + this.ssl = config.ssl || false; + this.sslca = config.sslca || ''; this.username = config.username || 'root'; this.password = config.password || ''; @@ -86,6 +89,8 @@ BinaryTransport.prototype.configureConnection = function () { this.connection = new Connection({ host: this.host, port: this.port, + ssl: this.ssl, + sslca: this.sslca, enableRIDBags: this.enableRIDBags, logger: this.logger, useToken: this.useToken From e1622a62710f700d1cfe5ed906d6fdd14d38f119 Mon Sep 17 00:00:00 2001 From: amerle Date: Mon, 26 Oct 2015 02:38:41 +0100 Subject: [PATCH 4/7] ca in option --- lib/transport/binary/connection.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/transport/binary/connection.js b/lib/transport/binary/connection.js index 20c5f172..2e6adcdb 100644 --- a/lib/transport/binary/connection.js +++ b/lib/transport/binary/connection.js @@ -15,7 +15,7 @@ function Connection (config) { EventEmitter.call(this); config = config || {}; this.ssl = config.ssl || false; - this.ca = config.ssl-ca || ''; + this.sslca = config.sslca || ''; this.host = config.host || 'localhost'; this.port = +config.port || 2424; this.socket = null; @@ -131,9 +131,10 @@ Connection.prototype.cancel = function (err) { Connection.prototype.createSocket = function () { var socket = null; if (this.ssl) { - socket = tls.createConnection(this.port, this.host, { - ca: this.ca - }); + var opts = {}; + if (this.sslca) + opts.ca = this.sslca; + socket = tls.connect(this.port, this.host, opts); } else socket = net.createConnection(this.port, this.host); From c8fb062de75397c7c31937610c5bcd5a4a268776 Mon Sep 17 00:00:00 2001 From: amerle Date: Mon, 26 Oct 2015 02:38:52 +0100 Subject: [PATCH 5/7] remove log --- lib/transport/binary/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/transport/binary/index.js b/lib/transport/binary/index.js index a7934419..87844034 100644 --- a/lib/transport/binary/index.js +++ b/lib/transport/binary/index.js @@ -21,7 +21,6 @@ function BinaryTransport (config) { this.setMaxListeners(Infinity); this.configure(config || {}); this.closing = false; - console.log(config); } util.inherits(BinaryTransport, EventEmitter); From a9441b90cd0cb8656326ca72dbc572b48cea6b90 Mon Sep 17 00:00:00 2001 From: amerle Date: Mon, 26 Oct 2015 02:47:23 +0100 Subject: [PATCH 6/7] fix jshint --- lib/transport/binary/connection.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/transport/binary/connection.js b/lib/transport/binary/connection.js index 2e6adcdb..a870f847 100644 --- a/lib/transport/binary/connection.js +++ b/lib/transport/binary/connection.js @@ -132,12 +132,14 @@ Connection.prototype.createSocket = function () { var socket = null; if (this.ssl) { var opts = {}; - if (this.sslca) + if (this.sslca) { opts.ca = this.sslca; + } socket = tls.connect(this.port, this.host, opts); } - else + else { socket = net.createConnection(this.port, this.host); + } socket.setNoDelay(true); socket.setMaxListeners(100); return socket; From 6331b252cb2503ee9ccb67dcbdf9d5cc22745169 Mon Sep 17 00:00:00 2001 From: amerle Date: Mon, 26 Oct 2015 02:48:40 +0100 Subject: [PATCH 7/7] undo package name modif --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6863e74..f147a02e 100755 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "orientjsamerle", + "name": "orientjs", "description": "Official node.js driver for OrientDB. Fast, lightweight, uses the binary protocol.", "keywords": [ "orientdb",