Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
36a97b9b
Commit
36a97b9b
authored
Feb 24, 2026
by
Sebastian "Sebbie" Silbermann
Committed by
Zack Tanner
Mar 16, 2026
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow blocking cross-site dev-only websocket connections from privacy-sensitive origins (#62)
parent
93c3993a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
21 deletions
+72
-21
router-server.ts
packages/next/src/server/lib/router-server.ts
+3
-3
block-cross-site-dev.ts
.../next/src/server/lib/router-utils/block-cross-site-dev.ts
+19
-18
allowed-dev-origins.test.ts
test/development/basic/allowed-dev-origins.test.ts
+50
-0
No files found.
packages/next/src/server/lib/router-server.ts
View file @
36a97b9b
...
@@ -48,7 +48,7 @@ import { normalizedAssetPrefix } from '../../shared/lib/normalized-asset-prefix'
...
@@ -48,7 +48,7 @@ import { normalizedAssetPrefix } from '../../shared/lib/normalized-asset-prefix'
import
{
NEXT_PATCH_SYMBOL
}
from
'./patch-fetch'
import
{
NEXT_PATCH_SYMBOL
}
from
'./patch-fetch'
import
type
{
ServerInitResult
}
from
'./render-server'
import
type
{
ServerInitResult
}
from
'./render-server'
import
{
filterInternalHeaders
}
from
'./server-ipc/utils'
import
{
filterInternalHeaders
}
from
'./server-ipc/utils'
import
{
blockCrossSite
}
from
'./router-utils/block-cross-site
'
import
{
blockCrossSite
DEV
}
from
'./router-utils/block-cross-site-dev
'
import
{
traceGlobals
}
from
'../../trace/shared'
import
{
traceGlobals
}
from
'../../trace/shared'
import
{
NoFallbackError
}
from
'../../shared/lib/no-fallback-error.external'
import
{
NoFallbackError
}
from
'../../shared/lib/no-fallback-error.external'
import
{
import
{
...
@@ -345,7 +345,7 @@ export async function initialize(opts: {
...
@@ -345,7 +345,7 @@ export async function initialize(opts: {
// handle hot-reloader first
// handle hot-reloader first
if
(
development
)
{
if
(
development
)
{
if
(
if
(
blockCrossSite
(
blockCrossSite
DEV
(
req
,
req
,
res
,
res
,
development
.
config
.
allowedDevOrigins
,
development
.
config
.
allowedDevOrigins
,
...
@@ -802,7 +802,7 @@ export async function initialize(opts: {
...
@@ -802,7 +802,7 @@ export async function initialize(opts: {
if
(
opts
.
dev
&&
development
&&
req
.
url
)
{
if
(
opts
.
dev
&&
development
&&
req
.
url
)
{
if
(
if
(
blockCrossSite
(
blockCrossSite
DEV
(
req
,
req
,
socket
,
socket
,
development
.
config
.
allowedDevOrigins
,
development
.
config
.
allowedDevOrigins
,
...
...
packages/next/src/server/lib/router-utils/block-cross-site.ts
→
packages/next/src/server/lib/router-utils/block-cross-site
-dev
.ts
View file @
36a97b9b
...
@@ -31,7 +31,7 @@ function warnOrBlockRequest(
...
@@ -31,7 +31,7 @@ function warnOrBlockRequest(
return
true
return
true
}
}
function
isInternal
Dev
Endpoint
(
req
:
IncomingMessage
):
boolean
{
function
isInternalEndpoint
(
req
:
IncomingMessage
):
boolean
{
if
(
!
req
.
url
)
return
false
if
(
!
req
.
url
)
return
false
try
{
try
{
...
@@ -50,7 +50,7 @@ function isInternalDevEndpoint(req: IncomingMessage): boolean {
...
@@ -50,7 +50,7 @@ function isInternalDevEndpoint(req: IncomingMessage): boolean {
}
}
}
}
export
const
blockCrossSite
=
(
export
const
blockCrossSite
DEV
=
(
req
:
IncomingMessage
,
req
:
IncomingMessage
,
res
:
ServerResponse
|
Duplex
,
res
:
ServerResponse
|
Duplex
,
allowedDevOrigins
:
string
[]
|
undefined
,
allowedDevOrigins
:
string
[]
|
undefined
,
...
@@ -70,9 +70,10 @@ export const blockCrossSite = (
...
@@ -70,9 +70,10 @@ export const blockCrossSite = (
}
}
// only process internal URLs/middleware
// only process internal URLs/middleware
if
(
!
isInternal
Dev
Endpoint
(
req
))
{
if
(
!
isInternalEndpoint
(
req
))
{
return
false
return
false
}
}
// block non-cors request from cross-site e.g. script tag on
// block non-cors request from cross-site e.g. script tag on
// different host
// different host
if
(
if
(
...
@@ -82,20 +83,20 @@ export const blockCrossSite = (
...
@@ -82,20 +83,20 @@ export const blockCrossSite = (
return
warnOrBlockRequest
(
res
,
undefined
,
mode
)
return
warnOrBlockRequest
(
res
,
undefined
,
mode
)
}
}
// ensure websocket requests from allowed origin
// ensure websocket requests
are only fulfilled
from allowed origin
const
rawOrigin
=
req
.
headers
[
'origin'
]
const
rawOrigin
=
req
.
headers
[
'origin'
]
const
parsedOrigin
=
if
(
rawOrigin
&&
rawOrigin
!==
'null'
)
{
rawOrigin
&&
rawOrigin
!==
'null'
?
parseUrl
(
rawOrigin
)
:
rawOrigin
const
parsedOrigin
=
parseUrl
(
rawOrigin
)
const
originLowerCase
=
if
(
parsedOrigin
)
{
parsedOrigin
===
undefined
||
typeof
parsedOrigin
===
'string'
const
originLowerCase
=
parsedOrigin
.
hostname
.
toLowerCase
()
?
parsedOrigin
:
parsedOrigin
.
hostname
.
toLowerCase
()
if
(
!
isCsrfOriginAllowed
(
originLowerCase
,
allowedOrigins
))
{
return
warnOrBlockRequest
(
res
,
originLowerCase
,
mode
)
// Allow requests with no origin since those are just GET requests from same-site
}
return
(
}
originLowerCase
!==
undefined
&&
}
!
isCsrfOriginAllowed
(
originLowerCase
,
allowedOrigins
)
&&
warnOrBlockRequest
(
res
,
originLowerCase
,
mode
)
return
false
)
}
}
test/development/basic/allowed-dev-origins.test.ts
View file @
36a97b9b
...
@@ -361,6 +361,56 @@ describe.each([['', '/docs']])(
...
@@ -361,6 +361,56 @@ describe.each([['', '/docs']])(
server
.
close
()
server
.
close
()
}
}
})
})
it
(
'blocks cross-site requests from privacy-sensitive origins'
,
async
()
=>
{
const
server
=
http
.
createServer
((
req
,
res
)
=>
{
res
.
appendHeader
(
'Content-Security-Policy'
,
'sandbox allow-scripts'
)
res
.
end
(
`
<html>
<head>
<title>testing cross-site privacy-sensitive</title>
</head>
<body>
<script>
(() => {
const statusEl = document.createElement('p')
statusEl.id = 'status'
document.querySelector('body').appendChild(statusEl)
const ws = new WebSocket("
${
next
.
url
}
/_next/webpack-hmr")
ws.addEventListener('error', (err) => {
statusEl.innerText = 'error'
})
ws.addEventListener('open', () => {
statusEl.innerText = 'connected'
})
})()
</script>
</body>
</html>
`
)
})
const
port
=
await
findPort
()
await
new
Promise
<
void
>
((
res
)
=>
{
server
.
listen
(
port
,
()
=>
res
())
})
try
{
const
browser
=
await
webdriver
(
`http://127.0.0.1:
${
port
}
`
,
'/'
)
await
retry
(
async
()
=>
{
expect
(
await
browser
.
elementByCss
(
'#status'
).
text
()).
toBe
(
'error'
)
})
}
finally
{
await
new
Promise
<
void
>
((
res
)
=>
{
server
.
close
(()
=>
{
res
()
})
})
}
})
})
})
}
}
)
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment