test: fix static file tests for supertest 7+ URL normalization

package.json

@@ -76,7 +76,8 @@
     "morgan": "1.10.1",
     "nyc": "^17.1.0",
     "pbkdf2-password": "1.2.1",
-    "supertest": "^6.3.0",
+    "superagent": "^10.2.3",
+    "supertest": "^7.1.4",
     "vhost": "~3.0.2"
   },
   "engines": {

test/acceptance/downloads.js

@@ -1,6 +1,8 @@
 
 var app = require('../../examples/downloads')
-  , request = require('supertest');
+  , request = require('supertest')
+  , http = require('node:http')
+  , assert = require('node:assert');
 
 describe('downloads', function(){
   describe('GET /', function(){
@@ -39,9 +41,21 @@ describe('downloads', function(){
 
   describe('GET /files/../index.js', function () {
     it('should respond with 403', function (done) {
-      request(app)
-        .get('/files/../index.js')
-        .expect(403, done)
+      var server = app.listen(function () {
+        var port = server.address().port
+        // Use http.request to avoid URL normalization by superagent
+        var req = http.request({
+          hostname: 'localhost',
+          port: port,
+          path: '/files/../index.js',
+          method: 'GET'
+        }, function (res) {
+          assert.strictEqual(res.statusCode, 403)
+          server.close(done)
+        })
+        req.on('error', done)
+        req.end()
+      })
     })
   })
 })

test/express.static.js

@@ -4,6 +4,7 @@ var assert = require('node:assert')
 var express = require('..')
 var path = require('node:path')
 const { Buffer } = require('node:buffer');
+var http = require('node:http')
 
 var request = require('supertest')
 var utils = require('./support/utils')
@@ -269,9 +270,26 @@ describe('express.static()', function () {
       })
 
       it('should fall-through when traversing past root', function (done) {
-        request(this.app)
-          .get('/users/../../todo.txt')
-          .expect(404, 'Not Found', done)
+        var server = this.app.listen(function () {
+          var port = server.address().port
+          // Use http.request to avoid URL normalization by superagent
+          var req = http.request({
+            hostname: 'localhost',
+            port: port,
+            path: '/users/../../todo.txt',
+            method: 'GET'
+          }, function (res) {
+            assert.strictEqual(res.statusCode, 404)
+            var body = ''
+            res.on('data', function (chunk) { body += chunk })
+            res.on('end', function () {
+              assert.strictEqual(body, 'Not Found')
+              server.close(done)
+            })
+          })
+          req.on('error', done)
+          req.end()
+        })
       })
 
       it('should fall-through when URL too long', function (done) {
@@ -344,9 +362,26 @@ describe('express.static()', function () {
       })
 
       it('should 403 when traversing past root', function (done) {
-        request(this.app)
-          .get('/users/../../todo.txt')
-          .expect(403, /ForbiddenError/, done)
+        var server = this.app.listen(function () {
+          var port = server.address().port
+          // Use http.request to avoid URL normalization by superagent
+          var req = http.request({
+            hostname: 'localhost',
+            port: port,
+            path: '/users/../../todo.txt',
+            method: 'GET'
+          }, function (res) {
+            assert.strictEqual(res.statusCode, 403)
+            var body = ''
+            res.on('data', function (chunk) { body += chunk })
+            res.on('end', function () {
+              assert.match(body, /ForbiddenError/)
+              server.close(done)
+            })
+          })
+          req.on('error', done)
+          req.end()
+        })
       })
 
       it('should 404 when URL too long', function (done) {
@@ -578,15 +613,39 @@ describe('express.static()', function () {
     })
 
     it('should catch urlencoded ../', function (done) {
-      request(this.app)
-        .get('/users/%2e%2e/%2e%2e/todo.txt')
-        .expect(403, done)
+      var server = this.app.listen(function () {
+        var port = server.address().port
+        // Use http.request to avoid URL normalization by superagent
+        var req = http.request({
+          hostname: 'localhost',
+          port: port,
+          path: '/users/%2e%2e/%2e%2e/todo.txt',
+          method: 'GET'
+        }, function (res) {
+          assert.strictEqual(res.statusCode, 403)
+          server.close(done)
+        })
+        req.on('error', done)
+        req.end()
+      })
     })
 
     it('should not allow root path disclosure', function (done) {
-      request(this.app)
-        .get('/users/../../fixtures/todo.txt')
-        .expect(403, done)
+      var server = this.app.listen(function () {
+        var port = server.address().port
+        // Use http.request to avoid URL normalization by superagent
+        var req = http.request({
+          hostname: 'localhost',
+          port: port,
+          path: '/users/../../fixtures/todo.txt',
+          method: 'GET'
+        }, function (res) {
+          assert.strictEqual(res.statusCode, 403)
+          server.close(done)
+        })
+        req.on('error', done)
+        req.end()
+      })
     })
   })