Skip to content

fix(cors): fixup #4985, allow same-origin ws requests of any domain #5142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 4, 2020
Merged

fix(cors): fixup #4985, allow same-origin ws requests of any domain #5142

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a903d65
fix: followup of #4985, allow same-site ws requests of any domain
haoqunjiang Feb 4, 2020
a3504a3
fix: match whole string
haoqunjiang Feb 4, 2020
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
19 changes: 13 additions & 6 deletions packages/@vue/cli/lib/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@ const { log, error, openBrowser } = require('@vue/cli-shared-utils')
const { portfinder, server } = require('@vue/cli-ui/server')
const shortid = require('shortid')

function simpleCorsValidation (allowedHost) {
return function (req, socket) {
const { host, origin } = req.headers
// maybe we should just use strict string equal?
const hostRegExp = new RegExp(`^(${host}|${allowedHost}|localhost)(:\\d+)?$`)

if (!origin || !hostRegExp.test(origin)) {
socket.destroy()
}
}
}

async function ui (options = {}, context = process.cwd()) {
const host = options.host || 'localhost'

Expand Down Expand Up @@ -69,12 +81,7 @@ async function ui (options = {}, context = process.cwd()) {
}
})

httpServer.on('upgrade', (req, socket) => {
const { origin } = req.headers
if (!origin || !(new RegExp(host)).test(origin)) {
socket.destroy()
}
})
httpServer.on('upgrade', simpleCorsValidation(host))
}

module.exports = (...args) => {
Expand Down