@itentialopensource/adapter-utils 5.10.14 → 5.10.16

package/lib/dbUtil.js

@@ -595,10 +595,11 @@ class DBUtil {
    */
   determineStorage(dbInfo, callback) {
     const origin = `${this.myid}-dbUtil-determineStorage`;
+
     if (dbInfo) {
       // priority 1 - use the dbInfo passed in
       if (dbInfo.dburl && dbInfo.database) {
-        MongoClient.connect(dbInfo.dburl, dbInfo.dboptions, (err, mongoClient) => {
+        return MongoClient.connect(dbInfo.dburl, dbInfo.dboptions, (err, mongoClient) => {
           if (err) {
             log.error(`${origin}: Error! Failed to connect to database: ${err}`);
             return callback(err, null, null, null);
@@ -606,19 +607,20 @@ class DBUtil {
           log.debug('using dbinfo');
           return callback(null, Storage.DBINFO, mongoClient, dbInfo.database);
         });
-      } else {
-        const err = 'Error! Marlformed dbInfo';
-        return callback(err, null, null, Storage.DBINFO);
       }
-    } else if (this.adapterMongoClient) {
+      const err = 'Error! Malformed dbInfo - require url and database';
+      return callback(err, null, null, Storage.DBINFO);
+    }
+
+    if (this.adapterMongoClient) {
       // priority 2 - use the adapter database
       log.debug('using adapter db');
       return callback(null, Storage.ADAPTERDB, this.adapterMongoClient, this.database);
-    } else if (this.dburl === null && dbInfo === null) {
-      // priority 3 - use the filesystem
-      log.debug('using filesystem');
-      return callback(null, Storage.FILESYSTEM, null, null);
     }
+
+    // priority 3 - use the filesystem
+    log.debug('using filesystem');
+    return callback(null, Storage.FILESYSTEM, null, null);
   }
 
   /**

package/lib/propertyUtil.js

@@ -1153,7 +1153,7 @@ class AdapterPropertyUtil {
     }
 
     // This is the array of sensitive keys
-    let sensList = ['authorization', 'x-auth-token', 'x-csrf-token', 'x-amz-security-token', 'x-aws-ec2-metadata-token', 'cookie', 'set-cookie', 'token', 'tokenp2', 'user', 'username', 'passwd', 'password', 'api-key', 'client-id', 'client-secret', 'client_id', 'client_secret', 'session', 'session-id', 'jsessionid', 'sessionToken', 'accessKeyId', 'secretAccessKey', 'private-token', 'ca'];
+    let sensList = ['authorization', 'x-auth-token', 'x-csrf-token', 'x-amz-security-token', 'x-aws-ec2-metadata-token', 'cookie', 'set-cookie', 'token', 'tokenp2', 'user', 'username', 'passwd', 'password', 'api-key', 'client-id', 'client-secret', 'client_id', 'client_secret', 'session', 'session-id', 'jsessionid', 'sessionToken', 'accessKeyId', 'secretAccessKey', 'private-token', 'ca'].map((item) => item.toLowerCase());
 
     // add any additional items to scrub
     if (addItems && Array.isArray(addItems) && addItems.length > 0) {
@@ -1207,7 +1207,7 @@ class AdapterPropertyUtil {
 
           // go through sensitive word list - maybe can use find in
           for (let j = 0; j < sensList.length; j += 1) {
-            if (key.toLowerCase() === sensList[j].toLowerCase()) {
+            if (key.toLowerCase() === sensList[j]) {
               // if sensitive, mask
               retData += `${key}=** masked **`;
               found = true;
@@ -1229,12 +1229,19 @@ class AdapterPropertyUtil {
 
     // want to make a copy and not alter the original object or array
     const retData = JSON.parse(JSON.stringify(actualData));
-
+    if (retData && typeof retData.response === 'string') {
+      try {
+        const parsed = JSON.parse(retData.response);
+        retData.response = parsed;
+      } catch (e) {
+        // ignore parse error
+      }
+    }
     // if we are scrubbing an array
     if (Array.isArray(retData)) {
       // need to go through each item in the array
       for (let i = 0; i < retData.length; i += 1) {
-        retData[i] = this.scrubSensitiveInfo(retData[i]);
+        retData[i] = this.scrubSensitiveInfo(retData[i], addItems);
       }
 
       // return the scrubbed array
@@ -1253,18 +1260,18 @@ class AdapterPropertyUtil {
               if (sensList.includes(key.toLowerCase())) {
                 retData[key][k] = '** masked **';
               } else {
-                retData[key][k] = this.scrubSensitiveInfo(retData[key][k]);
+                retData[key][k] = this.scrubSensitiveInfo(retData[key][k], addItems);
               }
             }
           } else {
-            retData[key] = this.scrubSensitiveInfo(retData[key]);
+            retData[key] = this.scrubSensitiveInfo(retData[key], addItems);
           }
         } else {
           // go through sensitive word list - maybe can use find in
           for (let j = 0; j < sensList.length; j += 1) {
-            if (key.toUpperCase() === sensList[j].toUpperCase()) {
+            if (key.toLowerCase() === sensList[j]) {
               // if sensitive, mask
-              retData[key] = '=** masked **';
+              retData[key] = '** masked **';
               break;
             }
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-utils",
-  "version": "5.10.14",
+  "version": "5.10.16",
   "description": "Itential Adapter Utility Libraries",
   "scripts": {
     "postinstall": "node utils/setup.js",