Merge pull request #4 from Come2Daddy/fix/ssl-errors

fix: avoid ssl errors to drop connection
Come2Daddy · Nov 20, 2020 · 0c786af · 0c786af
2 parents 32d1536 + 8029b1b
commit 0c786af
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ Either use environment variables
 ```bash
 UPMIG_PATH=./migrations
 UPMIG_TABLE=pg_upmig
+UPMIG_REJECT=false
 ```
 or use `.upmigrc.js` to set global options:
 ```javascript
@@ -47,6 +48,7 @@ try {
 module.exports = {
   migrations: "./migrations", // Where to store migrations files
   table: "pg_upmig", // Table name where migrations history is stored
+  reject: false
 };
 ```
 ## Migrations folder tree view
@@ -86,6 +88,7 @@ Options:
   -h, --help      display help for command
   -m, --migrations <path>  specify migrations path (default: "./migrations")
   -p, --pgtable <table>    specify migration table name (default: "pg_upmig")
+  -r, --reject             dont ignore unauthorized ssl rejection
 
 Commands:
   up [options]    perform all pending migrations

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pg-upmig",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "Postgresql migration tool",
   "keywords": [
     "database",

diff --git a/src/cli.js b/src/cli.js
@@ -8,11 +8,13 @@ const path = require("path");
 
 let migrationsPath = process.env.UPMIG_PATH||"./migrations";
 let pgTable = process.env.UPMIG_TABLE||"pg_upmig";
+let reject = Boolean(process.env.UPMIG_REJECT)||false;
 
 try {
     const dotConfig = require(path.join(process.cwd(), ".upmigrc.js"));
     migrationsPath = dotConfig.migrations?dotConfig.migrations:migrationsPath;
     pgTable = dotConfig.table?dotConfig.table:pgTable;
+    reject = dotConfig.reject?dotConfig.reject:reject;
 } catch (error) {}
 
 function steps (s) {
@@ -43,6 +45,9 @@ function setOpt (namespace) {
                 break;
             case "pgtable":
                 pgTable = option ? migTable(option):pgTable;
+                break;
+            case "reject":
+                reject = option;
         }
     }
 }
@@ -58,15 +63,23 @@ exports._env = () => {
 
 program.on("option:migrations", setOpt("migrations"));
 program.on("option:pgtable", setOpt("pgtable"));
+program.on("option:reject", setOpt("reject"));
 
 program.version(pkg.version)
 .arguments("<cmd> [opt]")
 .usage("<command> [options]")
 .option("-m, --migrations <path>", "specify migrations path", "./migrations")
-.option("-p, --pgtable <table>", "specify migration table name", "pg-upmig", migTable);
+.option("-p, --pgtable <table>", "specify migration table name", "pg-upmig", migTable)
+.option("-r, --reject", "dont ignore unauthorized ssl rejection");
 
 async function up (cmd) {
-    const mig = new migration();
+    const mig = new migration({
+        connection: {
+            ssl: {
+                rejectUnauthorized: reject
+            }
+        }
+    });
     await mig.init({
         table: pgTable,
         migrations: migrationsPath,
@@ -97,7 +110,13 @@ program
 });
 
 async function create (cmd, name){
-    const mig = new migration();
+    const mig = new migration({
+        connection: {
+            ssl: {
+                rejectUnauthorized: reject
+            }
+        }
+    });
     await mig.init({migrations: migrationsPath, table: pgTable});
     const file = await mig.create(name?name.join("-"):"", cmd.nosql);
     mig.release();
@@ -118,7 +137,13 @@ program
 });
 
 async function pending (cmd) {
-    const mig = new migration();
+    const mig = new migration({
+        connection: {
+            ssl: {
+                rejectUnauthorized: reject
+            }
+        }
+    });
     await mig.init({migrations: migrationsPath, table: pgTable, history: cmd.history});
     const list = await mig.pending();
     mig.release();

diff --git a/src/index.js b/src/index.js
@@ -72,12 +72,21 @@ class migration {
         // Sets default database client
         if (!this.client) {
             if ((params||{}).connection) {
+                if (!params.connection.hasOwnProperty("ssl")) {
+                    params.connection.ssl= { rejectUnauthorized:  process.env.UPMIG_REJECT||false };
+                } else if (!params.connection.ssl.hasOwnProperty("rejectUnauthorized")) {
+                    params.connection.ssl["rejectUnauthorized"] = process.env.UPMIG_REJECT||false;
+                }
                 // Uses connection params
                 this.client = new Client(params.connection);
             } else {
                 // Try to connect with environment variables
                 // At this point, if nothing is provided we let PG client rise errors
-                this.client = new Client();
+                this.client = new Client({
+                    ssl: {
+                        rejectUnauthorized: process.env.UPMIG_REJECT||false
+                    }
+                });
             }
         }
     }

diff --git a/tests/index.test.js b/tests/index.test.js
@@ -21,15 +21,9 @@ afterAll(async () => {
     await teardown();
 });
 
-describe("Covering privates and specific code - fallback to default .env file", () => {
+describe("Covering privates and specific code with default env vars", () => {
     beforeAll(async () => {
-        mig = new lib({
-            options: {
-                migrations: fixtures.migrations,
-                table: fixtures.pgTable
-            },
-            envFile: "x/.env"
-        });
+        mig = new lib();
         await mig.init();
     });
 
@@ -72,12 +66,7 @@ describe("Covering privates and specific code - fallback to default .env file",
 
 describe("Migration using environment variables", () => {
     beforeAll(async () => {
-        mig = new lib({
-            options: {
-                migrations: fixtures.migrations,
-                table: fixtures.pgTable,
-            }
-        });
+        mig = new lib();
         await mig.init();
     });