-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
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.
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
fix: prevent serving unrestricted files (fix #2820) #2850
Merged
Merged
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
948d493
fix: new options fsServeRoot to prevent serving unrestricted files (f…
antfu d905918
chore: update jsdoc
antfu d4dd106
Update packages/vite/src/node/server/middlewares/static.ts
antfu f47345b
chore: update docs
antfu a0e0221
Apply suggestions from code review
Shinigami92 7066730
Update packages/vite/src/node/server/middlewares/static.ts
antfu 34334d9
chore: fix imports
antfu 2679e0c
Merge branch 'main' into fix/fs-root
antfu 3051625
chore: add 403 page
antfu f4e3869
feat: search for workspace root
antfu 391ad14
chore: update
antfu f9141dd
docs: update
antfu 2f06f53
chore: update jsdoc
antfu c8acfff
chore: remove depth limit
antfu 5db3fdc
chore: update docs
antfu 92b825c
Update packages/vite/src/node/server/searchRoot.ts
antfu 3bb52aa
chore: update
antfu 28c90bc
Update packages/vite/src/node/server/middlewares/static.ts
antfu 93cf900
Update packages/vite/src/node/server/middlewares/static.ts
antfu 0501f3d
Update packages/vite/src/node/server/searchRoot.ts
antfu 099ce97
chore: remove detection for .git
antfu f771868
chore: change options to fsServe object
antfu 8bed0d8
Merge branch 'main' into fix/fs-root
antfu 7b7bef9
fix: expose type
antfu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
packages/vite/src/node/server/__tests__/fixtures/none/nested/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"private": true | ||
} |
3 changes: 3 additions & 0 deletions
3
packages/vite/src/node/server/__tests__/fixtures/pnpm/nested/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"private": true | ||
} |
3 changes: 3 additions & 0 deletions
3
packages/vite/src/node/server/__tests__/fixtures/pnpm/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"private": true | ||
} |
Empty file.
3 changes: 3 additions & 0 deletions
3
packages/vite/src/node/server/__tests__/fixtures/yarn/nested/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"private": true | ||
} |
6 changes: 6 additions & 0 deletions
6
packages/vite/src/node/server/__tests__/fixtures/yarn/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"private": true, | ||
"workspaces": [ | ||
"nested" | ||
] | ||
} |
31 changes: 31 additions & 0 deletions
31
packages/vite/src/node/server/__tests__/search-root.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { searchForWorkspaceRoot } from '../searchRoot' | ||
import { resolve } from 'path' | ||
|
||
describe('searchForWorkspaceRoot', () => { | ||
test('pnpm', () => { | ||
const resolved = searchForWorkspaceRoot( | ||
resolve(__dirname, 'fixtures/pnpm/nested') | ||
) | ||
expect(resolved).toBe(resolve(__dirname, 'fixtures/pnpm')) | ||
}) | ||
|
||
test('yarn', () => { | ||
const resolved = searchForWorkspaceRoot( | ||
resolve(__dirname, 'fixtures/yarn/nested') | ||
) | ||
expect(resolved).toBe(resolve(__dirname, 'fixtures/yarn')) | ||
}) | ||
|
||
test('yarn at root', () => { | ||
const resolved = searchForWorkspaceRoot(resolve(__dirname, 'fixtures/yarn')) | ||
expect(resolved).toBe(resolve(__dirname, 'fixtures/yarn')) | ||
}) | ||
|
||
test('none', () => { | ||
const resolved = searchForWorkspaceRoot( | ||
resolve(__dirname, 'fixtures/none/nested') | ||
) | ||
// resolved to vite repo's root | ||
expect(resolved).toBe(resolve(__dirname, '../../../../../..')) | ||
}) | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
import fs from 'fs' | ||
import { dirname } from 'path' | ||
import { join } from 'path' | ||
|
||
// https://github.com/vitejs/vite/issues/2820#issuecomment-812495079 | ||
const ROOT_FILES = [ | ||
// '.git', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What's the explanation for this? |
||
|
||
// https://pnpm.js.org/workspaces/ | ||
'pnpm-workspace.yaml' | ||
|
||
// https://rushjs.io/pages/advanced/config_files/ | ||
// 'rush.json', | ||
|
||
// https://nx.dev/latest/react/getting-started/nx-setup | ||
// 'workspace.json', | ||
// 'nx.json' | ||
antfu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
] | ||
|
||
// npm: https://docs.npmjs.com/cli/v7/using-npm/workspaces#installing-workspaces | ||
// yarn: https://classic.yarnpkg.com/en/docs/workspaces/#toc-how-to-use-it | ||
function hasWorkspacePackageJSON(root: string): boolean { | ||
const path = join(root, 'package.json') | ||
try { | ||
fs.accessSync(path, fs.constants.R_OK) | ||
} catch { | ||
return false | ||
} | ||
const content = JSON.parse(fs.readFileSync(path, 'utf-8')) || {} | ||
antfu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return !!content.workspaces | ||
} | ||
|
||
function hasRootFile(root: string): boolean { | ||
return ROOT_FILES.some((file) => fs.existsSync(join(root, file))) | ||
} | ||
|
||
export function searchForWorkspaceRoot( | ||
current: string, | ||
root = current | ||
): string { | ||
if (hasRootFile(current)) return current | ||
if (hasWorkspacePackageJSON(current)) return current | ||
|
||
const dir = dirname(current) | ||
// reach the fs root | ||
if (!dir || dir === current) return root | ||
|
||
return searchForWorkspaceRoot(dir, root) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussion with @patak-js, we are likely to add more options to configure
/@fs/
to enhance further security in the future. For example, disabling dotfiles (.env
) by default (e.g. sirv). Changed this to an object for further extensions.