Skip to content

Commit a9a3df2

Browse files
authored
fix: check server.fs after stripping query as well (#22160)
1 parent f02d9fd commit a9a3df2

File tree

10 files changed

+679
-713
lines changed

10 files changed

+679
-713
lines changed

packages/vite/src/node/server/middlewares/transform.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ export function isServerAccessDeniedForTransform(
6262
id: string,
6363
): boolean {
6464
if (rawRE.test(id) || urlRE.test(id) || inlineRE.test(id) || svgRE.test(id)) {
65-
return checkLoadingAccess(config, id) !== 'allowed'
65+
return (
66+
checkLoadingAccess(config, cleanUrl(id)) !== 'allowed' ||
67+
checkLoadingAccess(config, id) !== 'allowed'
68+
)
6669
}
6770
return false
6871
}
@@ -319,7 +322,13 @@ export function transformMiddleware(
319322
}
320323
if (e?.code === ERR_DENIED_ID) {
321324
const id: string = e.id
322-
const servingAccessResult = checkLoadingAccess(server.config, id)
325+
let servingAccessResult = checkLoadingAccess(
326+
server.config,
327+
cleanUrl(id),
328+
)
329+
if (servingAccessResult === 'allowed') {
330+
servingAccessResult = checkLoadingAccess(server.config, id)
331+
}
323332
if (servingAccessResult === 'denied') {
324333
respondWithAccessDenied(id, server, res)
325334
return true

0 commit comments

Comments
 (0)