Skip to content

Commit

Permalink
Reject next image urls in image optimizer (#68628)
Browse files Browse the repository at this point in the history
### What

Follow up on #67465, add more cases that should be rejected by image
optimizer when the url is tend to contain the generated next image with
`/_next/image` in url.

These should also get should get rejected:

* with encoded: `%2F_next%2Fimage%3` 
* with asset prefix: `/assets/_next/image` 
* with host: `https://<domain>/_next/image` 

Closes NDX-101
x-ref:
[slack](https://vercel.slack.com/archives/C07AYREDX45/p1720111367743119)
  • Loading branch information
huozhi authored Aug 8, 2024
1 parent 2cee0de commit 4e0790f
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 8 deletions.
8 changes: 8 additions & 0 deletions packages/next/src/lib/url.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ export function isFullStringUrl(url: string) {
return /https?:\/\//.test(url)
}

export function parseUrl(url: string): URL | undefined {
let parsed = undefined
try {
parsed = new URL(url, DUMMY_ORIGIN)
} catch {}
return parsed
}

export function stripNextRscUnionQuery(relativeUrl: string): string {
const urlInstance = new URL(relativeUrl, DUMMY_ORIGIN)
urlInstance.searchParams.delete(NEXT_RSC_UNION_QUERY)
Expand Down
11 changes: 8 additions & 3 deletions packages/next/src/server/image-optimizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { sendEtagResponse } from './send-payload'
import { getContentType, getExtension } from './serve-static'
import * as Log from '../build/output/log'
import isError from '../lib/is-error'
import { parseUrl } from '../lib/url'

type XCacheHeader = 'MISS' | 'HIT' | 'STALE'

Expand Down Expand Up @@ -213,9 +214,13 @@ export class ImageOptimizerCache {
}
}

if (url.startsWith('/_next/image')) {
return {
errorMessage: '"url" parameter cannot be recursive',
const parsedUrl = parseUrl(url)
if (parsedUrl) {
const decodedPathname = decodeURIComponent(parsedUrl.pathname)
if (/\/_next\/image($|\/)/.test(decodedPathname)) {
return {
errorMessage: '"url" parameter cannot be recursive',
}
}
}

Expand Down
46 changes: 41 additions & 5 deletions test/integration/image-optimizer/test/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
fetchViaHTTP,
File,
findPort,
getFetchUrl,
killApp,
launchApp,
nextBuild,
Expand Down Expand Up @@ -1021,11 +1022,46 @@ export function runTests(ctx: RunTestsCtx) {
)
})

it('should fail when url is recursive', async () => {
const query = { url: `/_next/image?url=test.pngw=1&q=1`, w: ctx.w, q: 1 }
const res = await fetchViaHTTP(ctx.appPort, '/_next/image', query, {})
expect(res.status).toBe(400)
expect(await res.text()).toBe(`"url" parameter cannot be recursive`)
describe('recursive url is not allowed', () => {
it('should fail with relative next image url', async () => {
const query = { url: `/_next/image?url=test.pngw=1&q=1`, w: ctx.w, q: 1 }
const res = await fetchViaHTTP(ctx.appPort, '/_next/image', query, {})
expect(res.status).toBe(400)
expect(await res.text()).toBe(`"url" parameter cannot be recursive`)
})

it('should fail with encoded relative image url', async () => {
const query = {
url: '%2F_next%2Fimage%3Furl%3Dtest.pngw%3D1%26q%3D1',
w: ctx.w,
q: 1,
}
const res = await fetchViaHTTP(ctx.appPort, '/_next/image', query, {})
expect(res.status).toBe(400)
expect(await res.text()).toBe(`"url" parameter is invalid`)
})

it('should fail with absolute next image url', async () => {
const fullUrl = getFetchUrl(
ctx.appPort,
'/_next/image?url=test.pngw=1&q=1'
)
const query = { url: fullUrl, w: ctx.w, q: 1 }
const res = await fetchViaHTTP(ctx.appPort, '/_next/image', query, {})
expect(res.status).toBe(400)
expect(await res.text()).toBe(`"url" parameter cannot be recursive`)
})

it('should fail with relative image url with assetPrefix', async () => {
const fullUrl = getFetchUrl(
ctx.appPort,
`/assets/_next/image?url=test.pngw=1&q=1`
)
const query = { url: fullUrl, w: ctx.w, q: 1 }
const res = await fetchViaHTTP(ctx.appPort, '/_next/image', query, {})
expect(res.status).toBe(400)
expect(await res.text()).toBe(`"url" parameter cannot be recursive`)
})
})

it('should fail when internal url is not an image', async () => {
Expand Down
9 changes: 9 additions & 0 deletions test/lib/next-test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,15 @@ export function withQuery(
return `${pathname}?${querystring}`
}

export function getFetchUrl(
appPort: string | number,
pathname: string,
query?: Record<string, any> | string | null | undefined
) {
const url = query ? withQuery(pathname, query) : pathname
return getFullUrl(appPort, url)
}

export function fetchViaHTTP(
appPort: string | number,
pathname: string,
Expand Down

0 comments on commit 4e0790f

Please sign in to comment.