Skip to content

Commit bd4fb53

Browse files
newsiberiandaprahamian
authored andcommitted
feat(ss): adds missing ssl options ssl options for ciphers and ecdhCurve
Adds missingssl options that are required for mongodb-core to establish ssl handshake with mongo server which is used certificate with ECDH curve
1 parent 0935306 commit bd4fb53

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

lib/mongo_client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var parse = require('./url_parser')
3030
* db.close();
3131
* });
3232
*/
33-
var validOptionNames = ['poolSize', 'ssl', 'sslValidate', 'sslCA', 'sslCert',
33+
var validOptionNames = ['poolSize', 'ssl', 'sslValidate', 'sslCA', 'sslCert', 'ciphers', 'ecdhCurve',
3434
'sslKey', 'sslPass', 'sslCRL', 'autoReconnect', 'noDelay', 'keepAlive', 'connectTimeoutMS', 'family',
3535
'socketTimeoutMS', 'reconnectTries', 'reconnectInterval', 'ha', 'haInterval',
3636
'replicaSet', 'secondaryAcceptableLatencyMS', 'acceptableLatencyMS',

lib/mongos.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var release = os.release();
4848

4949
// Allowed parameters
5050
var legalOptionNames = ['ha', 'haInterval', 'acceptableLatencyMS'
51-
, 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate'
51+
, 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate', 'ciphers', 'ecdhCurve'
5252
, 'sslCA', 'sslCRL', 'sslCert', 'sslKey', 'sslPass', 'socketOptions', 'bufferMaxEntries'
5353
, 'store', 'auto_reconnect', 'autoReconnect', 'emitError'
5454
, 'keepAlive', 'noDelay', 'connectTimeoutMS', 'socketTimeoutMS'

lib/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var release = os.release();
4545

4646
// Allowed parameters
4747
var legalOptionNames = ['ha', 'haInterval', 'acceptableLatencyMS'
48-
, 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate'
48+
, 'poolSize', 'ssl', 'checkServerIdentity', 'sslValidate', 'ciphers', 'ecdhCurve'
4949
, 'sslCA', 'sslCRL', 'sslCert', 'sslKey', 'sslPass', 'socketOptions', 'bufferMaxEntries'
5050
, 'store', 'auto_reconnect', 'autoReconnect', 'emitError'
5151
, 'keepAlive', 'noDelay', 'connectTimeoutMS', 'socketTimeoutMS', 'family'

test/runner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ var Configuration = function(options) {
116116
console.log("[purge the directories]");
117117

118118
var Logger = require('mongodb-topology-manager').Logger;
119-
manager.start().then(function() {
119+
return manager.start().then(function() {
120120
console.log("[started the topology]");
121121
var Logger = require('mongodb-topology-manager').Logger;
122122
// Logger.setLevel('info');

0 commit comments

Comments
 (0)