mirror of
https://github.com/harttle/liquidjs.git
synced 2026-09-16 04:40:39 -07:00
fix(security): charge pop filter allocation to memoryLimit (#907)
* fix(security): charge pop filter allocation to memoryLimit (CWE-770) The `pop` array filter cloned the input via `[...toArray(v)]` without charging `this.context.memoryLimit.use(...)`, bypassing the memoryLimit DoS guard that its sibling filters (shift, unshift, compact, etc.) apply. Mirror `shift` to account for the O(N) allocation. Co-authored-by: Cursor <[email protected]> * fix(security): charge sample filter full clone allocation to memoryLimit (CWE-770) Co-authored-by: Cursor <[email protected]> --------- Co-authored-by: Cursor <[email protected]>
This commit is contained in:
@@ -88,8 +88,10 @@ export function unshift<T> (this: FilterImpl, v: T[], arg: T): T[] {
|
|||||||
return clone
|
return clone
|
||||||
}
|
}
|
||||||
|
|
||||||
export function pop<T> (v: T[]): T[] {
|
export function pop<T> (this: FilterImpl, v: T[]): T[] {
|
||||||
const clone = [...toArray(v)]
|
const array = toArray(v)
|
||||||
|
this.context.memoryLimit.use(array.length)
|
||||||
|
const clone = [...array]
|
||||||
clone.pop()
|
clone.pop()
|
||||||
return clone
|
return clone
|
||||||
}
|
}
|
||||||
@@ -252,7 +254,7 @@ export function sample<T> (this: FilterImpl, v: T[] | string, count = 1): T | st
|
|||||||
v = toValue(v)
|
v = toValue(v)
|
||||||
if (isNil(v)) return []
|
if (isNil(v)) return []
|
||||||
if (!isArray(v)) v = stringify(v)
|
if (!isArray(v)) v = stringify(v)
|
||||||
this.context.memoryLimit.use(count)
|
this.context.memoryLimit.use(v.length)
|
||||||
const shuffled = [...v].sort(() => Math.random() - 0.5)
|
const shuffled = [...v].sort(() => Math.random() - 0.5)
|
||||||
if (count === 1) return shuffled[0]
|
if (count === 1) return shuffled[0]
|
||||||
return shuffled.slice(0, count)
|
return shuffled.slice(0, count)
|
||||||
|
|||||||
@@ -79,6 +79,16 @@ describe('DoS related', function () {
|
|||||||
await expect(liquid.parseAndRender(src, { array, count: 3 })).resolves.toBe('a a a a a a a a')
|
await expect(liquid.parseAndRender(src, { array, count: 3 })).resolves.toBe('a a a a a a a a')
|
||||||
await expect(liquid.parseAndRender(src, { array, count: 100 })).rejects.toThrow('memory alloc limit exceeded, line:1, col:26')
|
await expect(liquid.parseAndRender(src, { array, count: 100 })).rejects.toThrow('memory alloc limit exceeded, line:1, col:26')
|
||||||
})
|
})
|
||||||
|
it('should charge pop allocation to memoryLimit', async () => {
|
||||||
|
const array = Array(1e3).fill(0)
|
||||||
|
const liquid = new Liquid({ memoryLimit: 100 })
|
||||||
|
await expect(liquid.parseAndRender('{{ array | pop | size }}', { array })).rejects.toThrow('memory alloc limit exceeded')
|
||||||
|
})
|
||||||
|
it('should charge sample allocation to memoryLimit', async () => {
|
||||||
|
const array = Array(1e3).fill(0)
|
||||||
|
const liquid = new Liquid({ memoryLimit: 100 })
|
||||||
|
await expect(liquid.parseAndRender('{{ array | sample: 1 | size }}', { array })).rejects.toThrow('memory alloc limit exceeded')
|
||||||
|
})
|
||||||
it('should charge strip_html input length to memoryLimit', () => {
|
it('should charge strip_html input length to memoryLimit', () => {
|
||||||
const liquid = new Liquid({ memoryLimit: 100 })
|
const liquid = new Liquid({ memoryLimit: 100 })
|
||||||
expect(() => liquid.parseAndRenderSync('{{ s | strip_html }}', { s: 'a'.repeat(200) }))
|
expect(() => liquid.parseAndRenderSync('{{ s | strip_html }}', { s: 'a'.repeat(200) }))
|
||||||
|
|||||||
Reference in New Issue
Block a user