diff --git a/server/app/app.js b/server/app/app.js index b71d110ed..4fb867c33 100755 --- a/server/app/app.js +++ b/server/app/app.js @@ -44,22 +44,23 @@ const dboptions = { host: process.env.DB_HOST || appConfig.db.host, port: process.env.DB_PORT || appConfig.db.port, dbName: process.env.DB_NAME || appConfig.db.dbName, - ssl: process.env.DB_SSL || appConfig.db.ssl, - enable_ssl: process.env.ENABLE_SSL || appConfig.db.enable_ssl, - enable_auth: process.env.ENABLE_AUTH || appConfig.db.enable_auth, + ssl: process.env.DB_SSL === 'true' || appConfig.db.ssl, + enable_ssl: process.env.ENABLE_SSL === 'true' || appConfig.db.enable_ssl, + enable_auth: process.env.ENABLE_AUTH === 'true' || appConfig.db.enable_auth, ssl_config:{ "CAFile": process.env.CAFILE || appConfig.db.ssl_config.CAFile, "PEMFile": process.env.PEMFILE || appConfig.db.ssl_config.PEMFile }, auth_config:{ - "username":process.env.USERNAME || appConfig.db.auth_config.username, - "password":process.env.PASSWORD || appConfig.db.auth_config.password, + "username":process.env.username || appConfig.db.auth_config.username, + "password":process.env.password || appConfig.db.auth_config.password, "authenticated":process.env.authenticated || appConfig.db.auth_config.authenticated } }; // Initialise the mongodb connections along with that mongoose ORM would be configure const mongoDbConnect = require('_pr/lib/mongodb'); + mongoDbConnect(dboptions, function (err) { if (err) { logger.error("Unable to connect to mongo db >>" + err); @@ -86,7 +87,6 @@ logger.debug('Logger Initialized'); LDAPUser.getLdapUser(function(err, ldapData) { - console.log(JSON.stringify(ldapData)) if (err) { logger.error("Failed to get ldap-user: ", err); return; diff --git a/server/app/model/file-upload/file-upload.js b/server/app/model/file-upload/file-upload.js index 2d5254566..a2fe684ce 100644 --- a/server/app/model/file-upload/file-upload.js +++ b/server/app/model/file-upload/file-upload.js @@ -10,16 +10,16 @@ const dboptions = { host: process.env.DB_HOST || appConfig.db.host, port: process.env.DB_PORT || appConfig.db.port, dbName: process.env.DB_NAME || appConfig.db.dbName, - ssl: process.env.DB_SSL || appConfig.db.ssl, - enable_ssl: process.env.ENABLE_SSL || appConfig.db.enable_ssl, - enable_auth: process.env.ENABLE_AUTH || appConfig.db.enable_auth, + ssl: process.env.DB_SSL === 'true' || appConfig.db.ssl, + enable_ssl: (process.env.ENABLE_SSL === 'true') || appConfig.db.enable_ssl, + enable_auth: process.env.ENABLE_AUTH === 'true' || appConfig.db.enable_auth, ssl_config:{ "CAFile": process.env.CAFILE || appConfig.db.ssl_config.CAFile, "PEMFile": process.env.PEMFILE || appConfig.db.ssl_config.PEMFile }, auth_config:{ - "username":process.env.USERNAME || appConfig.db.auth_config.username, - "password":process.env.PASSWORD || appConfig.db.auth_config.password, + "username":process.env.username || appConfig.db.auth_config.username, + "password":process.env.password || appConfig.db.auth_config.password, "authenticated":process.env.authenticated || appConfig.db.auth_config.authenticated } }; @@ -37,12 +37,19 @@ if(dboptions.enable_ssl){ mongoOptions.sslKey = key; mongoOptions.sslCert = cert; } -logger.info(connectionString); + +if(dboptions.enable_auth){ + connectionString = 'mongodb://'+dboptions.auth_config.username+':'+dboptions.auth_config.password+'@' + dboptions.host + ':' + dboptions.port + '/' + dboptions.dbName + '?ssl=' + dboptions.enable_ssl+'&authSource=admin'; +} + +logger.info("Connecting to mongodb in file upload."); mongoDbClient.connect(connectionString, {server : mongoOptions}, function (err, db) { if (err) { - throw "unable to connect to mongodb" + logger.error(err); + throw "unable to connect to mongodb"; return; }else{ + logger.info("Mongodb connected successfully in file upload."); gfs = Grid(db, mongoDbClient); } diff --git a/server/install.js b/server/install.js index 30e0ee1f9..d3bb67252 100755 --- a/server/install.js +++ b/server/install.js @@ -465,6 +465,7 @@ function getDefaultsConfig() { port: '27017', enable_ssl: false, enable_auth: false, + ssl: false, ssl_config:{ "CAFile": null, "PEMFile": null diff --git a/version.json b/version.json index 356d80cb5..0606d75a6 100755 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"4.3.0"} +{"version":"4.3.1"}