Skip to content

Commit

Permalink
fix(next/image): handle invalid url (#67465)
Browse files Browse the repository at this point in the history
  • Loading branch information
styfle authored and huozhi committed Jul 9, 2024
1 parent b77f77e commit 3a6f211
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
16 changes: 16 additions & 0 deletions packages/next/src/server/image-optimizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,22 @@ export class ImageOptimizerCache {
return { errorMessage: '"url" parameter cannot be an array' }
}

if (url.length > 3072) {
return { errorMessage: '"url" parameter is too long' }
}

if (url.startsWith('//')) {
return {
errorMessage: '"url" parameter cannot be a protocol-relative URL (//)',
}
}

if (url.startsWith('/_next/image')) {
return {
errorMessage: '"url" parameter cannot be recursive',
}
}

let isAbsolute: boolean

if (url.startsWith('/')) {
Expand Down
23 changes: 23 additions & 0 deletions test/integration/image-optimizer/test/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,29 @@ export function runTests(ctx) {
expect(await res.text()).toBe(`"url" parameter is invalid`)
})

it('should fail when url is too long', async () => {
const query = { url: `/${'a'.repeat(4000)}`, 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 too long`)
})

it('should fail when url is protocol relative', async () => {
const query = { url: `//example.com`, 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 a protocol-relative URL (//)`
)
})

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`)
})

it('should fail when internal url is not an image', async () => {
const url = `//<h1>not-an-image</h1>`
const query = { url, w: ctx.w, q: 39 }
Expand Down

0 comments on commit 3a6f211

Please sign in to comment.