Merge pull request #36861 from github/repo-sync

Repo sync

Author: docs-bot

src/frame/middleware/trailing-slashes.ts

@@ -15,6 +15,7 @@ export default function trailingSlashes(req: ExtendedRequest, res: Response, nex
       if (split.length) {
         url += `?${split.join('?')}`
       }
+      url = url.replace(/\/+/g, '/') // Prevent multiple slashes
       defaultCacheControl(res)
       return res.redirect(301, url)
     }

src/redirects/middleware/handle-redirects.ts

@@ -19,7 +19,7 @@ export default function handleRedirects(req: ExtendedRequest, res: Response, nex
 
   // Any double-slashes in the URL should be removed first
   if (req.path.includes('//')) {
-    return res.redirect(301, req.path.replace(/\/\//g, '/'))
+    return res.redirect(301, req.path.replace(/(\/+)/g, '/'))
   }
 
   // blanket redirects for languageless homepage

src/redirects/tests/redirects.js

@@ -16,12 +16,6 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url))
 describe('redirects', () => {
   vi.setConfig({ testTimeout: 3 * 60 * 1000 })
 
-  let redirects
-  beforeAll(async () => {
-    const res = await get('/en?json=redirects')
-    redirects = JSON.parse(res.body)
-  })
-
   test('page.buildRedirects() returns an array', async () => {
     const page = await Page.init({
       relativePath:
@@ -94,6 +88,12 @@ describe('redirects', () => {
   })
 
   describe('trailing slashes', () => {
+    let redirects
+    beforeAll(async () => {
+      const res = await get('/en?json=redirects')
+      redirects = JSON.parse(res.body)
+    })
+
     test('are absent from all redirected URLs', async () => {
       const keys = Object.keys(redirects)
       expect(keys.length).toBeGreaterThan(100)
@@ -138,6 +138,12 @@ describe('redirects', () => {
   })
 
   describe('external redirects', () => {
+    let redirects
+    beforeAll(async () => {
+      const res = await get('/en?json=redirects')
+      redirects = JSON.parse(res.body)
+    })
+
     test('no external redirect starts with a language prefix', () => {
       const values = Object.entries(redirects)
         .filter(([, to]) => to.includes('://'))
@@ -425,6 +431,14 @@ describe('redirects', () => {
       expect(res.headers.location).toBe(`/en`)
     })
 
+    test('no domain redirect on //example.com/', async () => {
+      const res = await get(`//example.com/`)
+      expect(res.statusCode).toBe(301)
+      expect(res.headers.location).toBe(`/example.com`) // should not be //example.com
+      const res2 = await get(res.headers.location)
+      expect(res2.statusCode).toBe(404)
+    })
+
     test('double-slash elsewhere in the URL', async () => {
       const res = await get(`/en//rest`)
       expect(res.statusCode).toBe(301)