Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/utils/repo-path.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ export function isValidRepoPath(path: string) {
return false
}

if (
path.startsWith('/') ||
path.endsWith('/') ||
path.includes('//') ||
path.includes('..')
) {
if (path.startsWith('/') || path.endsWith('/') || path.includes('//')) {
return false
}

return path.split('/').every((segment) => {
// Reject only actual relative path segments, not names like `[...404].tsx`
if (segment === '.' || segment === '..') {
return false
}

return REPO_PATH_SEGMENT_PATTERN.test(segment)
})
}
Expand Down
32 changes: 32 additions & 0 deletions tests/repo-path.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,38 @@ assert.equal(
'traversal is rejected',
)

assert.equal(
isValidRepoPath(
'examples/solid/solid-start-streaming/src/routes/[...404].tsx',
),
true,
'catch-all route files with spread notation are valid repo path segments',
)

assert.equal(
isValidRepoPath('examples/svelte/basic/src/routes/[...slug]/+page.svelte'),
true,
'catch-all route directories with spread notation are valid repo path segments',
)

assert.equal(
isValidRepoPath('src/../routes/__root.tsx'),
false,
'nested traversal is rejected',
)

assert.equal(
isValidRepoPath('src/routes/..'),
false,
'trailing traversal is rejected',
)

assert.equal(
isValidRepoPath('src/./routes/__root.tsx'),
false,
'current-directory segments are rejected',
)

assert.equal(
isValidRepoPath('src/routes//__root.tsx'),
false,
Expand Down
Loading