Skip to content

C50-575 Updating the SSL configuration for accepting username and pas… #1705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2020
Merged

C50-575 Updating the SSL configuration for accepting username and pas… #1705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions server/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
21 changes: 14 additions & 7 deletions server/app/model/file-upload/file-upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
};
Expand All @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions server/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ function getDefaultsConfig() {
port: '27017',
enable_ssl: false,
enable_auth: false,
ssl: false,
ssl_config:{
"CAFile": null,
"PEMFile": null
Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"4.3.0"}
{"version":"4.3.1"}