Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/http-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,7 @@ function HttpServer(options) {
if (typeof options.proxy === 'string' && options.websocket) {
this.server.on('upgrade', function (request, socket, head) {
proxy.ws(request, socket, head, {
target: options.proxy,
changeOrigin: true
target: options.proxy
}, function (err, req, res) {
if (options.logFn) {
options.logFn(req, res, {
Expand Down
37 changes: 36 additions & 1 deletion test/websocket-proxy.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,39 @@ test('websocket proxy error handling', (t) => {
t.fail(err.toString())
t.end()
})
})
})

for (const changeOrigin of [undefined, true, false]) {
const name = changeOrigin === undefined ? 'default' : String(changeOrigin)
test(`websocket proxy changeOrigin: ${name}`, async (t) => {
const targetServer = http.createServer()
const targetWss = new WebSocket.Server({ server: targetServer })
t.teardown(() => {
for (const socket of targetWss.clients) socket.terminate()
targetWss.close()
return new Promise((resolve) => targetServer.close(resolve))
})
targetWss.on('connection', (socket, request) => {
socket.send(request.headers.host)
})
await new Promise((resolve) => targetServer.listen(0, '127.0.0.1', resolve))
const targetHost = `127.0.0.1:${targetServer.address().port}`
const proxyServer = httpServer.createServer({
proxy: `http://${targetHost}`,
websocket: true,
proxyOptions: changeOrigin === undefined ? undefined : { changeOrigin },
root: path.join(__dirname, 'fixtures')
})
t.teardown(() => new Promise((resolve) => proxyServer.server.close(resolve)))
await new Promise((resolve) => proxyServer.listen(0, '127.0.0.1', resolve))
const proxyHost = `127.0.0.1:${proxyServer.server.address().port}`
const socket = new WebSocket(`ws://${proxyHost}`)
t.teardown(() => socket.terminate())
const receivedHost = await new Promise((resolve, reject) => {
socket.once('message', (data) => resolve(data.toString()))
socket.once('error', reject)
})
t.equal(receivedHost, changeOrigin === false ? proxyHost : targetHost,
'upstream Host follows the configured changeOrigin option')
})
}