Unverified Commit daca04d0 authored by Chris Tate's avatar Chris Tate Committed by GitHub

Allow multi-level .localhost subdomains in dev origin check (#92262)

## Summary

The built-in dev origin allowlist uses `*.localhost`, but `*` only
matches a single subdomain level. Multi-level `.localhost` subdomains
like `sub.app.localhost` are blocked even though all `.localhost`
domains resolve to loopback per RFC 6761.

This changes `*.localhost` to `**.localhost` so any depth of
`.localhost` subdomain is auto-allowed. The `**` glob is already
supported by `matchWildcardDomain` in `csrf-protection.ts`.

- `**.localhost` matches `app.localhost` (single level, same as before)
- `**.localhost` matches `sub.app.localhost` (multi-level, previously
blocked)
- Bare `localhost` is already separately in the allowlist, unaffected
parent feae4cc4
...@@ -119,7 +119,7 @@ export const blockCrossSiteDEV = ( ...@@ -119,7 +119,7 @@ export const blockCrossSiteDEV = (
hostname: string | undefined hostname: string | undefined
): boolean => { ): boolean => {
const allowedOrigins = [ const allowedOrigins = [
'*.localhost', '**.localhost',
'localhost', 'localhost',
...(allowedDevOrigins ?? []), ...(allowedDevOrigins ?? []),
] ]
......
...@@ -248,6 +248,14 @@ describe.each(['', '/docs'])( ...@@ -248,6 +248,14 @@ describe.each(['', '/docs'])(
}) })
}) })
it('should allow requests from multi-level localhost subdomains', async () => {
const res = await requestInternalDevMiddleware(
next.appPort,
basePath,
'https://sub.app.localhost'
)
expect(res.status).not.toBe(403)
})
it('should allow same-site requests without an origin header', async () => { it('should allow same-site requests without an origin header', async () => {
const res = await fetchViaHTTP( const res = await fetchViaHTTP(
next.appPort, next.appPort,
......
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