Commit 89ec5fe

committed

Fix domains with ports & localhost subdomains

1 parent 35830af commit 89ec5feCopy full SHA for 89ec5fe

File tree

+12

-10

lines changed

+12

-10

lines changed

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ export class ProxyHttpProvider extends HttpProvider implements HttpProxyProvider`
`61`	`61`	`current = domain`
`62`	`62`	`}`
`63`	`63`	`})`
`64`		`- return current \|\| host`
	`64`	`+ // Setting the domain to localhost doesn't seem to work for subdomains (for`
	`65`	`+ // example dev.localhost).`
	`66`	`+ return current && current !== "localhost" ? current : host`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`public maybeProxyRequest(`
`@@ -90,12 +92,11 @@ export class ProxyHttpProvider extends HttpProvider implements HttpProxyProvider`
`90`	`92`	`return undefined`
`91`	`93`	`}`
`92`	`94`
`93`		`- // At minimum there needs to be sub.domain.tld.`
`94`		`- const host = request.headers.host`
`95`		`- const parts = host && host.split(".")`
`96`		`- if (!parts \|\| parts.length < 3) {`
`97`		`- return undefined`
`98`		`- }`
	`95`	`+ // Split into parts.`
	`96`	`+ const host = request.headers.host \|\| ""`
	`97`	`+ const idx = host.indexOf(":")`
	`98`	`+ const domain = idx !== -1 ? host.substring(0, idx) : host`
	`99`	`+ const parts = domain.split(".")`
`99`	`100`
`100`	`101`	`// There must be an exact match.`
`101`	`102`	`const port = parts.shift()`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,9 @@ export class HttpServer {`
`581`	`581`	`this.heart.beat()`
`582`	`582`	`const route = this.parseUrl(request)`
`583`	`583`	`const write = (payload: HttpResponse): void => {`
	`584`	`+ const host = request.headers.host \|\| ""`
	`585`	`+ const idx = host.indexOf(":")`
	`586`	`+ const domain = idx !== -1 ? host.substring(0, idx) : host`
`584`	`587`	`response.writeHead(payload.redirect ? HttpCode.Redirect : payload.code \|\| HttpCode.Ok, {`
`585`	`588`	`"Content-Type": payload.mime \|\| getMediaMime(payload.filePath),`
`586`	`589`	`...(payload.redirect ? { Location: this.constructRedirect(request, route, payload as RedirectResponse) } : {}),`
`@@ -591,9 +594,7 @@ export class HttpServer {`
`591`	`594`	`"Set-Cookie": [`
`592`	`595`	`${payload.cookie.key}=${payload.cookie.value}`,
`593`	`596`	`Path=${normalize(payload.cookie.path \|\| "/", true)}`,
`594`		`- request.headers.host`
`595`		- ? `Domain=${(this.proxy && this.proxy.getCookieDomain(request.headers.host)) \|\| request.headers.host}`
`596`		`- : undefined,`
	`597`	+ domain ? `Domain=${(this.proxy && this.proxy.getCookieDomain(domain)) \|\| domain}` : undefined,
`597`	`598`	`// "HttpOnly",`
`598`	`599`	`"SameSite=strict",`
`599`	`600`	`]`

Comments

(0)