RE: fixed SSL connection

Author: Vitalii4as

reverse_engineering/helpers/connectionHelper.js

@@ -1,11 +1,6 @@
 const fs = require('fs');
 const ssh = require('tunnel-ssh');
-
-let Client = null;
-
-const setConnectionHelperDependencies = app => {
-    Client = app.require('pg-native');
-};
+const pg = require('pg');
 
 const getSshConfig = info => {
     const config = {
@@ -51,20 +46,22 @@ const getSslOptions = connectionInfo => {
     const sslType = mapSslType(connectionInfo.sslType);
 
     if (sslType === 'disable') {
-        return {};
+        return false;
     }
 
     if (sslType === 'allow') {
-        return {
-            rejectUnauthorized: false,
-        };
+        true;
     }
 
     if (['prefer', 'require', 'verify-ca', 'verify-full'].includes(sslType)) {
         return {
-            sslrootcert: connectionInfo.certAuthority,
-            sslcert: connectionInfo.clientCert,
-            sslkey: connectionInfo.clientPrivateKey,
+            ca: fs.existsSync(connectionInfo.certAuthority)
+                ? fs.readFileSync(connectionInfo.certAuthority).toString()
+                : '',
+            cert: fs.existsSync(connectionInfo.clientCert) ? fs.readFileSync(connectionInfo.clientCert).toString() : '',
+            key: fs.existsSync(connectionInfo.clientPrivateKey)
+                ? fs.readFileSync(connectionInfo.clientPrivateKey).toString()
+                : '',
         };
     }
 };
@@ -91,49 +88,24 @@ const createClient = async connectionInfo => {
 
     const config = {
         host: connectionInfo.host,
-        port: connectionInfo.port,
-        dbname: connectionInfo.database || connectionInfo.maintenanceDatabase,
         user: connectionInfo.userName,
         password: connectionInfo.userPassword,
-        connect_timeout: Number(connectionInfo.queryRequestTimeout) || 60000,
-        application_name: 'hackolade',
-        keepalives: 1,
-        sslmode: connectionInfo.sslType,
-        ...getSslOptions(connectionInfo),
+        port: connectionInfo.port,
+        keepAlive: true,
+        ssl: getSslOptions(connectionInfo),
+        connectionTimeoutMillis: Number(connectionInfo.queryRequestTimeout) || 60000,
+        query_timeout: Number(connectionInfo.queryRequestTimeout) || 60000,
+        statement_timeout: Number(connectionInfo.queryRequestTimeout) || 60000,
+        database: connectionInfo.database || connectionInfo.maintenanceDatabase,
+        application_name: 'Hackolade',
     };
 
-    const client = await connectClient(config);
+    const client = new pg.Client(config);
+    await client.connect();
 
     return { client, sshTunnel };
 };
 
-const connectClient = config => {
-    return new Promise((resolve, reject) => {
-        const paramsString = Object.entries(config)
-            .map(([key, value]) => getParameter(key, value))
-            .join(' ');
-
-        const client = new Client();
-
-        client.connect(paramsString, error => {
-            if (error) {
-                return reject(error);
-            }
-
-            resolve(client);
-        });
-    });
-};
-
-const getParameter = (key, value) => {
-    if (value?.toString()) {
-        return `${key}=${value}`;
-    }
-
-    return '';
-};
-
 module.exports = {
     createClient,
-    setConnectionHelperDependencies,
 };

reverse_engineering/helpers/db.js

@@ -2,7 +2,6 @@ const queryConstants = require('./queryConstants');
 
 let client = null;
 let logger = null;
-let queue = [];
 
 module.exports = {
     initializeClient(newClient, newLogger) {
@@ -35,7 +34,7 @@ module.exports = {
         logger.info('Execute query', { queryName, params });
 
         const start = Date.now();
-        const result = await this._executeQuery(query, params);
+        const result = await client.query(query, params);
         const duration = Date.now() - start;
 
         logger.info('Query executed', { queryName, params, duration, rowsCount: result.rowCount });
@@ -57,16 +56,4 @@ module.exports = {
             return null;
         }
     },
-
-    _executeQuery(query, params = []) {
-        return new Promise((resolve, reject) => {
-            try {
-                const rows = client.querySync(query, params);
-
-                resolve({ rows });
-            } catch (err) {
-                return reject(err);
-            }
-        });
-    },
 };

reverse_engineering/helpers/postgresService.js

@@ -1,4 +1,4 @@
-const { createClient, setConnectionHelperDependencies } = require('./connectionHelper');
+const { createClient } = require('./connectionHelper');
 const db = require('./db');
 const { getJsonSchema } = require('./getJsonSchema');
 const {
@@ -52,7 +52,6 @@ let logger = null;
 module.exports = {
     setDependencies(app) {
         _ = app.require('lodash');
-        setConnectionHelperDependencies(app);
         setDependenciesInCommonHelper(app);
         setDependenciesInTableHelper(app);
         setDependenciesInColumnHelper(app);