@itentialopensource/adapter-utils 5.10.18 → 5.10.20

package/lib/authenticationHandler.js

@@ -282,7 +282,30 @@ class AuthenticationHandler {
       }
 
       // set up data for first assume role call
-      const stsrole = new AWS.STS();
+      let stsConfigObj;
+
+      // Add optional config items (ssl, endpoint, proxy)
+      if (this.allProps.authentication.aws_sts && this.allProps.authentication.aws_sts.use_proxy_for_initial_auth === true) {
+        stsConfigObj = {};
+        // Use AWS STS-specific region if available, otherwise fall back to global region
+        stsConfigObj.region = this.allProps.authentication.aws_sts.region || this.allProps.region;
+        if (this.allProps.authentication.aws_sts.sslEnable === false) {
+          stsConfigObj.sslEnabled = false;
+        }
+        if (this.allProps.authentication.aws_sts.endpoint) {
+          stsConfigObj.endpoint = this.allProps.authentication.aws_sts.endpoint;
+        }
+        if (this.allProps.authentication.aws_sts.proxy) {
+          stsConfigObj.httpOptions = {
+            proxy: this.allProps.authentication.aws_sts.proxy
+          };
+          if (this.allProps.authentication.aws_sts.proxyagent) {
+            stsConfigObj.httpOptions.agent = this.allProps.authentication.aws_sts.proxyagent;
+          }
+        }
+      }
+
+      const stsrole = stsConfigObj ? new AWS.STS(stsConfigObj) : new AWS.STS();
       const stsData = {
         RoleArn: myRole,
         RoleSessionName: mySess,

package/lib/propertyUtil.js

@@ -1149,6 +1149,11 @@ class AdapterPropertyUtil {
     const origin = `${this.myid}-propertyUtil-scrubSensitiveInfo`;
     log.trace(origin);
 
+    // If too much to check, performance becomes an issue
+    const maxStringSize = 50000;
+    const maxArraySize = 1000;
+    const maxObjectSize = 500;
+
     // no reason to scan numbers, booleans or functions
     if (!inData || typeof inData === 'number' || typeof inData === 'boolean' || typeof inData === 'function') {
       return inData;
@@ -1167,6 +1172,12 @@ class AdapterPropertyUtil {
 
     // if we are scrubbbing a string (e.g. URL)
     if (typeof actualData === 'string') {
+      // if the string of data is too large we can not do a deep dive due to time it might take
+      if (actualData.length > maxStringSize) {
+        log.debug(`${origin}: Masking entire string, too large (${actualData.length}) to search effectively`);
+        return '** masked **';
+      }
+
       // if it is a Stringified JSON
       try {
         // need to see if it is stringified JSON
@@ -1231,16 +1242,14 @@ 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)) {
+      // if the array of data is too large we can not do a deep dive due to time it might take
+      if (retData.length > maxArraySize) {
+        log.debug(`${origin}: Masking entire array, too large (${retData.length}) to search effectively`);
+        return '** masked **';
+      }
+
       // need to go through each item in the array
       for (let i = 0; i < retData.length; i += 1) {
         retData[i] = this.scrubSensitiveInfo(retData[i], addItems);
@@ -1252,17 +1261,30 @@ class AdapterPropertyUtil {
 
     // if we are scrubbing an object (or string that has been parsed)
     if (typeof retData === 'object') {
+      const objectKeys = Object.keys(retData);
+      // if the object of data is too large we can not do a deep dive due to time it might take
+      if (objectKeys.length > maxObjectSize) {
+        log.debug(`${origin}: Masking entire object, too large (${objectKeys.length}) to search effectively`);
+        return '** masked **';
+      }
+
       // go through each item in the object
-      Object.keys(retData).forEach((key) => {
+      objectKeys.forEach((key) => {
         // go deep through an object with recursive call
         if (typeof retData[key] === 'object') {
           if (Array.isArray(retData[key])) {
-            // Handle arrays that may contain sensitive info
-            for (let k = 0; k < retData[key].length; k += 1) {
-              if (sensList.includes(key.toLowerCase())) {
-                retData[key][k] = '** masked **';
-              } else {
-                retData[key][k] = this.scrubSensitiveInfo(retData[key][k], addItems);
+            // if the array of data is too large we can not do a deep dive due to time it might take
+            if (retData[key].length > maxArraySize) {
+              log.debug(`${origin}: Masking entire array, too large (${retData[key].length}) to search effectively`);
+              retData[key] = '** masked **';
+            } else {
+              // Handle arrays that may contain sensitive info
+              for (let k = 0; k < retData[key].length; k += 1) {
+                if (sensList.includes(key.toLowerCase())) {
+                  retData[key][k] = '** masked **';
+                } else {
+                  retData[key][k] = this.scrubSensitiveInfo(retData[key][k], addItems);
+                }
               }
             }
           } else {

package/package.json

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

package/schemas/propertiesSchema.json

@@ -96,10 +96,10 @@
         "https"
       ]
     },
-    "service" : {
-      "type" : "string",
+    "service": {
+      "type": "string",
       "description": "Service we are integrating with -- used with AWS Authentication",
-      "examples" : [
+      "examples": [
         "ec2",
         "route53"
       ]
@@ -344,7 +344,7 @@
               "responseFields": {
                 "type": "object",
                 "description": "The fields from the step result"
-             },
+              },
               "successfullResponseCode": {
                 "type": "integer",
                 "description": "Expected response code for given step, if not set any successfull http response is accepted",
@@ -429,6 +429,11 @@
                 "https",
                 "http"
               ]
+            },
+            "use_proxy_for_initial_auth": {
+              "type": "boolean",
+              "description": "When true, use proxy for initial authentication requests",
+              "default": false
             }
           }
         }
@@ -1753,4 +1758,4 @@
       }
     }
   }
-}
+}