remove most get-port usage in appsec tests (#4428)

DataDog · Jun 24, 2024 · 0ec0653 · 0ec0653
1 parent 225b79e
commit 0ec0653
Show file tree

Hide file tree

Showing 17 changed files with 97 additions and 128 deletions.
diff --git a/packages/dd-trace/test/appsec/graphql.apollo-server-express.plugin.spec.js b/packages/dd-trace/test/appsec/graphql.apollo-server-express.plugin.spec.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const getPort = require('get-port')
 const agent = require('../plugins/agent')
 const {
   schema,
@@ -41,10 +40,9 @@ withVersions('apollo-server-core', 'express', '>=4', expressVersion => {
 
       server.applyMiddleware({ app })
 
-      config.port = await getPort()
-
       return new Promise(resolve => {
         expressServer = app.listen({ port: config.port }, () => {
+          config.port = expressServer.address().port
           resolve()
         })
       })

diff --git a/packages/dd-trace/test/appsec/graphql.apollo-server-fastify.plugin.spec.js b/packages/dd-trace/test/appsec/graphql.apollo-server-fastify.plugin.spec.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const getPort = require('get-port')
 const agent = require('../plugins/agent')
 const {
   schema,
@@ -41,10 +40,9 @@ withVersions('apollo-server-core', 'fastify', '3', fastifyVersion => {
 
       app.register(server.createHandler())
 
-      config.port = await getPort()
-
       return new Promise(resolve => {
         app.listen({ port: config.port }, (data) => {
+          config.port = app.server.address().port
           resolve()
         })
       })

diff --git a/packages/dd-trace/test/appsec/graphql.apollo-server.plugin.spec.js b/packages/dd-trace/test/appsec/graphql.apollo-server.plugin.spec.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const getPort = require('get-port')
 const path = require('path')
 const agent = require('../plugins/agent')
 const {
@@ -31,9 +30,9 @@ withVersions('apollo-server', '@apollo/server', apolloServerVersion => {
       resolvers
     })
 
-    config.port = await getPort()
+    const { url } = await startStandaloneServer(server, { listen: { port: 0 } })
 
-    await startStandaloneServer(server, { listen: { port: config.port } })
+    config.port = new URL(url).port
   })
 
   after(async () => {

diff --git a/...trace/test/appsec/iast/taint-tracking/sources/plugin.apollo-server-express.plugin.spec.js b/...trace/test/appsec/iast/taint-tracking/sources/plugin.apollo-server-express.plugin.spec.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const getPort = require('get-port')
 const agent = require('../../../../plugins/agent')
 const {
   schema,
@@ -41,10 +40,9 @@ withVersions('graphql', 'express', '>=4', expressVersion => {
 
       server.applyMiddleware({ app })
 
-      config.port = await getPort()
-
       return new Promise(resolve => {
         expressServer = app.listen({ port: config.port }, () => {
+          config.port = expressServer.address().port
           resolve()
         })
       })

diff --git a/...ages/dd-trace/test/appsec/iast/taint-tracking/sources/plugin.apollo-server.plugin.spec.js b/...ages/dd-trace/test/appsec/iast/taint-tracking/sources/plugin.apollo-server.plugin.spec.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const getPort = require('get-port')
 const path = require('path')
 const agent = require('../../../../plugins/agent')
 const {
@@ -31,9 +30,9 @@ withVersions('apollo-server', '@apollo/server', apolloServerVersion => {
       resolvers
     })
 
-    config.port = await getPort()
+    const { url } = await startStandaloneServer(server, { listen: { port: config.port } })
 
-    await startStandaloneServer(server, { listen: { port: config.port } })
+    config.port = new URL(url).port
   })
 
   after(async () => {

diff --git a/...es/dd-trace/test/appsec/iast/taint-tracking/sources/taint-tracking.express.plugin.spec.js b/...es/dd-trace/test/appsec/iast/taint-tracking/sources/taint-tracking.express.plugin.spec.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const axios = require('axios')
-const getPort = require('get-port')
 const semver = require('semver')
 const agent = require('../../../../plugins/agent')
 const Config = require('../../../../../src/config')
@@ -59,13 +58,13 @@ describe('URI sourcing with express', () => {
         res.status(200).send()
       })
 
-      getPort().then(port => {
-        appListener = app.listen(port, 'localhost', () => {
-          axios
-            .get(`http://localhost:${port}/path/vulnerable`)
-            .then(() => done())
-            .catch(done)
-        })
+      appListener = app.listen(0, 'localhost', () => {
+        const port = appListener.address().port
+
+        axios
+          .get(`http://localhost:${port}/path/vulnerable`)
+          .then(() => done())
+          .catch(done)
       })
     })
   })
@@ -137,13 +136,13 @@ describe('Path params sourcing with express', () => {
         res.status(200).send()
       })
 
-      getPort().then(port => {
-        appListener = app.listen(port, 'localhost', () => {
-          axios
-            .get(`http://localhost:${port}/tainted1/tainted2`)
-            .then(() => done())
-            .catch(done)
-        })
+      appListener = app.listen(0, 'localhost', () => {
+        const port = appListener.address().port
+
+        axios
+          .get(`http://localhost:${port}/tainted1/tainted2`)
+          .then(() => done())
+          .catch(done)
       })
     })
 
@@ -172,13 +171,13 @@ describe('Path params sourcing with express', () => {
 
       app.use('/:parameterParent', nestedRouter)
 
-      getPort().then(port => {
-        appListener = app.listen(port, 'localhost', () => {
-          axios
-            .get(`http://localhost:${port}/tainted1/tainted2`)
-            .then(() => done())
-            .catch(done)
-        })
+      appListener = app.listen(0, 'localhost', () => {
+        const port = appListener.address().port
+
+        axios
+          .get(`http://localhost:${port}/tainted1/tainted2`)
+          .then(() => done())
+          .catch(done)
       })
     })
 
@@ -192,13 +191,13 @@ describe('Path params sourcing with express', () => {
       app.param('parameter1', checkParamIsTaintedAndNext)
       app.param('parameter2', checkParamIsTaintedAndNext)
 
-      getPort().then(port => {
-        appListener = app.listen(port, 'localhost', () => {
-          axios
-            .get(`http://localhost:${port}/tainted1/tainted2`)
-            .then(() => done())
-            .catch(done)
-        })
+      appListener = app.listen(0, 'localhost', () => {
+        const port = appListener.address().port
+
+        axios
+          .get(`http://localhost:${port}/tainted1/tainted2`)
+          .then(() => done())
+          .catch(done)
       })
     })
 
@@ -216,13 +215,13 @@ describe('Path params sourcing with express', () => {
       app.param('parameter1')
       app.param('parameter2')
 
-      getPort().then(port => {
-        appListener = app.listen(port, 'localhost', () => {
-          axios
-            .get(`http://localhost:${port}/tainted1/tainted2`)
-            .then(() => done())
-            .catch(done)
-        })
+      appListener = app.listen(0, 'localhost', () => {
+        const port = appListener.address().port
+
+        axios
+          .get(`http://localhost:${port}/tainted1/tainted2`)
+          .then(() => done())
+          .catch(done)
       })
     })
   })

diff --git a/packages/dd-trace/test/appsec/iast/utils.js b/packages/dd-trace/test/appsec/iast/utils.js
@@ -4,7 +4,6 @@ const fs = require('fs')
 const os = require('os')
 const path = require('path')
 
-const getPort = require('get-port')
 const agent = require('../../plugins/agent')
 const axios = require('axios')
 const iast = require('../../../src/appsec/iast')
@@ -17,12 +16,6 @@ function testInRequest (app, tests) {
   let appListener
   const config = {}
 
-  beforeEach(() => {
-    return getPort().then(newPort => {
-      config.port = newPort
-    })
-  })
-
   beforeEach(() => {
     listener = (req, res) => {
       const appResult = app && app(req, res)
@@ -48,7 +41,10 @@ function testInRequest (app, tests) {
   beforeEach(done => {
     const server = new http.Server(listener)
     appListener = server
-      .listen(config.port, 'localhost', () => done())
+      .listen(0, 'localhost', () => {
+        config.port = appListener.address().port
+        done()
+      })
   })
 
   afterEach(() => {
@@ -219,12 +215,6 @@ function prepareTestServerForIast (description, tests, iastConfig) {
     let appListener
     let app
 
-    before(() => {
-      return getPort().then(newPort => {
-        config.port = newPort
-      })
-    })
-
     before(() => {
       listener = (req, res) => {
         endResponse(res, app && app(req, res))
@@ -241,7 +231,10 @@ function prepareTestServerForIast (description, tests, iastConfig) {
     before(done => {
       const server = new http.Server(listener)
       appListener = server
-        .listen(config.port, 'localhost', () => done())
+        .listen(0, 'localhost', () => {
+          config.port = appListener.address().port
+          done()
+        })
     })
 
     beforeEachIastTest(iastConfig)
@@ -311,11 +304,10 @@ function prepareTestServerForIastInExpress (description, expressVersion, loadMid
       }
 
       expressApp.all('/', listener)
-      getPort().then(newPort => {
-        config.port = newPort
-        server = expressApp.listen(newPort, () => {
-          done()
-        })
+
+      server = expressApp.listen(0, () => {
+        config.port = server.address().port
+        done()
       })
     })
 

diff --git a/packages/dd-trace/test/appsec/index.body-parser.plugin.spec.js b/packages/dd-trace/test/appsec/index.body-parser.plugin.spec.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const axios = require('axios')
-const getPort = require('get-port')
 const path = require('path')
 const agent = require('../plugins/agent')
 const appsec = require('../../src/appsec')
@@ -27,11 +26,9 @@ withVersions('body-parser', 'body-parser', version => {
         res.end('DONE')
       })
 
-      getPort().then(newPort => {
-        port = newPort
-        server = app.listen(port, () => {
-          done()
-        })
+      server = app.listen(port, () => {
+        port = server.address().port
+        done()
       })
     })
 

diff --git a/packages/dd-trace/test/appsec/index.cookie-parser.plugin.spec.js b/packages/dd-trace/test/appsec/index.cookie-parser.plugin.spec.js
@@ -2,7 +2,6 @@
 
 const { assert } = require('chai')
 const axios = require('axios')
-const getPort = require('get-port')
 const path = require('path')
 const agent = require('../plugins/agent')
 const appsec = require('../../src/appsec')
@@ -28,11 +27,9 @@ withVersions('cookie-parser', 'cookie-parser', version => {
         res.end('DONE')
       })
 
-      getPort().then(newPort => {
-        port = newPort
-        server = app.listen(port, () => {
-          done()
-        })
+      server = app.listen(port, () => {
+        port = server.address().port
+        done()
       })
     })
 

diff --git a/packages/dd-trace/test/appsec/index.express.plugin.spec.js b/packages/dd-trace/test/appsec/index.express.plugin.spec.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const axios = require('axios')
-const getPort = require('get-port')
 const path = require('path')
 const agent = require('../plugins/agent')
 const appsec = require('../../src/appsec')
@@ -45,11 +44,9 @@ withVersions('express', 'express', version => {
         res.jsonp({ jsonResKey: 'jsonResValue' })
       })
 
-      getPort().then(newPort => {
-        port = newPort
-        server = app.listen(port, () => {
-          done()
-        })
+      server = app.listen(port, () => {
+        port = server.address().port
+        done()
       })
     })
 

diff --git a/packages/dd-trace/test/appsec/index.sequelize.plugin.spec.js b/packages/dd-trace/test/appsec/index.sequelize.plugin.spec.js
@@ -2,7 +2,6 @@
 
 const path = require('path')
 const axios = require('axios')
-const getPort = require('get-port')
 const agent = require('../plugins/agent')
 const appsec = require('../../src/appsec')
 const Config = require('../../src/config')
@@ -69,11 +68,9 @@ describe('sequelize', () => {
             res.json(users)
           })
 
-          getPort().then(newPort => {
-            port = newPort
-            server = app.listen(newPort, () => {
-              done()
-            })
+          server = app.listen(0, () => {
+            port = server.address().port
+            done()
           })
         })