@itentialopensource/adapter-utils 5.10.17 → 5.10.19

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/connectorRest.js

@@ -3106,7 +3106,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
           }
 
           // format the authentication string
-          log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tres, addSensitiveItems))} being used for user: ${useUser}`);
+          log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tres, addSensitiveItems))} being used`);
           const authStrs = [];
           if (callProperties && callProperties.authentication && callProperties.authentication.auth_field_format) {
             if (Array.isArray(callProperties.authentication.auth_field_format)) {
@@ -3168,7 +3168,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
           return callback(null, errorObj);
         }
 
-        log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tokenObj, addSensitiveItems))} being used for user: ${useUser}`);
+        log.debug(`${origin}: ${JSON.stringify(propUtilInst.scrubSensitiveInfo(tokenObj, addSensitiveItems))} being used`);
         const authStrs = [];
         if (callProperties && callProperties.authentication && callProperties.authentication.auth_field_format) {
           if (Array.isArray(callProperties.authentication.auth_field_format)) {
@@ -4975,7 +4975,7 @@ class ConnectorRest {
     try {
       if (!throttleEnabled) {
         log.error(`${origin}: Throttling not enabled, no queue`);
-        return [];
+        return callback([]);
       }
 
       return throttleEng.getQueue(callback);

package/lib/throttle.js

@@ -442,7 +442,12 @@ function gettingCloseInterval(myRequest, transNum, callback) {
 
   try {
     let intRun = false;
-    const fastInt = (avgTotal / avgSize) * 0.5;
+    let fastInt = (avgTotal / avgSize) * 0.5;
+
+    // prevent timeout overflow errors - 15 min max
+    if (fastInt > 900000) {
+      fastInt = 900000;
+    }
 
     // rapid inner interval - should be done when it is almost my time to run.
     const intervalObject = setInterval(() => {
@@ -1128,6 +1133,11 @@ class SystemXThrottle {
           outerInterval *= 0.95;
         }
 
+        // prevent timeout overflow errors - 2 hours max
+        if (outerInterval > 7200000) {
+          outerInterval = 7200000;
+        }
+
         log.debug(`${origin}: Request ${queueItem.request_id} Transaction ${queueItem.transNum} Outer Interval set to: ${outerInterval}`);
 
         // outer interval to get a turn request

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-utils",
-  "version": "5.10.17",
+  "version": "5.10.19",
   "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 @@
       }
     }
   }
-}
+}