proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-29 13:52:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rest-server: Encode with zlib headers

Browse Source 
As per [RFC9110] the Deflate encoding is a "zlib" data format. This
makes the rest-server compatible with the http-client.

[RFC9110] https://www.rfc-editor.org/rfc/rfc9110#field.content-encoding

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Max Carrara <m.carrara@proxmox.com>
This commit is contained in:
Maximiliano Sandoval 2024-07-16 11:22:47 +02:00 committed by Thomas Lamprecht
parent 500fb592f9
commit a50d2c715e
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
proxmox-rest-server/src/rest.rs
View File

@ -30,7 +30,7 @@ use proxmox_router::{http_bail, http_err};
use proxmox_schema::{ObjectSchemaType, ParameterSchema}; use proxmox_schema::{ObjectSchemaType, ParameterSchema};
use proxmox_async::stream::AsyncReaderStream; use proxmox_async::stream::AsyncReaderStream;
use proxmox_compression::{DeflateEncoder, Level}; use proxmox_compression::DeflateEncoder;
use proxmox_log::FileLogger; use proxmox_log::FileLogger;
use crate::{ use crate::{
@ -557,12 +557,13 @@ pub(crate) async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHa
CompressionMethod::Deflate.content_encoding(), CompressionMethod::Deflate.content_encoding(),
); );
resp.map(|body| { resp.map(|body| {
Body::wrap_stream(DeflateEncoder::with_quality( Body::wrap_stream(
TryStreamExt::map_err(body, |err| { DeflateEncoder::builder(TryStreamExt::map_err(body, |err| {
proxmox_lang::io_format_err!("error during compression: {}", err) proxmox_lang::io_format_err!("error during compression: {}", err)
}), }))
Level::Default, .zlib(true)
)) .build(),
)
}) })
} }
None => resp, None => resp,
@ -651,12 +652,13 @@ async fn handle_unformatted_api_request<Env: RpcEnvironment, S: 'static + BuildH
CompressionMethod::Deflate.content_encoding(), CompressionMethod::Deflate.content_encoding(),
); );
resp.map(|body| { resp.map(|body| {
Body::wrap_stream(DeflateEncoder::with_quality( Body::wrap_stream(
TryStreamExt::map_err(body, |err| { DeflateEncoder::builder(TryStreamExt::map_err(body, |err| {
proxmox_lang::io_format_err!("error during compression: {}", err) proxmox_lang::io_format_err!("error during compression: {}", err)
}), }))
Level::Default, .zlib(true)
)) .build(),
)
}) })
} }
None => resp, None => resp,
@ -711,7 +713,7 @@ async fn simple_static_file_download(
let mut response = match compression { let mut response = match compression {
Some(CompressionMethod::Deflate) => { Some(CompressionMethod::Deflate) => {
let mut enc = DeflateEncoder::with_quality(data, Level::Default); let mut enc = DeflateEncoder::builder(data).zlib(true).build();
enc.compress_vec(&mut file, CHUNK_SIZE_LIMIT as usize) enc.compress_vec(&mut file, CHUNK_SIZE_LIMIT as usize)
.await?; .await?;
let mut response = Response::new(enc.into_inner().into()); let mut response = Response::new(enc.into_inner().into());
@ -752,10 +754,11 @@ async fn chunked_static_file_download(
header::CONTENT_ENCODING, header::CONTENT_ENCODING,
CompressionMethod::Deflate.content_encoding(), CompressionMethod::Deflate.content_encoding(),
); );
Body::wrap_stream(DeflateEncoder::with_quality( Body::wrap_stream(
AsyncReaderStream::new(file), DeflateEncoder::builder(AsyncReaderStream::new(file))
Level::Default, .zlib(true)
)) .build(),
)
} }
None => Body::wrap_stream(AsyncReaderStream::new(file)), None => Body::wrap_stream(AsyncReaderStream::new(file)),
}; };