8000 fix: `fs.deny` with globs with directories (#16250) · vitejs/vite@96a7f3a · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 96a7f3a

Browse files
sapphi-redsapphi-red
committed
fix: fs.deny with globs with directories (#16250)
1 parent d0360c1 commit 96a7f3a

File tree

6 files changed

+58
-5
lines changed

6 files changed

+58
-5
lines changed

‎packages/vite/src/node/server/index.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,10 +509,19 @@ export async function _createServer(
509509
_importGlobMap: new Map(),
510510
_forceOptimizeOnRestart: false,
511511
_pendingRequests: new Map(),
512-
_fsDenyGlob: picomatch(config.server.fs.deny, {
513-
matchBase: true,
514-
nocase: true,
515-
}),
512+
_fsDenyGlob: picomatch(
513+
// matchBase: true does not work as it's documented
514+
// https://github.com/micromatch/picomatch/issues/89
515+
// convert patterns without `/` on our side for now
516+
config.server.fs.deny.map((pattern) =>
517+
pattern.includes('/') ? pattern : `**/${pattern}`,
518+
),
519+
{
520+
matchBase: false,
521+
nocase: true,
522+
dot: true,
523+
},
524+
),
516525
_shortcutsOptions: undefined,
517526
}
518527

‎playground/fs-serve/__tests__/deny/fs-serve-deny.spec.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { describe, expect, test } from 'vitest'
2+
import { isServe, page, viteTestUrl } from '~utils'
3+
4+
describe.runIf(isServe)('main', () => {
5+
test('**/deny/** should deny src/deny/deny.txt', async () => {
6+
const res = await page.request.fetch(
7+
new URL('/src/deny/deny.txt', viteTestUrl).href,
8+
)
9+
expect(res.status()).toBe(403)
10+
})
11+
test('**/deny/** should deny src/deny/.deny', async () => {
12+
const res = await page.request.fetch(
13+
new URL('/src/deny/.deny', viteTestUrl).href,
14+
)
15+
expect(res.status()).toBe(403)
16+
})
17+
})

‎playground/fs-serve/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
"preview": "vite preview root",
1111
"dev:base": "vite root --config ./root/vite.config-base.js",
1212
"build:base": "vite build root --config ./root/vite.config-base.js",
13-
"preview:base": "vite preview root --config ./root/vite.config-base.js"
13+
"preview:base": "vite preview root --config ./root/vite.config-base.js",
14+
"dev:deny": "vite root --config ./root/vite.config-deny.js",
15+
"build:deny": "vite build root --config ./root/vite.config-deny.js",
16+
"preview:deny": "vite preview root --config ./root/vite.config-deny.js"
1417
}
1518
}

‎playground/fs-serve/root/src/deny/.deny

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.deny

‎playground/fs-serve/root/src/deny/deny.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deny

‎playground/fs-serve/root/vite.config-deny.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import path from 'node:path'
2+
import { defineConfig } from 'vite'
3+
4+
export default defineConfig({
5+
build: {
6+
rollupOptions: {
7+
input: {
8+
main: path.resolve(__dirname, 'src/index.html'),
9+
},
10+
},
11+
},
12+
server: {
13+
fs: {
14+
strict: true,
15+
allow: [path.resolve(__dirname, 'src')],
16+
deny: ['**/deny/**'],
17+
},
18+
},
19+
define: {
20+
ROOT: JSON.stringify(path.dirname(__dirname).replace(/\\/g, '/')),
21+
},
22+
})

0 commit comments

Comments
 (0)
0