From d2db33f7d4b96750b35370c70dd2c35ec3b9b649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Sun, 24 Mar 2024 21:31:50 +0900
Subject: [PATCH] fix: `fs.deny` with globs with directories (#16250)

---
 packages/vite/src/node/server/index.ts        | 17 ++++++++++----
 .../__tests__/deny/fs-serve-deny.spec.ts      | 17 ++++++++++++++
 playground/fs-serve/package.json              |  5 ++++-
 playground/fs-serve/root/src/deny/.deny       |  1 +
 playground/fs-serve/root/src/deny/deny.txt    |  1 +
 playground/fs-serve/root/vite.config-deny.js  | 22 +++++++++++++++++++
 6 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 playground/fs-serve/__tests__/deny/fs-serve-deny.spec.ts
 create mode 100644 playground/fs-serve/root/src/deny/.deny
 create mode 100644 playground/fs-serve/root/src/deny/deny.txt
 create mode 100644 playground/fs-serve/root/vite.config-deny.js

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
index eb34efa3dd4b99..7bf04d50980814 100644
--- a/packages/vite/src/node/server/index.ts
+++ b/packages/vite/src/node/server/index.ts
@@ -617,10 +617,19 @@ export async function _createServer(
     _importGlobMap: new Map(),
     _forceOptimizeOnRestart: false,
     _pendingRequests: new Map(),
-    _fsDenyGlob: picomatch(config.server.fs.deny, {
-      matchBase: true,
-      nocase: true,
-    }),
+    _fsDenyGlob: picomatch(
+      // matchBase: true does not work as it's documented
+      // https://github.com/micromatch/picomatch/issues/89
+      // convert patterns without `/` on our side for now
+      config.server.fs.deny.map((pattern) =>
+        pattern.includes('/') ? pattern : `**/${pattern}`,
+      ),
+      {
+        matchBase: false,
+        nocase: true,
+        dot: true,
+      },
+    ),
     _shortcutsOptions: undefined,
   }
 
diff --git a/playground/fs-serve/__tests__/deny/fs-serve-deny.spec.ts b/playground/fs-serve/__tests__/deny/fs-serve-deny.spec.ts
new file mode 100644
index 00000000000000..fb60922e86e1ae
--- /dev/null
+++ b/playground/fs-serve/__tests__/deny/fs-serve-deny.spec.ts
@@ -0,0 +1,17 @@
+import { describe, expect, test } from 'vitest'
+import { isServe, page, viteTestUrl } from '~utils'
+
+describe.runIf(isServe)('main', () => {
+  test('**/deny/** should deny src/deny/deny.txt', async () => {
+    const res = await page.request.fetch(
+      new URL('/src/deny/deny.txt', viteTestUrl).href,
+    )
+    expect(res.status()).toBe(403)
+  })
+  test('**/deny/** should deny src/deny/.deny', async () => {
+    const res = await page.request.fetch(
+      new URL('/src/deny/.deny', viteTestUrl).href,
+    )
+    expect(res.status()).toBe(403)
+  })
+})
diff --git a/playground/fs-serve/package.json b/playground/fs-serve/package.json
index b66b79268d8601..f71a082b890c6a 100644
--- a/playground/fs-serve/package.json
+++ b/playground/fs-serve/package.json
@@ -10,6 +10,9 @@
     "preview": "vite preview root",
     "dev:base": "vite root --config ./root/vite.config-base.js",
     "build:base": "vite build root --config ./root/vite.config-base.js",
-    "preview:base": "vite preview root --config ./root/vite.config-base.js"
+    "preview:base": "vite preview root --config ./root/vite.config-base.js",
+    "dev:deny": "vite root --config ./root/vite.config-deny.js",
+    "build:deny": "vite build root --config ./root/vite.config-deny.js",
+    "preview:deny": "vite preview root --config ./root/vite.config-deny.js"
   }
 }
diff --git a/playground/fs-serve/root/src/deny/.deny b/playground/fs-serve/root/src/deny/.deny
new file mode 100644
index 00000000000000..73bd3960853c61
--- /dev/null
+++ b/playground/fs-serve/root/src/deny/.deny
@@ -0,0 +1 @@
+.deny
diff --git a/playground/fs-serve/root/src/deny/deny.txt b/playground/fs-serve/root/src/deny/deny.txt
new file mode 100644
index 00000000000000..f9df83416f8a72
--- /dev/null
+++ b/playground/fs-serve/root/src/deny/deny.txt
@@ -0,0 +1 @@
+deny
diff --git a/playground/fs-serve/root/vite.config-deny.js b/playground/fs-serve/root/vite.config-deny.js
new file mode 100644
index 00000000000000..27501c55f38180
--- /dev/null
+++ b/playground/fs-serve/root/vite.config-deny.js
@@ -0,0 +1,22 @@
+import path from 'node:path'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  build: {
+    rollupOptions: {
+      input: {
+        main: path.resolve(__dirname, 'src/index.html'),
+      },
+    },
+  },
+  server: {
+    fs: {
+      strict: true,
+      allow: [path.resolve(__dirname, 'src')],
+      deny: ['**/deny/**'],
+    },
+  },
+  define: {
+    ROOT: JSON.stringify(path.dirname(__dirname).replace(/\\/g, '/')),
+  },
+})