Merge pull request #1367 from CVEProject/dr_dev_env

Dealing with multiple connection types.

Author: jdaigneau5

.env

@@ -6,3 +6,4 @@ RATE_LIMIT_WINDOW_SECONDS=60
 # The maximum number of connections allowed within the rate limiting window.
 # This sets the threshold for how many requests can be made in the specified time frame.
 RATE_LIMIT_MAX_CONNECTIONS=1000
+USEMONGO=true

.github/workflows/test-integration.yml

@@ -23,7 +23,7 @@ jobs:
         while ! $dockercompose logs cveawg | grep -q 'Serving on port'; do
           attempts=$(expr $attempts - 1)
           if [ $($dockercompose ps --status running -q | wc -l) -eq 2 ] && [ $attempts -gt 0 ]; then
-            sleep 1
+            sleep 10
             $dockercompose logs || true
             continue
           fi

src/index.js

@@ -48,12 +48,11 @@ app.use((req, res, next) => {
 
 // Connect to MongoDB database
 const dbConnectionStr = dbUtils.getMongoConnectionString()
-mongoose.connect(dbConnectionStr, {
-  authMechanism: 'SCRAM-SHA-1',
-  tls: false
-})
+const dbConnectionOptions = dbUtils.getMongoConnectionOptions()
+
+// First attempt: try connecting with authMechanism
+mongoose.connect(dbConnectionStr, dbConnectionOptions)
 
-// database connection
 const db = mongoose.connection
 
 db.on('error', () => {

src/utils/db.js

@@ -1,5 +1,5 @@
 const config = require('config')
-
+const { booleanIsTrue } = require('./utils')
 const logger = require('../middleware/logger')
 
 /* constructs MongoDB connection string
@@ -30,6 +30,19 @@ function getMongoConnectionString () {
   return `mongodb://${dbLoginPrepend}${dbHost}:${dbPort}/${dbName}`
 }
 
+function getMongoConnectionOptions () {
+  if (process.env.USEMONGO !== undefined && booleanIsTrue(process.env.USEMONGO)) {
+    return {
+      tls: false
+    }
+  }
+  return {
+    authMechanism: 'SCRAM-SHA-1',
+    tls: false
+  }
+}
+
 module.exports = {
-  getMongoConnectionString
+  getMongoConnectionString,
+  getMongoConnectionOptions
 }