@itentialopensource/adapter-utils 5.7.0 → 5.7.2

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## 5.7.2 [09-06-2024]
+
+* Update lock file
+
+See merge request itentialopensource/adapter-utils!301
+
+---
+
+## 5.7.1 [09-06-2024]
+
+* Update zlib library to node native
+
+See merge request itentialopensource/adapter-utils!299
+
+---
+
 ## 5.7.0 [08-21-2024]
 
 * Update gzip logic

package/lib/authenticationHandler.js

@@ -117,13 +117,33 @@ class AuthenticationHandler {
       if (STSParams) {
         log.info('Using STS for AWS Authentication');
 
-        // set the original AWS access information (from properties)
-        AWS.config.update({
+        // set up the config object
+        const configObj = {
           sessionToken: this.allProps.authentication.aws_session_token,
           accessKeyId: this.allProps.authentication.aws_access_key,
           secretAccessKey: this.allProps.authentication.aws_secret_key,
           region: this.allProps.region
-        });
+        };
+        // Add optional config items (ssl, endpoint, proxy)
+        if (this.allProps.authentication.aws_sts) {
+          if (this.allProps.authentication.aws_sts.sslEnable === false) {
+            configObj.sslEnabled = false;
+          }
+          if (this.allProps.authentication.aws_sts.endpoint) {
+            configObj.endpoint = this.allProps.authentication.aws_sts.endpoint;
+          }
+          if (this.allProps.authentication.aws_sts.proxy) {
+            configObj.httpOptions = {
+              proxy: this.allProps.authentication.aws_sts.proxy
+            };
+
+            if (this.allProps.authentication.aws_sts.proxyagent) {
+              configObj.httpOptions.agent = this.allProps.authentication.aws_sts.proxyagent;
+            }
+          }
+        }
+        // set the original AWS access information (from properties)
+        AWS.config.update(configObj);
 
         // use STS to get the AWS access information for the user defined in STWS Params
         const sts = new AWS.STS();
@@ -138,6 +158,11 @@ class AuthenticationHandler {
             log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
             return callback(null, errorObj);
           }
+          if (!data || !data.Credentials || !data.Credentials.AccessKeyId || !data.Credentials.SecretAccessKey) {
+            const errorObj = this.requestHandlerInst.formatErrorObject(this.myid, meth, 'AWS Assume Role did not return credentials', null, null, null, null);
+            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
+            return callback(null, errorObj);
+          }
           // extract the user specific info from the response
           const accessKeyId = data.Credentials.AccessKeyId;
           const secretAccessKey = data.Credentials.SecretAccessKey;
@@ -192,6 +217,11 @@ class AuthenticationHandler {
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
           return callback(null, errorObj);
         }
+        if (!data || !data.Credentials || !data.Credentials.AccessKeyId || !data.Credentials.SecretAccessKey) {
+          const errorObj = this.requestHandlerInst.formatErrorObject(this.myid, meth, 'AWS Assume Role did not return credentials', null, null, null, null);
+          log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
+          return callback(null, errorObj);
+        }
 
         // get role keys from response so we can sign the request
         const accessKeyId = data.Credentials.AccessKeyId;

package/lib/connectorRest.js

@@ -3170,7 +3170,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
 
         return addAuthToRequest(request, authStrs, callProperties, (authReq, aerror) => {
           if (aerror) {
-            return callback(aerror);
+            return callback(null, aerror);
           }
 
           request.tokenUsed = authReq.token;
@@ -3231,7 +3231,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
 
           return addAuthToRequest(request, authStrs, callProperties, (authReq, aerror) => {
             if (aerror) {
-              return callback(aerror);
+              return callback(null, aerror);
             }
 
             request.tokenUsed = tres.token;
@@ -3293,7 +3293,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
 
         return addAuthToRequest(request, authStrs, callProperties, (authReq, aerror) => {
           if (aerror) {
-            return callback(aerror);
+            return callback(null, aerror);
           }
 
           // actually make the request now that the authentication has been added
@@ -3342,7 +3342,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
 
       return addAuthToRequest(request, authStrs, callProperties, (authReq, aerror) => {
         if (aerror) {
-          return callback(aerror);
+          return callback(null, aerror);
         }
 
         // actually make the request now that the authentication has been added
@@ -3383,7 +3383,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
 
       return addAuthToRequest(request, authStrs, callProperties, (authReq, aerror) => {
         if (aerror) {
-          return callback(aerror);
+          return callback(null, aerror);
         }
 
         // actually make the request now that the authentication has been added
@@ -3424,7 +3424,7 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
 
       return addAuthToRequest(request, authStrs, callProperties, (authReq, aerror) => {
         if (aerror) {
-          return callback(aerror);
+          return callback(null, aerror);
         }
 
         // actually make the request now that the authentication has been added
@@ -3433,7 +3433,8 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
     }
 
     if (authMethod === 'aws_authentication') {
-      let stsParams = null; let roleName = null;
+      let stsParams = null;
+      let roleName = null;
       if (request.authData) {
         stsParams = request.authData.stsParams;
         roleName = request.authData.roleName;
@@ -3449,7 +3450,12 @@ function requestAuthenticate(request, entitySchema, invalidToken, callProperties
       };
       return authUtilInst.getAWSAuthorization(request.header.method, reqObjAWS, request.header.path, service, stsParams, roleName, (signature, awsError) => {
         if (awsError) {
-          return callback(awsError);
+          return callback(null, awsError);
+        }
+        if (!signature) {
+          const errorObj = transUtilInst.formatErrorObject(origin, 'Failed to get AWS Signature', null, null, null, null);
+          log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
+          return callback(null, errorObj);
         }
         request.header.headers = { ...request.header.headers, ...signature };
         return makeRequest(request, entitySchema, callProperties, null, 0, callback);

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', 'session', 'session-id', 'jsessionid'];
+    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'];
 
     // add any additional items to scrub
     if (addItems && Array.isArray(addItems) && addItems.length > 0) {

package/lib/restHandler.js

@@ -8,7 +8,7 @@ const querystring = require('querystring');
 const jsonQuery = require('json-query');
 const jsonxml = require('jsontoxml');
 const xml2js = require('xml2js');
-const zlib = require('zlib');
+const zlib = require('node:zlib');
 
 const globalSchema = JSON.parse(require('fs').readFileSync(require('path').join(__dirname, '/../schemas/globalSchema.json')));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-utils",
-  "version": "5.7.0",
+  "version": "5.7.2",
   "description": "Itential Adapter Utility Libraries",
   "scripts": {
     "postinstall": "node utils/setup.js",
@@ -43,8 +43,7 @@
     "readline-sync": "^1.4.10",
     "socks-proxy-agent": "^8.0.1",
     "uuid": "^9.0.0",
-    "xml2js": "^0.6.0",
-    "zlib": "^1.0.5"
+    "xml2js": "^0.6.0"
   },
   "devDependencies": {
     "chai": "^4.3.7",