@newrelic/security-agent 0.5.0 → 0.7.0

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+### v0.7.0 (2024-01-18)
+#### Features
+* Handling to exclude unsupported content types from rxss processing
+* Handling to report errors/critical messages to Security Engine
+#### Bug fixes
+* Fix for file operation event's parameter must be absolute path of file
+* Fix for ReferenceError of commonUtils module
+#### Miscellaneous chores
+* Updated log event jsonName to "critical-messages"
+* Removed dependency @aws-sdk/client-lambda
+* Bumped follow-redirects from v1.15.2 to v1.15.4  
+* Upgraded axios to v1.6.5 
+
+### v0.6.0 (2024-01-03)
+#### Features
+* Added ws headers NR-CSEC-ENTITY-GUID and NR-CSEC-ENTITY-NAME
+* Updated jsonVersion to 1.1.1 in security events
+* Support to send important logs/errors to security engine
+#### Bug fixes
+* Added missing protocol in http request object
+* Fix for honouring probing interval from policy
+#### Miscellaneous chores
+* Added nestjs test cases
+* Additional logging for instrumented modules and methods 
+* Upgraded axios to v1.6.3
+* Removed pinned version for axios and check-disk-space
+* Update in lockfileVersion of package-lock.json
+* Updated @babel/traverse, protobufjs, fast-xml-parser and @aws-sdk/credential-providers
+* Updated Readme.md
+
+
 ### v0.5.0 (2023-11-17)
 #### Features
 * IAST support for NestJS framework

package/README.md

@@ -62,6 +62,7 @@ The [Developer docs](http://newrelic.github.io/node-newrelic/) for writing instr
 - [fastify](https://www.npmjs.com/package/fastify)(2.x, 3.x and 4.x)
 - [restify](https://www.npmjs.com/package/restify)(8.x, 9.x, 10.x and 11.x)
 - [director](https://www.npmjs.com/package/director)(1.2.x)
+- [@nestjs/core](https://www.npmjs.com/package/@nestjs/core)(8.x and above)
 - [ldapjs](https://www.npmjs.com/package/ldapjs)(2.x and above)
 - [ldapts](https://www.npmjs.com/package/ldapts)(2.x and above)
 - [xpath](https://www.npmjs.com/package/xpath)(0.0.20 and above)

package/THIRD_PARTY_NOTICES.md

@@ -14,7 +14,6 @@ code, the source code can be found at [https://github.com/newrelic/csec-node-age
 
 **[dependencies](#dependencies)**
 
-* [@aws-sdk/client-lambda](#aws-sdkclient-lambda)
 * [axios](#axios)
 * [check-disk-space](#check-disk-space)
 * [content-type](#content-type)
@@ -73,218 +72,9 @@ code, the source code can be found at [https://github.com/newrelic/csec-node-age
 
 ## dependencies
 
-### @aws-sdk/client-lambda
-
-This product includes source derived from [@aws-sdk/client-lambda](https://github.com/aws/aws-sdk-js-v3) ([v3.436.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.436.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.436.0/LICENSE):
-
-```
-                                Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-```
-
 ### axios
 
-This product includes source derived from [axios](https://github.com/axios/axios) ([v1.6.0](https://github.com/axios/axios/tree/v1.6.0)), distributed under the [MIT License](https://github.com/axios/axios/blob/v1.6.0/LICENSE):
+This product includes source derived from [axios](https://github.com/axios/axios) ([v1.6.5](https://github.com/axios/axios/tree/v1.6.5)), distributed under the [MIT License](https://github.com/axios/axios/blob/v1.6.5/LICENSE):
 
 ```
 # Copyright (c) 2014-present Matt Zabriskie & Collaborators

package/lib/instrumentation-security/core/sec-utils.js

@@ -172,6 +172,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;

package/lib/instrumentation-security/hooks/@nestjs/nr-nestjs-core.js

@@ -40,6 +40,7 @@ module.exports = function initialize(shim) {
     if (!shim.isFunction(fn)) {
       return fn
     }
+    logger.debug(`Instrumenting routerExplorer.prototype.applyCallbackToRouter`)
     return function wrappedApplyCallbackToRouter() {
       try {
         const stakTrace = secUtils.traceElementForRoute();

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

@@ -42,6 +42,7 @@ function wrapExpress4(shim, express) {
     if (!shim.isFunction(fn)) {
       return fn
     }
+    logger.debug('Instrumenting express.Router.route');
     return function wrappedRoute() {
       try {
         const stakTrace = secUtils.traceElementForRoute();
@@ -62,6 +63,7 @@ function wrapExpress4(shim, express) {
     if (!shim.isFunction(fn)) {
       return fn
     }
+    logger.debug('Instrumenting express.Router.process_params')
     return function wrappedParam() {
       extractParams(shim, arguments[2]);
       const route = fn.apply(this, arguments)

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

@@ -40,6 +40,7 @@ const setupRouteHandler = (shim, fastify, moduleName) => {
       if (!shim.isFunction(fn)) {
         return fn
       }
+      logger.debug(`Instrumenting ${moduleName}.${fun}`);
       return function wrappedRoute() {
         try {
           const stakTrace = secUtils.traceElementForRoute();

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

@@ -94,8 +94,8 @@ const promiseFunctionProbableToFI = [
  */
 function initialize(shim, mod, moduleName) {
 
-  
-  logger.info("Instrumenting FS module");
+
+  logger.info(`Instrumenting ${moduleName}`);
   requireHook.initialize(shim)
   const binding = process.binding("fs");
   openHook(shim, binding, moduleName);
@@ -116,8 +116,9 @@ function initialize(shim, mod, moduleName) {
  */
 function openHook(shim, mod, moduleName) {
   shim.wrap(mod, "open", function makeOpenWrapper(shim, fn) {
+    logger.debug(`Instrumenting ${moduleName}.open`);
     return function openWrapper() {
-      const parameters = Array.prototype.slice.apply(arguments);
+      let parameters = Array.prototype.slice.apply(arguments);
       const interceptedArgs = [arguments[0]];
       shim.interceptedArgs = interceptedArgs;
       const request = requestManager.getRequest(shim);
@@ -128,7 +129,7 @@ function openHook(shim, mod, moduleName) {
           parameters[0] = arguments[0];
         }
       }
-      if (request && typeof parameters[0] === STRING && !lodash.isEmpty(parameters[0]) ) {
+      if (request && typeof parameters[0] === STRING && !lodash.isEmpty(parameters[0])) {
         const policy = API.getPolicy();
         const dynamicScanningFlag = policy.data ? policy.data.vulnerabilityScan.iastScan.enabled : false;
         const url = request.url;
@@ -146,19 +147,20 @@ function openHook(shim, mod, moduleName) {
           } catch (error) {
 
           }
+          let absoluteParameters = [parameters[0]];
           const traceObject = secUtils.getTraceObject(shim);
-          const secMetadata = securityMetaData.getSecurityMetaData(request, interceptedArgs, traceObject, secUtils.getExecutionId(), getCaseType(parameters[1], parameters[0]), EVENT_CATEGORY.FILE)
+          const secMetadata = securityMetaData.getSecurityMetaData(request, absoluteParameters, traceObject, secUtils.getExecutionId(), getCaseType(parameters[1], parameters[0]), EVENT_CATEGORY.FILE)
           this.secEvent = API.generateSecEvent(secMetadata);
           API.sendEvent(this.secEvent);
           const callbackFlag = isCallback(arguments);
-          if (callbackFlag &&  request.headers[NR_CSEC_FUZZ_REQUEST_ID]) {
+          if (callbackFlag && request.headers[NR_CSEC_FUZZ_REQUEST_ID]) {
             callbackHook(shim, arguments[3], 'oncomplete', this.secEvent);
           }
         }
 
       }
       const result = fn.apply(this, arguments);
-      if(result>0 && request && request.headers[NR_CSEC_FUZZ_REQUEST_ID]){
+      if (result > 0 && request && request.headers[NR_CSEC_FUZZ_REQUEST_ID]) {
         //here generate exit event.
         API.generateExitEvent(this.secEvent);
         delete this.secEvent;
@@ -177,18 +179,26 @@ function openHook(shim, mod, moduleName) {
 function probableToFAHooks(shim, mod, moduleName) {
   functionsProbableToFA.forEach(function (fun) {
     shim.wrap(mod, fun, function makeFAWrapper(shim, fn) {
+      logger.debug(`Instrumenting ${moduleName}.${fun}`);
       return function FAWrapper() {
+        let parameters = Array.prototype.slice.apply(arguments);
         const interceptedArgs = [arguments[0]];
         shim.interceptedArgs = interceptedArgs;
         const request = requestManager.getRequest(shim);
-        if (request && typeof arguments[0] === STRING  && !lodash.isEmpty(arguments[0])) {
+        if (request && typeof arguments[0] === STRING && !lodash.isEmpty(arguments[0])) {
           const traceObject = secUtils.getTraceObject(shim);
-          const secMetadata = securityMetaData.getSecurityMetaData(request, interceptedArgs, traceObject, secUtils.getExecutionId(), EVENT_TYPE.FILE_OPERATION, EVENT_CATEGORY.FILE)
+          try {
+            parameters[0] = path.resolve(parameters[0]);
+          } catch (error) {
+
+          }
+          let absoluteParameters = [parameters[0]];
+          const secMetadata = securityMetaData.getSecurityMetaData(request, absoluteParameters, traceObject, secUtils.getExecutionId(), EVENT_TYPE.FILE_OPERATION, EVENT_CATEGORY.FILE)
           this.secEvent = API.generateSecEvent(secMetadata);
           API.sendEvent(this.secEvent);
           const callbackFlag = isCallback(arguments);
-          if (callbackFlag &&  request.headers[NR_CSEC_FUZZ_REQUEST_ID]) {
-            callbackHook(shim, arguments, arguments.length-1, this.secEvent);
+          if (callbackFlag && request.headers[NR_CSEC_FUZZ_REQUEST_ID]) {
+            callbackHook(shim, arguments, arguments.length - 1, this.secEvent);
           }
         }
         return fn.apply(this, arguments);
@@ -206,23 +216,32 @@ function probableToFAHooks(shim, mod, moduleName) {
 function probableToFIHooks(shim, mod, moduleName) {
   functionProbableToFI.forEach(function (fun) {
     shim.wrap(mod, fun, function makeFIWrapper(shim, fn) {
+      logger.debug(`Instrumenting ${moduleName}.${fun}`);
       return function FIWrapper() {
+        let parameters = Array.prototype.slice.apply(arguments);
         const interceptedArgs = [arguments[0]];
         shim.interceptedArgs = interceptedArgs;
         const request = requestManager.getRequest(shim);
-        if (request && typeof arguments[0] === STRING  && !lodash.isEmpty(arguments[0])) {
+        if (request && typeof arguments[0] === STRING && !lodash.isEmpty(arguments[0])) {
           const traceObject = secUtils.getTraceObject(shim);
+          try {
+            parameters[0] = path.resolve(parameters[0]);
+            parameters[1] = path.resolve(parameters[1]);
+          } catch (error) {
+            
+          }
+          let absoluteParameters = [parameters[0]];
           if (fun === COPY_FILE || fun === RENAME) {
-            const secMetadata = securityMetaData.getSecurityMetaData(request, arguments[1], traceObject, secUtils.getExecutionId(), getCase(arguments[1]), EVENT_CATEGORY.FILE)
+            const secMetadata = securityMetaData.getSecurityMetaData(request, parameters[1], traceObject, secUtils.getExecutionId(), getCase(arguments[1]), EVENT_CATEGORY.FILE)
             this.secEvent = API.generateSecEvent(secMetadata);
             API.sendEvent(this.secEvent);
           }
-          const secMetadata = securityMetaData.getSecurityMetaData(request, interceptedArgs, traceObject, secUtils.getExecutionId(), getCase(arguments[0]), EVENT_CATEGORY.FILE)
+          const secMetadata = securityMetaData.getSecurityMetaData(request, absoluteParameters, traceObject, secUtils.getExecutionId(), getCase(arguments[0]), EVENT_CATEGORY.FILE)
           this.secEvent = API.generateSecEvent(secMetadata);
           API.sendEvent(this.secEvent);
           const callbackFlag = isCallback(arguments);
           if (callbackFlag && request.headers[NR_CSEC_FUZZ_REQUEST_ID]) {
-            callbackHook(shim, arguments, arguments.length-1, this.secEvent);
+            callbackHook(shim, arguments, arguments.length - 1, this.secEvent);
           }
         }
         return fn.apply(this, arguments);
@@ -239,14 +258,22 @@ function probableToFIHooks(shim, mod, moduleName) {
  */
 function probablePromiseToFAHooks(shim, mod, moduleName) {
   promiseFunctionsProbableToFA.forEach(function (fun) {
+    logger.debug(`Instrumenting Promise ${moduleName}.${fun}`);
     shim.wrap(mod, fun, function makeFAWrapper(shim, fn) {
       return function FAWrapper() {
+        let parameters = Array.prototype.slice.apply(arguments);
         const interceptedArgs = [arguments[0]];
         shim.interceptedArgs = interceptedArgs;
         const request = requestManager.getRequest(shim);
-        if (request && typeof arguments[0] === STRING  && !lodash.isEmpty(arguments[0])) {
+        if (request && typeof arguments[0] === STRING && !lodash.isEmpty(arguments[0])) {
           const traceObject = secUtils.getTraceObject(shim);
-          const secMetadata = securityMetaData.getSecurityMetaData(request, interceptedArgs, traceObject, secUtils.getExecutionId(), EVENT_TYPE.FILE_OPERATION, EVENT_CATEGORY.FILE)
+          try {
+            parameters[0] = path.resolve(parameters[0]);
+          } catch (error) {
+
+          }
+          let absoluteParameters = [parameters[0]];
+          const secMetadata = securityMetaData.getSecurityMetaData(request, absoluteParameters, traceObject, secUtils.getExecutionId(), EVENT_TYPE.FILE_OPERATION, EVENT_CATEGORY.FILE)
           this.secEvent = API.generateSecEvent(secMetadata);
           API.sendEvent(this.secEvent);
         }
@@ -264,19 +291,28 @@ function probablePromiseToFAHooks(shim, mod, moduleName) {
  */
 function probablePromiseToFIHooks(shim, mod, moduleName) {
   promiseFunctionProbableToFI.forEach(function (fun) {
+    logger.debug(`Instrumenting Promise ${moduleName}.${fun}`);
     shim.wrap(mod, fun, function makeFIWrapper(shim, fn) {
       return function FIWrapper() {
+        let parameters = Array.prototype.slice.apply(arguments);
         const interceptedArgs = [arguments[0]];
         shim.interceptedArgs = interceptedArgs;
         const request = requestManager.getRequest(shim);
-        if (request && typeof arguments[0] === STRING  && !lodash.isEmpty(arguments[0])) {
+        if (request && typeof arguments[0] === STRING && !lodash.isEmpty(arguments[0])) {
           const traceObject = secUtils.getTraceObject(shim);
+          try {
+            parameters[0] = path.resolve(parameters[0]);
+            parameters[1] = path.resolve(parameters[1]);
+          } catch (error) {
+
+          }
+          let absoluteParameters = [parameters[0]];
           if (fun === COPY_FILE || fun === RENAME) {
-            const secMetadata = securityMetaData.getSecurityMetaData(request, arguments[1], traceObject, secUtils.getExecutionId(), getCase(arguments[1]), EVENT_CATEGORY.FILE)
+            const secMetadata = securityMetaData.getSecurityMetaData(request, parameters[1], traceObject, secUtils.getExecutionId(), getCase(arguments[1]), EVENT_CATEGORY.FILE)
             this.secEvent = API.generateSecEvent(secMetadata);
             API.sendEvent(this.secEvent);
           }
-          const secMetadata = securityMetaData.getSecurityMetaData(request, interceptedArgs, traceObject, secUtils.getExecutionId(), getCase(arguments[0]), EVENT_CATEGORY.FILE)
+          const secMetadata = securityMetaData.getSecurityMetaData(request, absoluteParameters, traceObject, secUtils.getExecutionId(), getCase(arguments[0]), EVENT_CATEGORY.FILE)
           this.secEvent = API.generateSecEvent(secMetadata);
           API.sendEvent(this.secEvent);
         }

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

@@ -25,7 +25,7 @@ module.exports = function initialize(shim, hapi, moduleName) {
     return
   }
 
-  logger.info("Instrumenting Hapi")
+  logger.info(`Instrumenting ${moduleName}`);
   // 'Server' and 'server' both point to the same export,
   // but we can't make any assumption about which will be used.
   // Since we wrap the prototype, the second wrap should exit early.
@@ -49,6 +49,7 @@ function serverPostConstructor(shim) {
  */
 function wrapProtoRoute(shim, proto) {
   shim.wrap(proto, 'route', function wrapRoute(shim, original) {
+    logger.debug(`Instrumenting ${proto}.route`);
     return function wrappedRoute() {
       const args = shim.argsToArray.apply(shim, arguments)
       if (!shim.isObject(args[0])) {