Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fs deny for case insensitive #15653

Merged
merged 7 commits into from
Jan 19, 2024
Merged

fix: fs deny for case insensitive #15653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
451955b
test: fs serve deny, case insensitive
patak-dev Jan 19, 2024
fcac4cd
test: update
patak-dev Jan 19, 2024
7492d5a
chore: make the test fail
patak-dev Jan 19, 2024
cf221d4
test: correct deny tests
patak-dev Jan 19, 2024
44b0663
fix: add nocase
patak-dev Jan 19, 2024
7082b78
test: fix tests
patak-dev Jan 19, 2024
18218f2
chore: better test
patak-dev Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/vite/src/node/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,10 @@ export async function _createServer(
_importGlobMap: new Map(),
_forceOptimizeOnRestart: false,
_pendingRequests: new Map(),
_fsDenyGlob: picomatch(config.server.fs.deny, { matchBase: true }),
_fsDenyGlob: picomatch(config.server.fs.deny, {
matchBase: true,
nocase: true,
}),
_shortcutsOptions: undefined,
}

Expand Down
8 changes: 7 additions & 1 deletion playground/fs-serve/__tests__/base/fs-serve-base.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,13 @@ describe.runIf(isServe)('main', () => {
})

test('denied', async () => {
expect(await page.textContent('.unsafe-dotenv')).toBe('404')
expect(await page.textContent('.unsafe-dotenv')).toBe('403')
})

test('denied EnV casing', async () => {
// It is 403 in case insensitive system, 404 in others
const code = await page.textContent('.unsafe-dotEnV-casing')
expect(code === '403' || code === '404').toBeTruthy()
})
})

Expand Down
8 changes: 7 additions & 1 deletion playground/fs-serve/__tests__/fs-serve.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,13 @@ describe.runIf(isServe)('main', () => {
})

test('denied', async () => {
expect(await page.textContent('.unsafe-dotenv')).toBe('404')
expect(await page.textContent('.unsafe-dotenv')).toBe('403')
})

test('denied EnV casing', async () => {
// It is 403 in case insensitive system, 404 in others
const code = await page.textContent('.unsafe-dotEnV-casing')
expect(code === '403' || code === '404').toBeTruthy()
})
})

Expand Down
16 changes: 15 additions & 1 deletion playground/fs-serve/root/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ <h2>Nested Entry</h2>

<h2>Denied</h2>
<pre class="unsafe-dotenv"></pre>
<pre class="unsafe-dotEnV-casing"></pre>

<script type="module">
import '../../entry'
Expand Down Expand Up @@ -236,14 +237,27 @@ <h2>Denied</h2>
})

// .env, denied by default
fetch(joinUrlSegments(base, joinUrlSegments('/@fs/', ROOT) + '/root/.env'))
fetch(
joinUrlSegments(base, joinUrlSegments('/@fs/', ROOT) + '/root/src/.env'),
)
.then((r) => {
text('.unsafe-dotenv', r.status)
})
.catch((e) => {
console.error(e)
})

// .env, for case insensitive file systems
fetch(
joinUrlSegments(base, joinUrlSegments('/@fs/', ROOT) + '/root/src/.EnV'),
)
.then((r) => {
text('.unsafe-dotEnV-casing', r.status)
})
.catch((e) => {
console.error(e)
})

function text(sel, text) {
document.querySelector(sel).textContent = text
}
Expand Down