Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ext/node/ops/zlib/brotli): Allow decompressing more than 4096 bytes #20301

Merged
merged 7 commits into from
Sep 8, 2023
Merged

fix(ext/node/ops/zlib/brotli): Allow decompressing more than 4096 bytes #20301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
540ab3d
use brotli rust API for decompression
lachrimae Aug 27, 2023
ec613b8
add test
lachrimae Aug 27, 2023
598ea29
Merge branch 'main' into fix-4096-limit-brotli-decompress
lachrimae Aug 27, 2023
60f62e3
add required types
lachrimae Aug 27, 2023
88cf41c
Merge branch 'fix-4096-limit-brotli-decompress' of github.com:lachrim…
lachrimae Aug 27, 2023
6c14494
add assertion to test
lachrimae Aug 27, 2023
4d6dd26
Merge branch 'main' into fix-4096-limit-brotli-decompress
littledivy Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cli/tests/unit_node/zlib_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ Deno.test("brotli compression", async () => {
}
});

Deno.test("brotli end-to-end with 4097 bytes", () => {
const a = "a".repeat(4097);
const compressed = brotliCompressSync(a);
const decompressed = brotliDecompressSync(compressed);
assertEquals(decompressed.toString(), a);
});

Deno.test(
"zlib create deflate with dictionary",
{ sanitizeResources: false },
Expand Down
36 changes: 6 additions & 30 deletions ext/node/ops/zlib/brotli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ use brotli::ffi::compressor::*;
use brotli::ffi::decompressor::ffi::interface::BrotliDecoderResult;
use brotli::ffi::decompressor::ffi::BrotliDecoderState;
use brotli::ffi::decompressor::*;
use brotli::Decompressor;
use deno_core::error::type_error;
use deno_core::error::AnyError;
use deno_core::op;
use deno_core::JsBuffer;
use deno_core::OpState;
use deno_core::Resource;
use deno_core::ToJsBuffer;
use std::io::Read;

fn encoder_mode(mode: u32) -> Result<BrotliEncoderMode, AnyError> {
if mode > 6 {
Expand Down Expand Up @@ -214,36 +216,10 @@ pub fn op_brotli_compress_stream_end(
}

fn brotli_decompress(buffer: &[u8]) -> Result<ToJsBuffer, AnyError> {
let in_buffer = buffer.as_ptr();
let in_size = buffer.len();

let mut out = vec![0u8; 4096];
loop {
let out_buffer = out.as_mut_ptr();
let mut out_size = out.len();
// SAFETY: TODO(littledivy)
match unsafe {
CBrotliDecoderDecompress(
in_size,
in_buffer,
&mut out_size as *mut usize,
out_buffer,
)
} {
BrotliDecoderResult::BROTLI_DECODER_RESULT_SUCCESS => {
out.truncate(out_size);
return Ok(out.into());
}
BrotliDecoderResult::BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT => {
let new_size = out.len() * 2;
if new_size < out.len() {
return Err(type_error("Failed to decompress"));
}
out.resize(new_size, 0);
}
_ => return Err(type_error("Failed to decompress")),
}
}
let mut output = Vec::with_capacity(4096);
let mut decompressor = Decompressor::new(buffer, buffer.len());
decompressor.read_to_end(&mut output)?;
Ok(output.into())
}

#[op]
Expand Down