Commit 36a97b9b authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by Zack Tanner

Allow blocking cross-site dev-only websocket connections from privacy-sensitive origins (#62)

parent 93c3993a
...@@ -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 { blockCrossSiteDEV } 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( blockCrossSiteDEV(
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( blockCrossSiteDEV(
req, req,
socket, socket,
development.config.allowedDevOrigins, development.config.allowedDevOrigins,
......
...@@ -31,7 +31,7 @@ function warnOrBlockRequest( ...@@ -31,7 +31,7 @@ function warnOrBlockRequest(
return true return true
} }
function isInternalDevEndpoint(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 blockCrossSiteDEV = (
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 (!isInternalDevEndpoint(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 )
} }
...@@ -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()
})
})
}
})
}) })
} }
) )
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