@itentialopensource/adapter-utils 4.48.12 → 4.48.14

package/CHANGELOG.md

@@ -1,4 +1,22 @@
 
+## 4.48.14 [05-09-2023]
+
+* modified connectorRest.js so that if there is a field named 'ca_file_content'...
+
+Closes ADAPT-2603
+
+See merge request itentialopensource/adapter-utils!255
+
+---
+
+## 4.48.13 [04-10-2023]
+
+* Update xm2json dependency version in package
+
+See merge request itentialopensource/adapter-utils!254
+
+---
+
 ## 4.48.12 [04-06-2023]
 
 * Update msa to handle get auth request

package/lib/connectorRest.js

@@ -76,6 +76,7 @@ let ecdhAuto = false;
 let sslEnabled = false;
 let sslAcceptInvalid = false;
 let sslCAFile = null;
+let sslCAFileContent = null;
 let sslKeyFile = null;
 let sslCertFile = null;
 let sslCiphers = null;
@@ -1900,7 +1901,11 @@ async function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
               // if we are not accepting invalid certs, need the ca file in the options
               try {
                 options.rejectUnauthorized = true;
-                options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+                if (sslCAFileContent && sslCAFileContent !== '') {
+                  options.ca = [sslCAFileContent];
+                } else {
+                  options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+                }
               } catch (e) {
                 const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [callProperties.ssl.ca_file], null, null, null);
                 log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -1925,7 +1930,11 @@ async function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
             // if we are not accepting invalid certs, need the ca file in the options
             try {
               options.rejectUnauthorized = true;
-              options.ca = [fs.readFileSync(sslCAFile)];
+              if (sslCAFileContent && sslCAFileContent !== '') {
+                options.ca = [sslCAFileContent];
+              } else {
+                options.ca = [fs.readFileSync(sslCAFile)];
+              }
             } catch (e) {
               const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [sslCAFile], null, null, null);
               log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -4058,6 +4067,10 @@ class ConnectorRest {
         sslCAFile = props.ssl.ca_file;
       }
 
+      if (typeof props.ssl.ca_file_content === 'string') {
+        sslCAFileContent = props.ssl.ca_file_content;
+      }
+
       // set the ssl key file (optional - default is null)
       if (typeof props.ssl.key_file === 'string') {
         sslKeyFile = props.ssl.key_file;
@@ -4150,7 +4163,7 @@ class ConnectorRest {
               return callback(false);
             }
           }
-          if (sslEnabled && !sslAcceptInvalid && !sslCAFile) {
+          if (sslEnabled && !sslAcceptInvalid && (!sslCAFile || !sslCAFileContent)) {
             log.error(`${origin}: FAILED TO LOAD - missing required CA File`);
             return callback(false);
           }
@@ -4194,7 +4207,7 @@ class ConnectorRest {
         return callback(false);
       }
     }
-    if (sslEnabled && !sslAcceptInvalid && !sslCAFile) {
+    if (sslEnabled && !sslAcceptInvalid && (!sslCAFile || !sslCAFileContent)) {
       log.error(`${origin}: FAILED TO LOAD - missing required CA File`);
       return callback(false);
     }
@@ -4309,7 +4322,11 @@ class ConnectorRest {
             // if we are not accepting invalid certs, need the ca file in the options
             try {
               options.rejectUnauthorized = true;
-              options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              if (sslCAFileContent && sslCAFileContent !== '') {
+                options.ca = [sslCAFileContent];
+              } else {
+                options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              }
             } catch (e) {
               const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [callProperties.ssl.ca_file], null, null, null);
               log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -4334,7 +4351,11 @@ class ConnectorRest {
           // if we are not accepting invalid certs, need the ca file in the options
           try {
             options.rejectUnauthorized = true;
-            options.ca = [fs.readFileSync(sslCAFile)];
+            if (sslCAFileContent && sslCAFileContent !== '') {
+              options.ca = [sslCAFileContent];
+            } else {
+              options.ca = [fs.readFileSync(sslCAFile)];
+            }
           } catch (e) {
             const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [sslCAFile], null, null, null);
             log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -4496,7 +4517,11 @@ class ConnectorRest {
             // if we are not accepting invalid certs, need the ca file in the options
             try {
               options.rejectUnauthorized = true;
-              options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              if (sslCAFileContent && sslCAFileContent !== '') {
+                options.ca = [sslCAFileContent];
+              } else {
+                options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              }
             } catch (e) {
               const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [callProperties.ssl.ca_file], null, null, null);
               log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -4521,7 +4546,11 @@ class ConnectorRest {
           // if we are not accepting invalid certs, need the ca file in the options
           try {
             options.rejectUnauthorized = true;
-            options.ca = [fs.readFileSync(sslCAFile)];
+            if (sslCAFileContent && sslCAFileContent !== '') {
+              options.ca = [sslCAFileContent];
+            } else {
+              options.ca = [fs.readFileSync(sslCAFile)];
+            }
           } catch (e) {
             const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [sslCAFile], null, null, null);
             log.error(`${origin}: ${errorObj.IAPerror.displayString}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-utils",
-  "version": "4.48.12",
+  "version": "4.48.14",
   "description": "Itential Adapter Utility Libraries",
   "scripts": {
     "postinstall": "node utils/setup.js",
@@ -41,7 +41,7 @@
     "readline-sync": "^1.4.10",
     "socks-proxy-agent": "^4.0.2",
     "uuid": "^8.3.2",
-    "xml2js": "^0.4.23"
+    "xml2js": "^0.5.0"
   },
   "devDependencies": {
     "chai": "^4.3.4",
@@ -50,12 +50,12 @@
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-json": "^3.0.0",
     "mocha": "^9.0.1",
+    "nock": "^13.2.9",
     "nyc": "^15.1.0",
     "strip-ansi": "^7.0.1",
     "strip-ansi-cli": "^3.0.1",
     "testdouble": "^3.16.1",
-    "winston": "^3.3.3",
-    "nock": "^13.2.9"
+    "winston": "^3.3.3"
   },
   "peerDependencies": {},
   "private": false