@newrelic/security-agent 1.5.0 → 2.1.0

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+### v2.1.0 (2024-11-05)
+#### Features
+* IAST support for CI/CD
+* Support for IAST schedule, delay and ignore scan categories
+#### Bug fixes
+* Added default values for scan_schedule, scan_controllers and exclude_from_iast_scan config
+* Fix for security home placeholder replacement in fuzz requests
+* Handling to not resolve file path in fs module instrumentation
+* Fix for batch size and condition of iast-data-request sending 
+#### Miscellaneous chores
+* Added requestURI field in http request for application-runtime-error
+* Updated instrumented to get the transaction directly instead of from the active segment
+
+### v2.0.0 (2024-09-20)
+### ⚠ BREAKING CHANGES
+* Dropped support for Node.js v16
+* Dropped functionality to generate snapshot file
+#### Features
+* Support to honour proxy settings via config
+* Support for secure cookie security event generation
+* Report error to Error Inbox upon connection failure to Security Engine
+* Support to detect application and server path
+* Functionality to truncate Incoming HTTP request upto default limit
+* Dropped support for Node.js v16
+* Dropped functionality to generate snapshot file
+#### Bug fixes
+* Handling for empty data in IAST fuzzing header
+* Added identifiers in events
+* Fix for file integrity security event generation
+* Fix for missing identifiers in iast-data-request JSON
+
 ### v1.5.0 (2024-08-14)
 #### Features
 * Support for Node.js v22.x

package/THIRD_PARTY_NOTICES.md

@@ -17,10 +17,12 @@ code, the source code can be found at [https://github.com/newrelic/csec-node-age
 * [axios](#axios)
 * [check-disk-space](#check-disk-space)
 * [content-type](#content-type)
+* [cron](#cron)
 * [fast-safe-stringify](#fast-safe-stringify)
 * [find-package-json](#find-package-json)
 * [hash.js](#hashjs)
 * [html-entities](#html-entities)
+* [https-proxy-agent](#https-proxy-agent)
 * [is-invalid-path](#is-invalid-path)
 * [js-yaml](#js-yaml)
 * [jsonschema](#jsonschema)
@@ -149,6 +151,22 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ```
 
+### cron
+
+This product includes source derived from [cron](https://github.com/kelektiv/node-cron) ([v3.1.7](https://github.com/kelektiv/node-cron/tree/v3.1.7)), distributed under the [MIT License](https://github.com/kelektiv/node-cron/blob/v3.1.7/LICENSE):
+
+```
+The MIT License (MIT)
+Copyright © 2017 Nicholas Campbell <nicholas.j.campbell@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+```
+
 ### fast-safe-stringify
 
 This product includes source derived from [fast-safe-stringify](https://github.com/davidmarkclements/fast-safe-stringify) ([v2.1.1](https://github.com/davidmarkclements/fast-safe-stringify/tree/v2.1.1)), distributed under the [MIT License](https://github.com/davidmarkclements/fast-safe-stringify/blob/v2.1.1/LICENSE):
@@ -239,6 +257,35 @@ THE SOFTWARE.
 
 ```
 
+### https-proxy-agent
+
+This product includes source derived from [https-proxy-agent](https://github.com/TooTallNate/proxy-agents) ([v7.0.4](https://github.com/TooTallNate/proxy-agents/tree/v7.0.4)), distributed under the [MIT License](https://github.com/TooTallNate/proxy-agents/blob/v7.0.4/LICENSE):
+
+```
+(The MIT License)
+
+Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+```
+
 ### is-invalid-path
 
 This product includes source derived from [is-invalid-path](https://github.com/jonschlinkert/is-invalid-path) ([v1.0.2](https://github.com/jonschlinkert/is-invalid-path/tree/v1.0.2)), distributed under the [MIT License](https://github.com/jonschlinkert/is-invalid-path/blob/v1.0.2/LICENSE):
@@ -588,7 +635,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ### ws
 
-This product includes source derived from [ws](https://github.com/websockets/ws) ([v8.17.1](https://github.com/websockets/ws/tree/v8.17.1)), distributed under the [MIT License](https://github.com/websockets/ws/blob/v8.17.1/LICENSE):
+This product includes source derived from [ws](https://github.com/websockets/ws) ([v8.18.0](https://github.com/websockets/ws/tree/v8.18.0)), distributed under the [MIT License](https://github.com/websockets/ws/blob/v8.18.0/LICENSE):
 
 ```
 Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>

package/lib/instrumentation-security/core/constants.js

@@ -62,6 +62,13 @@ module.exports = {
     UNDEFINED: 'undefined',
     SELF_FD_PATH: '/proc/self/fd/',
     NR_CSEC_FUZZ_REQUEST_ID: 'nr-csec-fuzz-request-id',
-    ASTERISK: "*"
+    ASTERISK: "*",
+    COMMA_SPACE: ", ",
+    SEMI_COLON: ';',
+    EQUAL: '=',
+    SECURE: 'secure',
+    HTTPONLY: 'httponly',
+    SAMESITE: 'samesite',
+    STRICT: 'strict'
 
 };

package/lib/instrumentation-security/core/event-constants.js

@@ -20,9 +20,10 @@ const EVENT_TYPE = {
     UNVALIDATED_REDIRECT: 'UNVALIDATED_REDIRECT',
     REFLECTED_XSS: 'REFLECTED_XSS',
     XPATH: 'XPATH',
-    LDAP: 'LDAP'
+    LDAP: 'LDAP',
+    SECURE_COOKIE: 'SECURE_COOKIE'
 }
-const  EVENT_CATEGORY =  {
+const EVENT_CATEGORY = {
     MYSQL: 'MYSQL',
     POSTGRES: 'POSTGRES',
     ORACLE: 'ORACLE',
@@ -40,7 +41,8 @@ const  EVENT_CATEGORY =  {
     UNVALIDATED_REDIRECT: 'UNVALIDATED_REDIRECT',
     REFLECTED_XSS: 'REFLECTED_XSS',
     XPATH: 'XPATH',
-    LDAP: 'LDAP'
+    LDAP: 'LDAP',
+    SECURE_COOKIE: 'SECURE_COOKIE'
 }
 
 module.exports = {

package/lib/instrumentation-security/core/request-manager.js

@@ -4,6 +4,10 @@
  */
 
 const requestMap = new Map();
+const API = require("../../nr-security-api");
+const NRAgent = API.getNRAgent();
+const logger = API.getLogger();
+const regexPatterns = NRAgent && NRAgent.config.security.exclude_from_iast_scan.api
 
 /**
  * Utility to get request by transaction Id
@@ -20,7 +24,33 @@ function getRequestFromId(id) {
  * @param {*} requestData 
  */
 function setRequest(id, requestData) {
+
     requestMap.set(id, requestData);
+    try {
+        const stringToMatch = requestData.url;
+        // const filteredString = stringToMatch.split('?')[0];
+        const filteredString = stringToMatch;
+        let isRegexMatchestoURL = false;
+        for (let index = 0; index < regexPatterns.length; index++) {
+            const regex = new RegExp(regexPatterns[index], 'gm');
+            const matchResult = filteredString.match(regex);
+            if (matchResult && matchResult.length > 0) {
+                const data = matchResult[0];
+                if (filteredString === data) {
+                    isRegexMatchestoURL = true;
+                }
+            }
+        }
+        if (isRegexMatchestoURL) {
+            requestMap.delete(id);
+            if (API.getSecAgent().status.getStatus() !== 'disabled') {
+                logger.debug("Excluding URL %s from IAST processing due to ignore API setting", filteredString);
+            }
+        }
+    } catch (error) {
+        logger.debug("Error while processing API regex for restriction", error);
+    }
+
 }
 
 /**
@@ -29,9 +59,9 @@ function setRequest(id, requestData) {
  * @returns 
  */
 function getRequest(shim) {
-    const segment = shim.getActiveSegment();
-    if (segment) {
-        const transactionId = segment.transaction.id;
+    const transaction = shim.tracer.getTransaction();
+    if (transaction) {
+        const transactionId = transaction.id;
         return getRequestFromId(transactionId);
     }
     else if (shim.agent.getLinkingMetadata()) {
@@ -48,13 +78,14 @@ function getRequest(shim) {
  * @param {*} shim 
  * @param {*} data 
  */
-function updateRequestBody(shim, data) {
-    const segment = shim.getActiveSegment();
-    if (segment) {
-        const transactionId = segment.transaction.id;
+function updateRequestBody(shim, data, isTruncated) {
+    const transaction = shim.tracer.getTransaction(); 
+    if (transaction) {
+        const transactionId = transaction.id;
         const requestData = getRequestFromId(transactionId);
         if (requestData) {
             requestData.body = data;
+            requestData.dataTruncated = isTruncated;
             setRequest(transactionId, requestData);
         }
     }
@@ -65,6 +96,7 @@ function updateRequestBody(shim, data) {
             const requestData = getRequestFromId(traceId);
             if (requestData) {
                 requestData.body = data;
+                requestData.dataTruncated = isTruncated;
                 setRequest(traceId, requestData)
             }
         }
@@ -93,4 +125,4 @@ module.exports = {
     updateRequestBody,
     gcRequestMap,
     requestMap
-}
+}

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

@@ -172,15 +172,15 @@ function createPathIfNotExist(dir) {
 function addRequestData(shim, request) {
     try {
         const data = Object.assign({});
-        const segment = shim.getActiveSegment();
-        if (segment && segment.transaction) {
+        const transaction = shim.tracer.getTransaction();
+        if (transaction) {
             data.protocol = (request.connection && request.connection.encrypted) ? 'https' : 'http';
             data.body = null;
             data.headers = request.headers;
             data.url = request.url;
             data.method = request.method;
             data.httpVersion = request.httpVersion;
-            data.serverPort = segment.transaction.port;
+            data.serverPort = transaction.port;
             data.contextPath = '/';
             const queryObject = URL.parse(request.url, true).query;
             data.parameterMap = {};
@@ -194,7 +194,8 @@ function addRequestData(shim, request) {
                 });
             }
             data.clientIP = requestIp.getClientIp(request);
-            const transactionId = segment.transaction.id;
+            data.dataTruncated = false;
+            const transactionId = transaction.id;
             const storedRequest = requestManager.getRequestFromId(transactionId);
             if (storedRequest && storedRequest.uri) {
                 data.uri = storedRequest.uri;
@@ -262,4 +263,4 @@ module.exports = {
     addRequestData,
     decryptData,
     hashVerifier
-}
+}

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

@@ -71,15 +71,15 @@ module.exports = function initialize(shim, director) {
  * @param {*} params 
  */
 function extractParams(shim, params) {
-  const segment = shim.getActiveSegment();
-  if (segment && segment.transaction) {
-    let request = requestManager.getRequestFromId(segment.transaction.id);
+  const transaction = shim.tracer.getTransaction(); 
+  if (transaction) {
+    let request = requestManager.getRequestFromId(transaction.id);
     if (params && request) {
       Object.keys(params).forEach(function (key) {
         if (params[key]) {
           if (!request.parameterMap[key]) {
             request.parameterMap[key] = new Array(params[key].toString());
-            requestManager.setRequest(segment.transaction.id, request);
+            requestManager.setRequest(transaction.id, request);
           }
         }
       });
@@ -91,8 +91,8 @@ function extractParams(shim, params) {
       if (uri.includes(param)) {
         uri = lodash.replace(uri, param, ':param_input');
         request.uri  = uri;
-        requestManager.setRequest(segment.transaction.id, request);
+        requestManager.setRequest(transaction.id, request);
       }
     }
   }
-}
+}

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

@@ -31,8 +31,11 @@ module.exports = function initialize(shim, express) {
   if (express.Router.use) {
     wrapExpress4(shim, express)
   } 
-  expressFileHook(shim, express && express.response, 'download')
-  expressFileHook(shim, express && express.response, 'sendFile')
+  if(API && API.getNRAgent() && !API.getNRAgent().config.security.exclude_from_iast_scan.iast_detection_category.invalid_file_access){
+    expressFileHook(shim, express && express.response, 'download')
+    expressFileHook(shim, express && express.response, 'sendFile')
+  }
+  
 }
 
 /**
@@ -82,15 +85,15 @@ function extractParams(shim, req) {
   if (!requestManager.getRequest(shim)) {
     secUtils.addRequestData(shim, req);
   }
-  const segment = shim.getActiveSegment();
-  if (segment && segment.transaction) {
-    let request = requestManager.getRequestFromId(segment.transaction.id);
+  const transaction = shim.tracer.getTransaction();
+  if (transaction) {
+    let request = requestManager.getRequestFromId(transaction.id);
     if (req.params && request) {
       Object.keys(req.params).forEach(function (key) {
         if (req.params[key]) {
           if (!request.parameterMap[key]) {
             request.parameterMap[key] = new Array(req.params[key].toString());
-            requestManager.setRequest(segment.transaction.id, request);
+            requestManager.setRequest(transaction.id, request);
           }
         }
       });
@@ -100,14 +103,14 @@ function extractParams(shim, req) {
         if (req.query[key]) {
           if (!request.parameterMap[key]) {
             request.parameterMap[key] = new Array(req.query[key].toString());
-            requestManager.setRequest(segment.transaction.id, request);
+            requestManager.setRequest(transaction.id, request);
           }
         }
       });
     }
     if (req.route && req.route.path && request) {
       request.uri = req.route.path;
-      requestManager.setRequest(segment.transaction.id, request);
+      requestManager.setRequest(transaction.id, request);
     }
   }
 }

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

@@ -121,15 +121,15 @@ function extractParams(shim, req) {
   try {
     const reqURL = req.url || req.raw.url;
     const parsedURI = url.parse(reqURL).pathname;
-    const segment = shim.getActiveSegment();
-    if (segment && segment.transaction) {
-      let request = requestManager.getRequestFromId(segment.transaction.id);
+    const transaction = shim.tracer.getTransaction();
+    if (transaction) {
+      let request = requestManager.getRequestFromId(transaction.id);
       if (req.params && segment && request) {
         Object.keys(req.params).forEach(function (key) {
           if (req.params[key]) {
             if (!request.parameterMap[key]) {
               request.parameterMap[key] = new Array(req.params[key].toString());
-              requestManager.setRequest(segment.transaction.id, request);
+              requestManager.setRequest(transaction.id, request);
             }
           }
         });
@@ -139,7 +139,7 @@ function extractParams(shim, req) {
           if (req.query[key]) {
             if (!request.parameterMap[key]) {
               request.parameterMap[key] = new Array(req.query[key].toString());
-              requestManager.setRequest(segment.transaction.id, request);
+              requestManager.setRequest(transaction.id, request);
             }
           }
         });
@@ -147,7 +147,7 @@ function extractParams(shim, req) {
       let method = request.method.toUpperCase();
       if (parsedURI && request && requestManager.requestMap[method + ATTHERATE + parsedURI]) {
         request.uri = parsedURI;
-        requestManager.setRequest(segment.transaction.id, request);
+        requestManager.setRequest(transaction.id, request);
       }
     }
   } catch (error) {

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

@@ -25,6 +25,7 @@ const RENAME = 'rename';
 const FSReqCallback = 'FSReqCallback';
 const FSReqWrap = 'FSReqWrap';
 const OBJECT = 'object';
+const semver = require('semver');
 
 const functionsProbableToFA = [
   "fstat",
@@ -37,7 +38,7 @@ const functionsProbableToFA = [
   "realpath",
 ];
 
-const functionProbableToFI = [
+let functionProbableToFI = [
   "rename",
   "ftruncate",
   "rmdir",
@@ -93,8 +94,10 @@ const promiseFunctionProbableToFI = [
  * @param {*} moduleName 
  */
 function initialize(shim, mod, moduleName) {
-
-
+  if(API && API.getNRAgent() && API.getNRAgent().config.security.exclude_from_iast_scan.iast_detection_category.invalid_file_access){
+    logger.warn('invalid_file_access detection is disabled');
+    return;
+  }
   logger.info(`Instrumenting ${moduleName}`);
   requireHook.initialize(shim)
   const binding = process.binding("fs");
@@ -141,9 +144,8 @@ function openHook(shim, mod, moduleName) {
               parameters[0] = API.getSecAgent().applicationInfo.serverInfo.deployedApplications[0].deployedPath + SLASH + parameters[0];
             } else if (parameters[0].startsWith(SLASHDOTDOT)) {
               parameters[0] = API.getSecAgent().applicationInfo.serverInfo.deployedApplications[0].deployedPath + parameters[0];
-            } else {
-              parameters[0] = path.resolve(parameters[0]);
-            }
+            } 
+            
           } catch (error) {
 
           }
@@ -187,11 +189,6 @@ function probableToFAHooks(shim, mod, moduleName) {
         const request = requestManager.getRequest(shim);
         if (request && typeof arguments[0] === STRING && !lodash.isEmpty(arguments[0])) {
           const traceObject = secUtils.getTraceObject(shim);
-          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);
@@ -214,6 +211,9 @@ function probableToFAHooks(shim, mod, moduleName) {
  * @param {*} moduleName 
  */
 function probableToFIHooks(shim, mod, moduleName) {
+  if (semver.satisfies(process.version, '>19.0.0')) {
+    functionProbableToFI.push('writeFileSync');
+  }
   functionProbableToFI.forEach(function (fun) {
     shim.wrap(mod, fun, function makeFIWrapper(shim, fn) {
       logger.debug(`Instrumenting ${moduleName}.${fun}`);
@@ -224,12 +224,6 @@ function probableToFIHooks(shim, mod, moduleName) {
         const request = requestManager.getRequest(shim);
         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, parameters[1], traceObject, secUtils.getExecutionId(), getCase(arguments[1]), EVENT_CATEGORY.FILE)
@@ -267,11 +261,6 @@ function probablePromiseToFAHooks(shim, mod, moduleName) {
         const request = requestManager.getRequest(shim);
         if (request && typeof arguments[0] === STRING && !lodash.isEmpty(arguments[0])) {
           const traceObject = secUtils.getTraceObject(shim);
-          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);
@@ -300,12 +289,6 @@ function probablePromiseToFIHooks(shim, mod, moduleName) {
         const request = requestManager.getRequest(shim);
         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, parameters[1], traceObject, secUtils.getExecutionId(), getCase(arguments[1]), EVENT_CATEGORY.FILE)

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

@@ -282,8 +282,8 @@ function wrapCallback(shim, mod, method) {
 function addRequestData(shim, type, path, args) {
   const data = Object.assign({});
   try {
-    const segment = shim.getActiveSegment();
-    if (segment && segment.transaction) {
+    const transaction = shim.tracer.getTransaction(); 
+    if (transaction) {
       data.method = path;
       data.url = path;
       data.uri = path;
@@ -298,7 +298,7 @@ function addRequestData(shim, type, path, args) {
       data.isGrpc = true;
       data.body = JSON.stringify(args.request);
       data.serverPort = shim.serverPort;
-      const transactionId = segment.transaction.id;
+      const transactionId = transaction.id;
       requestManager.setRequest(transactionId, data);
     }
   } catch (error) {
@@ -339,4 +339,4 @@ function iterateNestedObjectForServiceLookup(result, serviceObject) {
   } catch (error) {
     logger.error("Error while getting service definition", error);
   }
-}
+}

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

@@ -101,15 +101,15 @@ function handlerWrapper(shim, mod) {
  * @param {*} req 
  */
 function extractParams(shim, req) {
-  const segment = shim.getActiveSegment();
-  if (segment && segment.transaction) {
-    let request = requestManager.getRequestFromId(segment.transaction.id);
+  const transaction = shim.tracer.getTransaction();
+  if (transaction) {
+    let request = requestManager.getRequestFromId(transaction.id);
     if (req.params && request) {
       Object.keys(req.params).forEach(function (key) {
         if (req.params[key]) {
           if (!request.parameterMap[key]) {
             request.parameterMap[key] = new Array(req.params[key].toString());
-            requestManager.setRequest(segment.transaction.id, request);
+            requestManager.setRequest(transaction.id, request);
           }
         }
       });
@@ -119,14 +119,14 @@ function extractParams(shim, req) {
         if (req.query[key]) {
           if (!request.parameterMap[key]) {
             request.parameterMap[key] = new Array(req.query[key].toString());
-            requestManager.setRequest(segment.transaction.id, request);
+            requestManager.setRequest(transaction.id, request);
           }
         }
       });
     }
     if (req.route && req.route.path && request) {
       request.uri = req.route.path;
-      requestManager.setRequest(segment.transaction.id, request);
+      requestManager.setRequest(transaction.id, request);
     }
   }
-}
+}