Browse Source

fix: accept ssl certificate file path in NC_DB

close #840

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/865/head
Pranav C 3 years ago
parent
commit
f29aa2a05f
  1. 15
      packages/nocodb/src/lib/noco/common/NcConnectionMgr.ts
  2. 24
      packages/nocodb/src/lib/utils/NcConfigFactory.ts

15
packages/nocodb/src/lib/noco/common/NcConnectionMgr.ts

@ -69,17 +69,26 @@ export default class NcConnectionMgr {
connectionConfig?.connection?.ssl &&
typeof connectionConfig?.connection?.ssl === 'object'
) {
if (connectionConfig.connection.ssl.caFilePath) {
if (
connectionConfig.connection.ssl.caFilePath &&
!connectionConfig.connection.ssl.ca
) {
connectionConfig.connection.ssl.ca = fs
.readFileSync(connectionConfig.connection.ssl.caFilePath)
.toString();
}
if (connectionConfig.connection.ssl.keyFilePath) {
if (
connectionConfig.connection.ssl.keyFilePath &&
!connectionConfig.connection.ssl.key
) {
connectionConfig.connection.ssl.key = fs
.readFileSync(connectionConfig.connection.ssl.keyFilePath)
.toString();
}
if (connectionConfig.connection.ssl.certFilePath) {
if (
connectionConfig.connection.ssl.certFilePath &&
!connectionConfig.connection.ssl.cert
) {
connectionConfig.connection.ssl.cert = fs
.readFileSync(connectionConfig.connection.ssl.certFilePath)
.toString();

24
packages/nocodb/src/lib/utils/NcConfigFactory.ts

@ -401,6 +401,30 @@ export default class NcConfigFactory implements NcConfig {
}
});
if (
dbConfig?.connection?.ssl &&
typeof dbConfig?.connection?.ssl === 'object'
) {
if (dbConfig.connection.ssl.caFilePath && !dbConfig.connection.ssl.ca) {
dbConfig.connection.ssl.ca = fs
.readFileSync(dbConfig.connection.ssl.caFilePath)
.toString();
}
if (dbConfig.connection.ssl.keyFilePath && !dbConfig.connection.ssl.key) {
dbConfig.connection.ssl.key = fs
.readFileSync(dbConfig.connection.ssl.keyFilePath)
.toString();
}
if (
dbConfig.connection.ssl.certFilePath &&
!dbConfig.connection.ssl.cert
) {
dbConfig.connection.ssl.cert = fs
.readFileSync(dbConfig.connection.ssl.certFilePath)
.toString();
}
}
return dbConfig;
}

Loading…
Cancel
Save