@newrelic/security-agent 0.5.0 → 0.7.0

package/lib/instrumentation-security/hooks/http/nr-http.js

@@ -46,7 +46,7 @@ const CSEC_HOME_TMP = `${CSEC_HOME}/nr-security-home/tmp/language-agent/${proces
  * @param {*} moduleName 
  */
 function initialize(shim, mod, moduleName) {
-  logger.info('Instrumenting HTTP module');
+  logger.info(`Instrumenting ${moduleName}`);
   emitHook(shim, mod, moduleName);
   createServerHook(shim, mod, moduleName);
   outboundHook(shim, mod, 'request', moduleName);
@@ -87,7 +87,11 @@ function setupRequestMapCleanup() {
  * @param {*} moduleName 
  */
 function outboundHook(shim, mod, method, moduleName) {
+  logger.debug(`Instrumenting ${moduleName}.${method}`);
   shim.wrap(mod, method, function makeRequestWrapper(shim, fn) {
+    if (!shim.isFunction(fn)) {
+      return fn
+    }
     return function requestWrapper() {
       const request = requestManager.getRequest(shim);
       const data = {};
@@ -206,6 +210,7 @@ function addRequestData(shim, request) {
     const data = Object.assign({});
     const segment = shim.getActiveSegment();
     if (segment && segment.transaction) {
+      data.protocol = (request.connection && request.connection.encrypted) ? 'https' : 'http';
       data.body = null;
       data.headers = request.headers;
       data.url = request.url;
@@ -255,6 +260,10 @@ function addRequestData(shim, request) {
  */
 function emitHook(shim, mod, moduleName) {
   shim.wrap(mod && mod.Server && mod.Server.prototype, 'emit', function makeEmitWrapper(shim, fn) {
+    logger.debug(`Instrumenting ${moduleName}.Server.prototype.emit`);
+    if (!shim.isFunction(fn)) {
+      return fn
+    }
     return function emitWrapper() {
       const req = arguments[1];
       const resp = arguments[2];
@@ -265,6 +274,9 @@ function emitHook(shim, mod, moduleName) {
         }
 
         shim.wrap(req, 'on', function makeOnWrapper(shim, fn) {
+          if (!shim.isFunction(fn)) {
+            return fn
+          }
           return function OnWrapper() {
             if (!requestManager.getRequest(shim)) {
               addRequestData(shim, req);
@@ -292,10 +304,17 @@ function emitHook(shim, mod, moduleName) {
  * @param {*} shim 
  * @param {*} mod 
  */
-function createServerHook(shim, mod) {
+function createServerHook(shim, mod, moduleName) {
   shim.wrap(mod, 'createServer', function createServerWrapper(shim, fn) {
+    logger.debug(`Instrumenting ${moduleName}.createServer`);
+    if (!shim.isFunction(fn)) {
+      return fn
+    }
     return function wrappedCreateServer() {
       shim.wrap(arguments, '0', function appWrapper(shim, fn) {
+        if (!shim.isFunction(fn)) {
+          return fn
+        }
         return function wrappedApp() {
           let req = arguments[0];
           if (!requestManager.getRequest(shim)) {
@@ -316,6 +335,9 @@ function createServerHook(shim, mod) {
  */
 function onDataHook(shim, mod) {
   shim.wrap(mod, '1', function makeOnDataWrapper(shim, fn) {
+    if (!shim.isFunction(fn)) {
+      return fn
+    }
     return function onDataWrapper() {
       const chunk = arguments[0];
       const chunkType = typeof chunk;
@@ -347,6 +369,9 @@ function responseHook(resp, req, shim) {
   resp.res.body = EMPTY_STRING;
 
   shim.wrap(resp, 'write', function makeWriteWrapper(shim, fn) {
+    if (!shim.isFunction(fn)) {
+      return fn
+    }
     return function wrappedWrite() {
       const response = this;
       responseBodyCompute(response, arguments);
@@ -355,6 +380,9 @@ function responseHook(resp, req, shim) {
   })
   // wrapper for response.end() 
   shim.wrap(resp, 'end', function makeEndWrapper(shim, fn) {
+    if (!shim.isFunction(fn)) {
+      return fn
+    }
     return function wrappedEnd() {
       const response = this;
       responseBodyCompute(response, arguments);
@@ -362,30 +390,94 @@ function responseHook(resp, req, shim) {
       const construct = API.checkForReflectedXSS(request, response.res.body, response.getHeaders());
       const policy = API.getPolicy();
       const dynamicScanningFlag = policy.data ? (policy.data.vulnerabilityScan?.enabled && policy.data.vulnerabilityScan.iastScan.enabled) : false;
-      if (request && (construct || dynamicScanningFlag)) {
+      const type = response.getHeader(CONTENT_TYPE);
+      let isUnsupportedType = isUnsupportedContentType(type);
+      
+      if (request && (construct || dynamicScanningFlag) && !isUnsupportedType) {
         const args = [];
         args.push(construct);
         args.push(response.res.body);
         const traceObject = secUtils.getTraceObject(shim);
         const secMetadata = securityMetaData.getSecurityMetaData(request, args, traceObject, secUtils.getExecutionId(), EVENT_TYPE.REFLECTED_XSS, EVENT_CATEGORY.REFLECTED_XSS)
         const secEvent = API.generateSecEvent(secMetadata);
-
+        secEvent.httpResponse  = {};
+        secEvent.httpResponse.contentType = response.getHeader(CONTENT_TYPE);
         API.sendEvent(secEvent);
       }
       return fn.apply(this, arguments);
     }
   })
 }
+/**
+ * Utility to check unsupported content types
+ * @param {*} conType 
+ * @returns 
+ */
+function isUnsupportedContentType(conType) {
+  try {
+    if (!conType) {
+      return true;
+    }
+    const unsupportedTypes = ["video/",
+      "image/",
+      "font/",
+      "audio/",
+      "application/zip",
+      "application/epub+zip",
+      "application/gzip",
+      "application/java-archive",
+      "application/msword",
+      "application/octet-stream",
+      "application/ogg",
+      "application/pdf",
+      "application/rtf",
+      "application/vnd.amazon.ebook",
+      "application/vnd.apple.installer+xml",
+      "application/vnd.ms-excel",
+      "application/vnd.ms-fontobject",
+      "application/vnd.ms-powerpoint",
+      "application/vnd.oasis.opendocument.presentation",
+      "application/vnd.oasis.opendocument.spreadsheet",
+      "application/vnd.oasis.opendocument.text",
+      "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+      "application/vnd.rar",
+      "application/vnd.visio",
+      "application/x-7z-compressed",
+      "application/x-abiword",
+      "application/x-bzip",
+      "application/x-bzip2",
+      "application/x-cdf",
+      "application/x-freearc",
+      "application/x-tar",
+      "application/zip",
+      "text/calendar"
+    ];
+
+    const startsWithAny = unsupportedTypes.some(prefix => conType.startsWith(prefix));
+    return startsWithAny;
+  } catch (error) {
+    logger.debug("Error while checking unsupported content type");
+  }
+
+}
 
 function responseBodyCompute(response, args) {
   let encoding = UTF8;
   const type = response.getHeader(CONTENT_TYPE);
+  let isUnsupportedType = isUnsupportedContentType(type);
+  if (isUnsupportedType) {
+    return;
+  }
+
   let contentType = TEXT_HTML;
   if (type) {
     const obj = ConType.parse(type);
     contentType = obj.type;
     encoding = obj.parameters.charset;
   }
+
   if (args[0]) {
     switch (contentType) {
       case APPLICATION_JSON:

package/lib/instrumentation-security/hooks/koa/@koa/nr-@koa-router.js

@@ -20,7 +20,7 @@ const logger = API.getLogger();
  * @param {*} moduleName 
  */
 function initialize(shim, mod, moduleName) {
-    logger.info('Instrumenting @koa/router');
+    logger.info(`Instrumenting ${moduleName}`);
     const VerbMethods = ['all', 'delete', 'get', 'head', 'opts', 'post', 'put', 'patch'];
 
     // RouteMap hooks
@@ -29,6 +29,7 @@ function initialize(shim, mod, moduleName) {
             if (!shim.isFunction(fn)) {
                 return fn
             }
+            logger.debug(`Instrumenting ${moduleName}.prototype.${fun}`);
             return function wrappedRoute() {
                 try {
                     const stakTrace = secUtils.traceElementForRoute();
@@ -59,6 +60,7 @@ function initialize(shim, mod, moduleName) {
  */
 function paramHook(shim, mod, moduleName) {
     shim.wrap(mod && mod.prototype, 'params', function wrapMatch(shim, fn) {
+        logger.debug(`Instrumenting ${moduleName}.prototype.params`);
         return function wrappedMatch() {
             const segment = shim.getActiveSegment();
             if (segment && segment.transaction) {

package/lib/instrumentation-security/hooks/ldap/nr-ldap.js

@@ -35,6 +35,7 @@ function initialize(shim, mod, moduleName){
  */
 function ldapHooks(shim, mod, methodName, moduleName){
     shim.wrap(mod, methodName, function makeWrapper(shim,fn){
+      logger.debug(`Instrumenting ${moduleName}.${methodName}`);
         return function wrapper(){
           const param = {};
           param.name = arguments[0];

package/lib/instrumentation-security/hooks/mongodb/common.js

@@ -55,6 +55,7 @@ function payloadType(obj) {
 
 function queryHook(shim, mod, method) {
   shim.wrap(mod, method, function makeQueryWrapper(shim, fn) {
+    logger.debug(`Instrumenting mongodb.${method}`);
     return function queryWrapper() {
       const request = requestManager.getRequest(shim);
       if (CURSOR_OPS.includes(method)) {
@@ -194,6 +195,7 @@ function callbackHook(shim, mod, fun, secEvent) {
 
 common.queryHookV2 = function queryHookV2(shim, mod, method) {
   shim.wrap(mod, method, function makeQueryWrapper(shim, fn) {
+    logger.debug(`Instrumenting mongodb.${method}`);
     return function queryWrapper() {
       const request = requestManager.getRequest(shim);
       if (CURSOR_OPS.includes(method)) {

package/lib/instrumentation-security/hooks/mongodb/nr-mongodb.js

@@ -32,7 +32,7 @@ module.exports = initialize;
  * @param {Shim} shim
  */
 function initialize(shim, mongodb, moduleName) {
-  logger.info("Instrumenting Mongodb");
+  logger.info(`Instrumenting ${moduleName}`);
   if (!mongodb) {
     return;
   }

package/lib/instrumentation-security/hooks/mysql/nr-mysql.js

@@ -18,7 +18,7 @@ const symbols = {
   createPoolCluster: Symbol('createPoolCluster'),
   wrappedPoolConnection: Symbol('wrappedPoolConnection')
 }
-
+let modName = '';
 module.exports = initialize;
 
 /**
@@ -28,6 +28,7 @@ module.exports = initialize;
  * @param {*} moduleName 
  */
 function initialize(shim, mysql, moduleName) {
+  modName = moduleName;
   logger.info("Instrumenting", moduleName);
   if (shim._moduleRoot.includes("mysql2")) {
     promiseInitialize(shim, mysql, moduleName);
@@ -119,6 +120,7 @@ function wrapGetConnection(shim, connectable) {
 
   const proto = Object.getPrototypeOf(connectable);
   shim.wrap(proto, "getConnection", function doWrapGetConnection(shim, fn) {
+    logger.debug(`Instrumenting ${modName}.getConnection`);
     return function wrappedGetConnection() {
       const args = shim.toArray(arguments);
       const cbIdx = args.length - 1;
@@ -208,7 +210,7 @@ function extractQueryArgs(shim, args) {
     // query(opts [, values], callback)
     rawQuery = args[0].sql;
     try {
-      if (args[0].values && typeof args[0].values  == 'object') {
+      if (args[0].values && typeof args[0].values == 'object') {
         param = Object.values(args[0].values)
       }
     } catch (error) {
@@ -240,6 +242,7 @@ function extractQueryArgs(shim, args) {
  */
 function queryHook(shim, mod, method, isPoolQuery) {
   shim.wrap(mod, method, function makeQueryWrapper(shim, fn) {
+    logger.debug(`Instrumenting ${modName}.${method}`);
     return function queryWrapper() {
       const parameters = extractQueryArgs(shim, arguments);
       shim.interceptedArgs = parameters;

package/lib/instrumentation-security/hooks/native/nr-childProcess.js

@@ -26,6 +26,7 @@ function initialize(shim, childProcess, moduleName) {
  */
 function execFileHook(shim, childProcess, moduleName) {
   shim.wrap(childProcess, "execFile", function makeWrapper(shim, fn) {
+    logger.debug(`Instrumenting ${moduleName}.execFile`);
     return function wrapper() {
       const interceptedArgs = [arguments[0]];
       shim.interceptedArgs = interceptedArgs;
@@ -54,6 +55,7 @@ function execFileHook(shim, childProcess, moduleName) {
  */
 function spawnSyncHook(shim, childProcess, moduleName) {
   shim.wrap(childProcess, "spawn", function makeWrapper(shim, fn) {
+    logger.debug(`Instrumenting ${moduleName}.spawnSync`);
     return function wrapper() {
       const interceptedArgs = arguments[0].args;
       shim.interceptedArgs = interceptedArgs;
@@ -83,6 +85,7 @@ function spawnSyncHook(shim, childProcess, moduleName) {
  */
 function spawnHook(shim, childProcess, moduleName) {
   shim.wrap(childProcess, "spawn", function makeWrapper(shim, fn) {
+    logger.debug(`Instrumenting ${moduleName}.spawn`);
     return function wrapper() {
       let param = [];
       param.push(arguments[0]);

package/lib/instrumentation-security/hooks/postgres/nr-postgres.js

@@ -66,6 +66,7 @@ module.exports = function initialize(shim, pgsql, moduleName) {
 
 function queryHook(shim, mod, method){
   shim.wrap(mod, method, function makeQueryWrapper(shim, fn){
+    logger.debug(`Instrumenting pg.${method}`);
       return function queryWrapper(){
           const request = requestManager.getRequest(shim);
           const sqlArgs = [];

package/lib/instrumentation-security/hooks/require/nr-require.js

@@ -73,7 +73,8 @@ function requireHook(shim, moduleName, parent) {
             }
         }
         if (request) {
-            const interceptedArgs = [moduleName];
+            let resolvedModulePath  = require.resolve(moduleName)
+            const interceptedArgs = [resolvedModulePath];
             let traceObject;
             if (!fallback) {
                 traceObject = secUtils.getTraceObject(shim);
@@ -86,7 +87,7 @@ function requireHook(shim, moduleName, parent) {
             API.sendEvent(secEvent);
         }
     } catch (error) {
-
+       
     }
 
 

package/lib/instrumentation-security/hooks/restify/nr-restify.js

@@ -21,12 +21,13 @@ const logger = API.getLogger();
  * @param {*} moduleName 
  */
 function initialize(shim, mod, moduleName) {
-    logger.info('Instrumenting Restify');
+    logger.info(`Instrumenting ${moduleName}`);
     try {
         const registryRadix = shim.require("./lib/routerRegistryRadix");
 
         //routerRadix hook
         shim.wrap(registryRadix && registryRadix.prototype, 'add', function makeWrapper(shim, fn) {
+            logger.info(`Instrumenting registryRadix.prototype.add`);
             return function wrapper() {
                 if (arguments[0]) {
                     try {
@@ -47,6 +48,7 @@ function initialize(shim, mod, moduleName) {
         const router = shim.require("./lib/router");
 
         shim.wrap(router && router.prototype, 'lookup', function lookupWrapper(shim, fn) {
+            logger.info(`Instrumenting router.prototype.lookup`);
             return function wrappedLookup() {
                 const result = fn.apply(this, arguments);
                 extractParams(shim, arguments[0]);

package/lib/instrumentation-security/hooks/xpath/nr-xpath.js

@@ -27,7 +27,7 @@ function initialize(shim, mod, moduleName){
     xpathHooks(shim, mod, 'useNamespaces', moduleName);
   }
   else if(moduleName==='xpath.js'){
-    wrappedXPathDotJS(shim, mod);
+    wrappedXPathDotJS(shim, mod, moduleName);
   }
   
 }
@@ -40,6 +40,7 @@ function initialize(shim, mod, moduleName){
  */
 function xpathHooks(shim, mod, methodName, moduleName){
     shim.wrap(mod, methodName, function makeWrapper(shim,fn){
+      logger.debug(`Instrumenting ${moduleName}.${methodName}`);
         return function wrapper(){
           const interceptedArgs = [arguments[0]];
           shim.interceptedArgs = interceptedArgs;
@@ -67,8 +68,9 @@ function xpathHooks(shim, mod, methodName, moduleName){
  * @param {*} shim 
  * @param {*} mod 
  */
-function wrappedXPathDotJS(shim, mod){
+function wrappedXPathDotJS(shim, mod, moduleName){
   const wrappedExport = shim.wrapExport(mod, function wrapXpathJSModule(shim, fn) {
+    logger.debug(`Instrumenting ${moduleName}`);
     return function wrappedXpathJSModule() {
       const interceptedArgs = [arguments[1]];
       shim.interceptedArgs = interceptedArgs;

package/lib/nr-security-agent/index.js

@@ -14,6 +14,9 @@ const agentConfig = require('./resources/config');
 const shaSizeUtil = require('./lib/core/sha-size-util');
 const njsAgentConstants = require('./lib/core/sec-agent-constants');
 
+const NRLogger = API.newrelic.shim.logger.child({ component: 'security-agent' });
+NRLogger.info("Starting New Relic Node.js Security Agent ");
+
 const {
     IS_LAMBDA_ENV,
     AWS_LAMBDA_FUNCTION_NAME_ENV_IDENTIFIER,
@@ -106,6 +109,7 @@ function initialize() {
     initLogger.info("[STEP-3] => Gathering information about the application :", JSON.stringify(applicationInfo));
     if (NRAgent) {
         NRAgent.on('started', () => {
+            NRLogger.info("Started New Relic Node.js Security Agent");
             if (NRAgent.config.security.enabled || !NRAgent.config.high_security) {
                 wsClient.initialize();
                 logger.info('NR Agent started with agent_run_id:', NRAgent.config.run_id, NRAgent.config.account_id);
@@ -113,7 +117,8 @@ function initialize() {
                 Agent.setNRAgent(NRAgent);
             }
             else {
-                logger.info("security.enabled flag is set to false")
+                logger.warn("security.enabled flag is set to false");
+                NRLogger.warn("Failed to Start New Relic Node.js Security Agent. Please check security.enabled and high_security flags");
             }
         });
     }
@@ -131,9 +136,9 @@ function initialize() {
             }
         }
         logger.info(LOG_MESSAGES.AGENT_INFO, applicationInfo.collectorVersion, applicationInfo.jsonVersion, applicationInfo.buildNumber);
-        
+
         applicationInfoModule.addProperty('serverInfo.deployedApplications', applications);
-        
+
         shaSizeUtil.setLogger(logger);
 
         // Initialize Agent Status
@@ -159,7 +164,7 @@ function getProcCMDLineSanitized(applicationInfoModule) {
 }
 
 (() => {
-    if(!NRAgent.config.security.enabled){
+    if (!NRAgent.config.security.enabled) {
         logger.warn("security.enabled flag is set to false");
         return;
     }

package/lib/nr-security-agent/lib/core/Auth-headers.js

@@ -9,6 +9,8 @@ const appInfo = require('./applicationinfo').getInstance();
 const logs = require('./logging');
 const logger = logs.getLogger();
 const initLogger = logs.getInitLogger();
+const LinkingMetaData = require('./LinkingMetadata');
+const LogMessage = require('./LogMessage');
 
 
 /* eslint-disable camelcase */
@@ -20,6 +22,7 @@ function AuthHeaders() {
     try {
         const NRAgent = API.getNRAgent();
         authHeaders = {}
+        const metadata = LinkingMetaData.getLinkingMetadata();
         authHeaders['NR-CSEC-CONNECTION-TYPE'] = 'LANGUAGE_COLLECTOR';
         authHeaders['NR-AGENT-RUN-TOKEN'] = NRAgent.config.run_id;
         const COLLECTOR_VERSION = appInfo.collectorVersion || '';
@@ -32,8 +35,12 @@ function AuthHeaders() {
         authHeaders['NR-ACCOUNT-ID'] = NRAgent.config.account_id;
         authHeaders['NR-LICENSE-KEY'] = NRAgent ? NRAgent.config.license_key : '';
         authHeaders["NR-CSEC-IAST-DATA-TRANSFER-MODE"] = "PULL";
+        authHeaders['NR-CSEC-ENTITY-NAME'] = metadata['entity.name'] ? metadata['entity.name'] : '';
+        authHeaders['NR-CSEC-ENTITY-GUID'] = metadata['entity.guid'] ? metadata['entity.guid'] : '';
     } catch (error) {
         logger.error("Exception in preparing auth headers:", error);
+        const logMessage = new LogMessage.logMessage("SEVERE", 'Exception in preparing auth headers', __filename, error);
+        commonUtils.addLogEventtoBuffer(logMessage);
     }
 
     return authHeaders;

package/lib/nr-security-agent/lib/core/LogMessage.js

@@ -6,6 +6,8 @@
 const LinkingMetaData = require('./LinkingMetadata');
 const API = require('../../../nr-security-api');
 const NRAgent = API.getNRAgent();
+const { BasicInfo } = require('./event');
+const applicationInfo = require('./applicationinfo').getInstance();
 
 /**
  * constructor function to create LogMessageException object
@@ -13,10 +15,22 @@ const NRAgent = API.getNRAgent();
  * @param {*} cause
  * @param {*} stacktrace
  */
-function logMessageException (exception) {
-    this.message = exception.message;
-    this.cause = exception.cause ? exception.cause : '';
-    this.stacktrace = exception.stack;
+function logMessageException(exception) {
+    let exceptionObject = {};
+    try {
+        exceptionObject.message = exception.message ? exception.message : '';
+        exceptionObject.cause = null;
+        if (exception.stack) {
+            let stacktraceInList = exception.stack.split('\n');
+            stacktraceInList = stacktraceInList.slice(1);
+            exceptionObject.stacktrace = stacktraceInList;
+        }
+
+    } catch (error) {
+
+    }
+
+    return exceptionObject;
 }
 
 /**
@@ -28,17 +42,29 @@ function logMessageException (exception) {
   * @param {*} exception
   * @param {*} linkingMetadata
   */
-function logMessage (level, message, caller, exception) {
-    this.timestamp = Date.now();
-    this.level = level;
-    this.message = message;
-    this.caller = caller;
-    if (exception) {
-        this.exception = logMessageException(exception);
-    }
-    if (NRAgent) {
-        this.linkingMetadata = LinkingMetaData.getLinkingMetadata();
+function logMessage(level, message, caller, exception) {
+    try {
+        BasicInfo.call(this);
+        this.jsonVersion = applicationInfo.jsonVersion;
+        this.pid = applicationInfo.pid ? applicationInfo.pid : null;
+        this.jsonName = 'critical-messages';
+        this.applicationUUID = applicationInfo.applicationUUID;
+        this.groupName = applicationInfo.groupName;
+        this.policyVersion = applicationInfo.policyVersion;
+        this.timestamp = Date.now();
+        this.level = level ? level : 'SEVERE';
+        this.message = message;
+        this.caller = caller;
+        if (exception) {
+            this.exception = logMessageException(exception);
+        }
+        if (NRAgent) {
+            this.linkingMetadata = LinkingMetaData.getLinkingMetadata();
+        }
+    } catch (error) {
+
     }
+
 }
 
 module.exports = {

package/lib/nr-security-agent/lib/core/commonUtils.js

@@ -12,16 +12,19 @@ const OS = require('os');
 const path = require('path');
 const checkDiskSpace = require('check-disk-space').default;
 const AgentStatus = require('../core/agent-status');
-const { LOG_MESSAGES, CSEC_HOME, SLASH } = require('./sec-agent-constants');
+const { CSEC_HOME, SLASH } = require('./sec-agent-constants');
 
-const prettyBytes = require('pretty-bytes');
 const njsAgentConstants = require('./sec-agent-constants');
-const LinkingMetaData = require('./LinkingMetadata');
 const API = require('../../../nr-security-api');
 const NRAgent = API.getNRAgent();
 const lodash = require('lodash')
 const backupLogFileRegex = /.log.\d/gm;
 let websocketHealth;
+
+const ringBuffer = require('ringbufferjs');
+const bufferedLogEvents = new ringBuffer(10);
+
+
 /**
  * Utility to generate UUID
  * @returns UUID
@@ -103,6 +106,9 @@ function createPathIfNotExist(dir) {
         }
     } catch (error) {
         logger.debug(dir + ' Not Created', error);
+        const LogMessage = require('./LogMessage');
+        const logMessage = new LogMessage.logMessage("SEVERE", 'Error in creating directory', __filename, error);
+        addLogEventtoBuffer(logMessage);
     }
 }
 
@@ -281,6 +287,9 @@ function removeOlderSnapshots() {
         }
     } catch (error) {
         logger.debug(error);
+        const LogMessage = require('./LogMessage');
+        const logMessage = new LogMessage.logMessage("SEVERE", 'Error in processing snapshot files', __filename, error);
+        addLogEventtoBuffer(logMessage);
     }
 }
 /**
@@ -417,6 +426,26 @@ function getWSHealthStatus() {
     }
 }
 
+/**
+ * return buffered Log Event instance.
+ */
+function getLogEvents() {
+    return bufferedLogEvents;
+}
+
+
+/**
+ * Utility to add error object in error buffer
+ * @param {*} error
+ */
+function addLogEventtoBuffer(logMessage) {
+    try {
+        bufferedLogEvents.enq(logMessage);
+    } catch (error) {
+        logger.debug(error);
+    }
+}
+
 module.exports = {
     getUUID,
     getKindIdPair,
@@ -438,5 +467,7 @@ module.exports = {
     getCSECmode,
     getPathOfCACert,
     getWSHealthStatus,
-    setWSHealthStatus
+    setWSHealthStatus,
+    addLogEventtoBuffer,
+    getLogEvents
 };

package/lib/nr-security-agent/lib/core/connections/aws-lambda-client.js

@@ -38,16 +38,14 @@ function invokeLambda (arn, version, data) {
 }
 
 function init () {
-    if (
-        !process.csecRuntimeSupportsFunctionGenerators ||
-        !process.csecRuntimeSupportsAsyncFunctionGenerators
-    ) {
-        return;
+    try {
+        const { Lambda } = require('@aws-sdk/client-lambda');
+        lambdaClient = new Lambda();
+    } catch (error) {
+        logger.error("Unable to initialize lambda client", error);
     }
-
-    const { Lambda } = require('@aws-sdk/client-lambda');
-    lambdaClient = new Lambda();
 }
+
 init();
 
 module.exports = {