bug fixes checking ssl properties
Noah Zalev committed
May 1, 2021 at 15:56 UTC
791afb5035c64e6978c3843db884d1c3a39270bf
1 file changed
+13
-7
db.js
+13
-7
@@ -447,9 +447,11 @@ module.exports.CreateDB = function (parent, func) {
447
delete connectionObject.database;
448
449
try {
450
- if (connectinArgs.ssl.cacertpath) { connectionObject.ssl.ca = [require('fs').readFileSync(connectinArgs.ssl.cacertpath, 'utf8')]; }
451
- if (connectinArgs.ssl.clientcertpath) { connectionObject.ssl.cert = [require('fs').readFileSync(connectinArgs.ssl.clientcertpath, 'utf8')]; }
452
- if (connectinArgs.ssl.clientkeypath) { connectionObject.ssl.key = [require('fs').readFileSync(connectinArgs.ssl.clientkeypath, 'utf8')]; }
450
+ if (connectinArgs.ssl) {
451
+ if (connectinArgs.ssl.cacertpath) { connectionObject.ssl.ca = [require('fs').readFileSync(connectinArgs.ssl.cacertpath, 'utf8')]; }
452
+ if (connectinArgs.ssl.clientcertpath) { connectionObject.ssl.cert = [require('fs').readFileSync(connectinArgs.ssl.clientcertpath, 'utf8')]; }
453
+ if (connectinArgs.ssl.clientkeypath) { connectionObject.ssl.key = [require('fs').readFileSync(connectinArgs.ssl.clientkeypath, 'utf8')]; }
454
+ }
455
} catch (ex) {
456
console.log('Error loading SQL Connector certificate: ' + ex);
457
process.exit();
@@ -1596,11 +1598,15 @@ module.exports.CreateDB = function (parent, func) {
1598
// SSL options different on mariadb/mysql
1599
var sslOptions = '';
1600
if (obj.databaseType == 4) {
1599
- if (props.ssl) sslOptions = ' --ssl';
1600
- if (props.ssl.cacertpath) sslOptions = ' --ssl-verify-server-cert --ssl-ca=' + props.ssl.cacertpath;
1601
+ if (props.ssl) {
1602
+ sslOptions = ' --ssl';
1603
+ if (props.ssl.cacertpath) sslOptions = ' --ssl-verify-server-cert --ssl-ca=' + props.ssl.cacertpath;
1604
+ }
1605
} else {
1602
- if (props.ssl) sslOptions = ' --ssl-mode=required';
1603
- if (props.ssl.cacertpath) sslOptions = ' --ssl-mode=verify_identity --ssl-ca=' + props.ssl.cacertpath;
1606
+ if (props.ssl) {
1607
+ sslOptions = ' --ssl-mode=required';
1608
+ if (props.ssl.cacertpath) sslOptions = ' --ssl-mode=verify_identity --ssl-ca=' + props.ssl.cacertpath;
1609
+ }
1610
}
1611
cmd += sslOptions;
1612