Unverified Commit d0a0474d authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

fix allowedDevOrigins for no-cors requests (#91506)

This PR makes configured `allowedDevOrigins` apply to cross-site no-cors dev asset requests. When browsers omit Origin for subresource loads, the dev guard now falls back to `Referer` so explicit allowlisted hosts can load `/_next/*` resources in development.

Previously, when `allowedDevOrigins` was configured, cross-site no-cors requests to internal Next.js dev resources were still blocked even for allowlisted hosts, because that code path never consulted the allowlist.
parent 89c6e73c
...@@ -31,6 +31,19 @@ function warnOrBlockRequest( ...@@ -31,6 +31,19 @@ function warnOrBlockRequest(
return true return true
} }
function parseHostnameFromHeader(
header: string | string[] | undefined
): string | undefined {
const headerValue = Array.isArray(header) ? header[0] : header
if (!headerValue || headerValue === 'null') {
return
}
const parsedHeader = parseUrl(headerValue)
return parsedHeader?.hostname.toLowerCase()
}
function isInternalEndpoint(req: IncomingMessage): boolean { function isInternalEndpoint(req: IncomingMessage): boolean {
if (!req.url) return false if (!req.url) return false
...@@ -80,13 +93,27 @@ export const blockCrossSiteDEV = ( ...@@ -80,13 +93,27 @@ export const blockCrossSiteDEV = (
req.headers['sec-fetch-mode'] === 'no-cors' && req.headers['sec-fetch-mode'] === 'no-cors' &&
req.headers['sec-fetch-site'] === 'cross-site' req.headers['sec-fetch-site'] === 'cross-site'
) { ) {
return warnOrBlockRequest(res, undefined, mode) // no-cors requests do not send an Origin header, so fall back to Referer
// when validating configured cross-site script loads.
const refererHostname = parseHostnameFromHeader(req.headers['referer'])
if (
refererHostname &&
isCsrfOriginAllowed(refererHostname, allowedOrigins)
) {
return false
}
return warnOrBlockRequest(res, refererHostname, mode)
} }
// ensure websocket requests are only fulfilled from allowed origin // ensure websocket requests are only fulfilled from allowed origin
const rawOrigin = req.headers['origin'] const rawOrigin = req.headers['origin']
const originHeader = Array.isArray(rawOrigin) ? rawOrigin[0] : rawOrigin
const parsedOrigin = const parsedOrigin =
rawOrigin && rawOrigin !== 'null' ? parseUrl(rawOrigin) : rawOrigin originHeader && originHeader !== 'null'
? parseUrl(originHeader)
: originHeader
const originLowerCase = const originLowerCase =
parsedOrigin === undefined || typeof parsedOrigin === 'string' parsedOrigin === undefined || typeof parsedOrigin === 'string'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment