@itentialopensource/adapter-utils 5.1.0 → 5.1.1

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+## 5.1.1 [08-22-2023]
+
+* fix scrubing arrays - was not making copy
+
+See merge request itentialopensource/adapter-utils!268
+
+---
+
 ## 5.1.0 [08-04-2023]
 
 * Changes to choosepath logic

package/lib/connectorRest.js

@@ -1173,7 +1173,7 @@ async function getToken(reqPath, options, tokenSchema, bodyString, callPropertie
         if (!tokenSchema.responseDatatype || tokenSchema.responseDatatype === 'JSON') {
           tokenResp.response = JSON.parse(tokenResp.response);
         }
-        log.debug(`${origin}: ${JSON.stringify(tokenResp.response)}`);
+        log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tokenResp.response))}`);
 
         // return the token from the token schema
         let translated = null;
@@ -2903,7 +2903,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
           }
 
           // format the authentication string
-          log.debug(`${origin}: ${JSON.stringify(tres)} being used for user: ${useUser}`);
+          log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tres))} being used for user: ${useUser}`);
           const authStrs = [];
           if (callProperties && callProperties.authentication && callProperties.authentication.auth_field_format) {
             if (Array.isArray(callProperties.authentication.auth_field_format)) {
@@ -2965,7 +2965,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
           return callback(null, errorObj);
         }
 
-        log.debug(`${origin}: ${JSON.stringify(tokenObj)} being used for user: ${useUser}`);
+        log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tokenObj))} being used for user: ${useUser}`);
         const authStrs = [];
         if (callProperties && callProperties.authentication && callProperties.authentication.auth_field_format) {
           if (Array.isArray(callProperties.authentication.auth_field_format)) {

package/lib/propertyUtil.js

@@ -1147,7 +1147,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', 'session', 'session-id'];
+    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', 'session', 'session-id', 'jsessionid'];
 
     // add any additional items to scrub
     if (addItems && Array.isArray(addItems) && addItems.length > 0) {
@@ -1157,17 +1157,6 @@ class AdapterPropertyUtil {
     // going to use copy of data so we do not mess up input - if object will still need to assign it
     let actualData = inData;
 
-    // if we are scrubbing an array
-    if (Array.isArray(actualData)) {
-      // need to go through each item in the array
-      for (let i = 0; i < actualData.length; i += 1) {
-        actualData[i] = this.scrubSensitiveInfo(actualData[i]);
-      }
-
-      // return the scrubbed array
-      return actualData;
-    }
-
     // if we are scrubbbing a string (e.g. URL)
     if (typeof actualData === 'string') {
       // if it is a Stringified JSON
@@ -1232,10 +1221,22 @@ class AdapterPropertyUtil {
       }
     }
 
-    // if we are scrubbing an object (or string that has been parsed)
-    if (typeof actualData === 'object') {
-      const retData = { ...actualData };
+    // want to make a copy and not alter the original object or array
+    const retData = JSON.parse(JSON.stringify(actualData));
 
+    // 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]);
+      }
+
+      // return the scrubbed array
+      return retData;
+    }
+
+    // if we are scrubbing an object (or string that has been parsed)
+    if (typeof retData === 'object') {
       // go through each item in the object
       Object.keys(retData).forEach((key) => {
         // go deep through an object with recursive call

package/package.json

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