Deuxfleurs/garage
32
61
Fork 80
Code Issues 91 Pull requests 14 Releases 31 Wiki Activity

api: fix optional \n after trailer checksum header

Browse source
This commit is contained in:
Alex 2025-02-18 12:55:45 +01:00
parent 15cd326bbd
commit 51bbe41344
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/api/common/signature/streaming.rs
View file

@ -189,7 +189,7 @@ mod payload {
use nom::bytes::streaming::{tag, take_while}; use nom::bytes::streaming::{tag, take_while};
use nom::character::streaming::hex_digit1; use nom::character::streaming::hex_digit1;
use nom::combinator::map_res; use nom::combinator::{map_res, opt};
use nom::number::streaming::hex_u32; use nom::number::streaming::hex_u32;
macro_rules! try_parse { macro_rules! try_parse {
@ -266,6 +266,11 @@ mod payload {
let (input, header_value) = try_parse!(take_while( let (input, header_value) = try_parse!(take_while(
|c: u8| c.is_ascii_alphanumeric() || b"+/=".contains(&c) |c: u8| c.is_ascii_alphanumeric() || b"+/=".contains(&c)
)(input)); )(input));
// Possible '\n' after the header value, depends on clients
// https://docs.aws.amazon.com/AmazonS3/latest/userguide/checking-object-integrity.html
let (input, _) = try_parse!(opt(tag(b"\n"))(input));
let (input, _) = try_parse!(tag(b"\r\n")(input)); let (input, _) = try_parse!(tag(b"\r\n")(input));
Ok(( Ok((