@itentialopensource/adapter-utils 5.10.7 → 5.10.9

package/lib/authenticationHandler.js

@@ -249,6 +249,21 @@ class AuthenticationHandler {
         return callback(authOpts.headers);
       }
 
+      const myDate = new Date().getTime();
+      const mySess = `${this.myid}-${myDate}`;
+
+      /* ADAPTER PROPERTIES AUTHENTICATION WITH GLOBAL ROLE */
+      // This will use the adapter role via the credentials provided to sign the call. If there is a global role for it to assume.
+      // it will use AWS Environment variables (access and secret key are null) to sign the call.
+      if (this.allProps.authentication.aws_access_key && this.allProps.authentication.aws_secret_key && this.allProps.authentication.aws_iam_role) {
+        log.info('Using Adapter PROPERTIES for AWS Authentication to assume a global role');
+        const parmas = {
+          RoleArn: this.allProps.authentication.aws_iam_role,
+          RoleSessionName: mySess
+        };
+        return this.assumeAWSSTSRole(null, null, null, options, parmas, true, callback);
+      }
+
       /* ROLE NAME AUTHENTICATION */
       // Different scenarios to discuss here
       // 1. IAM to internal AWS Server - either Task Role (roleName) or Adapter Role (aws_iam_role)
@@ -268,8 +283,6 @@ class AuthenticationHandler {
 
       // set up data for first assume role call
       const stsrole = new AWS.STS();
-      const myDate = new Date().getTime();
-      const mySess = `${this.myid}-${myDate}`;
       const stsData = {
         RoleArn: myRole,
         RoleSessionName: mySess,

package/lib/connectorRest.js

@@ -2018,8 +2018,10 @@ async function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
                 options.rejectUnauthorized = true;
                 if (sslCAFileContent && sslCAFileContent !== '') {
                   options.ca = [sslCAFileContent];
-                } else {
+                } else if (callProperties.ssl.ca_file) {
                   options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+                } else {
+                  options.ca = undefined;
                 }
               } catch (e) {
                 const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [callProperties.ssl.ca_file], null, null, null);
@@ -2049,9 +2051,7 @@ async function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
             } else if (sslCAFile) {
               options.ca = sslCAFile;
             } else {
-              const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [sslCAFilePath], null, null, null);
-              log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-              return reject(errorObj);
+              options.ca = undefined; // Node.js default CA store
             }
             // if there is a cert file, try to read in a cert file in the options
             if (sslCertFilePath) {
@@ -4510,7 +4510,7 @@ class ConnectorRest {
       }
 
       if (typeof props.ssl.ca_file_content === 'string' && props.ssl.ca_file_content.trim() !== '') {
-        sslCAFileContent = props.ssl.ca_file_content;
+        sslCAFileContent = props.ssl.ca_file_content.replace(/\\n/g, '\n');
       }
 
       // set the ssl key file (optional - default is null)
@@ -4780,8 +4780,10 @@ class ConnectorRest {
               options.rejectUnauthorized = true;
               if (sslCAFileContent && sslCAFileContent !== '') {
                 options.ca = [sslCAFileContent];
-              } else {
+              } else if (callProperties.ssl.ca_file) {
                 options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              } else {
+                options.ca = undefined; // Node.js default CA store
               }
             } catch (e) {
               const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [callProperties.ssl.ca_file], null, null, null);
@@ -4811,9 +4813,7 @@ class ConnectorRest {
           } else if (sslCAFile) {
             options.ca = sslCAFile;
           } else {
-            const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [sslCAFilePath], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
+            options.ca = undefined; // Node.js default CA store
           }
           // if there is a cert file, try to read in a cert file in the options
           if (sslCertFilePath) {
@@ -4977,8 +4977,10 @@ class ConnectorRest {
               options.rejectUnauthorized = true;
               if (sslCAFileContent && sslCAFileContent !== '') {
                 options.ca = [sslCAFileContent];
-              } else {
+              } else if (callProperties.ssl.ca_file) {
                 options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              } else {
+                options.ca = undefined; // Node.js default CA store
               }
             } catch (e) {
               const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [callProperties.ssl.ca_file], null, null, null);
@@ -5008,9 +5010,7 @@ class ConnectorRest {
           } else if (sslCAFile) {
             options.ca = sslCAFile;
           } else {
-            const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [sslCAFilePath], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
+            options.ca = undefined; // Node.js default CA store
           }
           // if there is a cert file, try to read in a cert file in the options
           if (sslCertFilePath) {

package/package.json

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