@itentialopensource/adapter-utils 5.10.8 → 5.10.10

package/lib/authenticationHandler.js

@@ -8,7 +8,7 @@
 
 const aws4 = require('aws4');
 const AWS = require('aws-sdk');
-const querystring = require('querystring');
+const querystring = require('node:querystring');
 
 /*
  * INTERNAL FUNCTION: update device broker properties from service instance config and adapter sample properties
@@ -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

@@ -27,7 +27,7 @@ const http = require('http');
 const cookieHandler = require('cookie');
 const jsonQuery = require('json-query');
 const xml2js = require('xml2js');
-const querystring = require('querystring');
+const querystring = require('node:querystring');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { SocksProxyAgent } = require('socks-proxy-agent');
 const AsyncLockCl = require('async-lock');

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

package/lib/restHandler.js

@@ -4,7 +4,7 @@
 /* global log */
 
 /* NodeJS internal utilities */
-const querystring = require('querystring');
+const querystring = require('node:querystring');
 const jsonQuery = require('json-query');
 const jsonxml = require('jsontoxml');
 const xml2js = require('xml2js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-utils",
-  "version": "5.10.8",
+  "version": "5.10.10",
   "description": "Itential Adapter Utility Libraries",
   "scripts": {
     "postinstall": "node utils/setup.js",
@@ -8,14 +8,13 @@
     "lint:errors": "eslint --quiet . --ext .json --ext .js",
     "test:unit": "mocha test/unit/lib/requestHandlerTest.js --LOG=error && mocha test/unit/lib/restHandlerTest.js --LOG=error && mocha test/unit/lib/propertyUtilTest.js --LOG=error && mocha test/unit/lib/translatorUtilTest.js --LOG=error && mocha test/unit/lib/dbUtilTest.js --LOG=error",
     "test:integration": "mocha test/integration/lib/requestHandlerTest.js --LOG=error && mocha test/integration/lib/restHandlerTest.js --LOG=error && mocha test/integration/lib/restHandlerMfaTest.js --LOG=error",
-    "test:cover": "nyc --reporter html --reporter text mocha --recursive --reporter dot test/*",
     "test": "npm run test:unit && npm run test:integration",
     "deploy": "npm publish --registry=https://registry.npmjs.org --access=public",
     "build": "npm run deploy"
   },
   "license": "Apache-2.0",
   "engines": {
-    "node": ">= 8.0.0",
+    "node": ">= 14.0.0",
     "npm": ">= 6.0.0"
   },
   "repository": {
@@ -25,7 +24,7 @@
   "author": "Itential",
   "homepage": "https://gitlab.com/itentialopensource/adapter-utils#readme",
   "dependencies": {
-    "ajv": "^8.12.0",
+    "ajv": "^8.17.1",
     "async-lock": "^1.4.0",
     "aws-sdk": "^2.1665.0",
     "aws4": "^1.9.1",
@@ -33,13 +32,12 @@
     "crypto-js": "^4.1.1",
     "ejs": "^3.1.10",
     "form-data": "^4.0.0",
-    "fs-extra": "^11.1.1",
+    "fs-extra": "^11.2.0",
     "https-proxy-agent": "^7.0.0",
     "json-query": "^2.2.2",
     "jsontoxml": "^1.0.1",
     "jsonwebtoken": "^9.0.1",
     "mongodb": "^3.7.4",
-    "querystring": "^0.2.0",
     "readline-sync": "^1.4.10",
     "socks-proxy-agent": "^8.0.1",
     "uuid": "^9.0.0",
@@ -51,13 +49,12 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-json": "^3.1.0",
-    "mocha": "^10.2.0",
+    "mocha": "^10.7.3",
     "nock": "^13.3.1",
-    "nyc": "^15.1.0",
     "strip-ansi": "^7.1.0",
     "strip-ansi-cli": "^3.0.2",
     "testdouble": "^3.18.0",
-    "winston": "^3.9.0"
+    "winston": "^3.14.2"
   },
   "private": false
 }