support next 15.4.x on appsec (#6135)

Author: IlyasShabi

.github/workflows/appsec.yml

@@ -219,7 +219,7 @@ jobs:
         version:
           - oldest
           - latest
-        range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0 <15.4.1']
+        range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0']
         include:
           - range: '>=10.2.0 <11'
             range_clean: gte.10.2.0.and.lt.11
@@ -235,7 +235,7 @@ jobs:
             range_clean: gte.14.0.0.and.lte.14.2.6
           - range: '>=14.2.7 <15'
             range_clean: gte.14.2.7.and.lt.15
-          - range: '>=15.0.0 <15.4.1'
+          - range: '>=15.0.0'
             range_clean: gte.15.0.0
     runs-on: ubuntu-latest
     env:

packages/datadog-instrumentations/src/next.js

@@ -141,6 +141,20 @@ function instrument (req, res, handler, error) {
   requests.add(req)
 
   const ctx = { req, res }
+  // Parse query parameters from request URL
+  if (queryParsedChannel.hasSubscribers && req.url) {
+    // req.url is only the relative path (/foo?bar=baz) and new URL() needs a full URL
+    // so we give it a dummy base
+    const { searchParams } = new URL(req.url, 'http://dummy')
+    const query = {}
+    for (const key of searchParams.keys()) {
+      if (!query[key]) {
+        query[key] = searchParams.getAll(key)
+      }
+    }
+
+    queryParsedChannel.publish({ query })
+  }
 
   return startChannel.runStores(ctx, () => {
     try {
@@ -280,24 +294,9 @@ addHook({
   versions: ['>=13'],
   file: 'dist/server/web/spec-extension/request.js'
 }, request => {
-  shimmer.wrap(request.NextRequest.prototype, 'nextUrl', function (originalGet) {
-    return function wrappedGet () {
-      const nextUrl = originalGet.apply(this, arguments)
-      if (queryParsedChannel.hasSubscribers) {
-        const query = {}
-        for (const key of nextUrl.searchParams.keys()) {
-          if (!query[key]) {
-            query[key] = nextUrl.searchParams.getAll(key)
-          }
-        }
-
-        queryParsedChannel.publish({ query })
-      }
-      return nextUrl
-    }
-  })
+  const requestProto = Object.getPrototypeOf(request.NextRequest.prototype)
 
-  shimmer.massWrap(request.NextRequest.prototype, ['text', 'json'], function (originalMethod) {
+  shimmer.massWrap(requestProto, ['text', 'json'], function (originalMethod) {
     return async function wrappedJson () {
       const body = await originalMethod.apply(this, arguments)
 
@@ -307,7 +306,7 @@ addHook({
     }
   })
 
-  shimmer.wrap(request.NextRequest.prototype, 'formData', function (originalFormData) {
+  shimmer.wrap(requestProto, 'formData', function (originalFormData) {
     return async function wrappedFormData () {
       const body = await originalFormData.apply(this, arguments)
 

packages/dd-trace/test/appsec/index.next.plugin.spec.js

@@ -16,7 +16,7 @@ describe('test suite', () => {
 
   const satisfiesStandalone = version => satisfies(version, '>=12.0.0')
 
-  withVersions('next', 'next', '>=11.1 <15.4.1', version => {
+  withVersions('next', 'next', '>=11.1', version => {
     if (version === '>=11.0.0 <13' && NODE_MAJOR === 24 &&
       NODE_MINOR === 0 && NODE_PATCH === 0) {
       return // node 24.0.0 fails, but 24.0.1 works