fix: don't throw on malformed URLs (#10901)

vitejs · Nov 13, 2022 · feb9b10 · feb9b10
1 parent a9978dd
commit feb9b10
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/packages/vite/src/node/__tests__/utils.spec.ts b/packages/vite/src/node/__tests__/utils.spec.ts
@@ -9,7 +9,8 @@ import {
   isFileReadable,
   isWindows,
   posToNumber,
-  resolveHostname
+  resolveHostname,
+  shouldServe
 } from '../utils'
 
 describe('injectQuery', () => {
@@ -239,6 +240,12 @@ describe('asyncFlatten', () => {
   })
 })
 
+describe('shouldServe', () => {
+  test('returns false for malformed URLs', () => {
+    expect(shouldServe('/%c0%ae%c0%ae/etc/passwd', '/assets/dir')).toBe(false)
+  })
+})
+
 describe('isFileReadable', () => {
   test("file doesn't exist", async () => {
     expect(isFileReadable('/does_not_exist')).toBe(false)

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -1198,22 +1198,28 @@ export const isNonDriveRelativeAbsolutePath = (p: string): boolean => {
  * consistent behaviour between dev and prod and across operating systems.
  */
 export function shouldServe(url: string, assetsDir: string): boolean {
-  // viteTestUrl is set to something like http://localhost:4173/ and then many tests make calls
-  // like `await page.goto(viteTestUrl + '/example')` giving us URLs beginning with a double slash
-  const pathname = decodeURI(
-    new URL(url.startsWith('//') ? url.substring(1) : url, 'http://example.com')
-      .pathname
-  )
-  const file = path.join(assetsDir, pathname)
-  if (
-    !fs.existsSync(file) ||
-    (isCaseInsensitiveFS && // can skip case check on Linux
-      !fs.statSync(file).isDirectory() &&
-      !hasCorrectCase(file, assetsDir))
-  ) {
+  try {
+    // viteTestUrl is set to something like http://localhost:4173/ and then many tests make calls
+    // like `await page.goto(viteTestUrl + '/example')` giving us URLs beginning with a double slash
+    const pathname = decodeURI(
+      new URL(
+        url.startsWith('//') ? url.substring(1) : url,
+        'http://example.com'
+      ).pathname
+    )
+    const file = path.join(assetsDir, pathname)
+    if (
+      !fs.existsSync(file) ||
+      (isCaseInsensitiveFS && // can skip case check on Linux
+        !fs.statSync(file).isDirectory() &&
+        !hasCorrectCase(file, assetsDir))
+    ) {
+      return false
+    }
+    return true
+  } catch (err) {
     return false
   }
-  return true
 }
 
 /**