Skip to content

Commit

Permalink
fix(buildToRequest): double slash path
Browse files Browse the repository at this point in the history
  • Loading branch information
aui committed Jan 24, 2024
1 parent 39b48e3 commit 61e145e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packages/node-utils/src/node-to-edge/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ export function buildToRequest(dependencies: BuildDependencies) {
request: IncomingMessage,
options: RequestOptions,
): Request {
const base = computeOrigin(request, options.defaultOrigin)
return new Request(
String(
new URL(
request.url || '/',
computeOrigin(request, options.defaultOrigin),
),
request.url?.startsWith('//')
? new URL(base + request.url)
: new URL(request.url || '/', base),
),
{
method: request.method,
Expand Down
6 changes: 6 additions & 0 deletions packages/node-utils/test/node-to-edge/request.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ it(`uses default origin as request url origin when there are no host header`, as
expect(request.url).toEqual(`${server.url}/`)
})

it(`paths starting with double slashes should not reset the origin`, async () => {
const slashes = '//foo'
const request = await mapRequest(`${server.url}${slashes}`)
expect(request.url).toEqual(`${server.url}${slashes}`)
})

it(`uses request host header as request url origin`, async () => {
const host = 'vercel.com'
await expect(
Expand Down

0 comments on commit 61e145e

Please sign in to comment.