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

unify allowed origin detection handling (#77053)

This unifies the CSRF origin detection to mirror what we do for server
action origins, which supports things like wildcard matches (below the
domain level)

Fixes #76999
parent 0aa0ef67
...@@ -11,7 +11,7 @@ To configure a Next.js application to allow requests from origins other than the ...@@ -11,7 +11,7 @@ To configure a Next.js application to allow requests from origins other than the
```js filename="next.config.js" ```js filename="next.config.js"
module.exports = { module.exports = {
allowedDevOrigins: ['local-origin.dev'], allowedDevOrigins: ['local-origin.dev', '*.local-origin.dev'],
} }
``` ```
......
...@@ -3,6 +3,7 @@ import type { IncomingMessage, ServerResponse } from 'webpack-dev-server' ...@@ -3,6 +3,7 @@ import type { IncomingMessage, ServerResponse } from 'webpack-dev-server'
import { parseUrl } from '../../../lib/url' import { parseUrl } from '../../../lib/url'
import net from 'net' import net from 'net'
import { warnOnce } from '../../../build/output/log' import { warnOnce } from '../../../build/output/log'
import { isCsrfOriginAllowed } from '../../app-render/csrf-protection'
export const blockCrossSite = ( export const blockCrossSite = (
req: IncomingMessage, req: IncomingMessage,
...@@ -25,7 +26,7 @@ export const blockCrossSite = ( ...@@ -25,7 +26,7 @@ export const blockCrossSite = (
} }
res.end('Unauthorized') res.end('Unauthorized')
warnOnce( warnOnce(
`Blocked cross-origin request to /_next/*. To allow this, configure "allowedDevOrigins" in next.config\nRead more: https://nextjs.org/docs/app/api-reference/config/next-config-js/allowedDevOrigins` `Blocked cross-origin request to /_next/*. Cross-site requests are blocked in "no-cors" mode.`
) )
return true return true
} }
...@@ -46,9 +47,7 @@ export const blockCrossSite = ( ...@@ -46,9 +47,7 @@ export const blockCrossSite = (
// allow requests if direct IP and matching port and // allow requests if direct IP and matching port and
// allow if any of the allowed origins match // allow if any of the allowed origins match
!(isIpRequest && isMatchingPort) && !(isIpRequest && isMatchingPort) &&
!allowedOrigins.some( !isCsrfOriginAllowed(originLowerCase, allowedOrigins)
(allowedOrigin) => allowedOrigin === originLowerCase
)
) { ) {
if ('statusCode' in res) { if ('statusCode' in res) {
res.statusCode = 403 res.statusCode = 403
......
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