mirror of
https://github.com/rustfs/rustfs.git
synced 2026-07-28 09:08:58 +00:00
0d00b886ac
* fix(rio): surface incomplete put bodies Propagate incomplete PUT request bodies as IncompleteBody instead of allowing erasure encode to treat truncated input as a normal EOF.\n\n- mark premature EOFs in HardLimitReader with an explicit IncompleteBody error\n- preserve EOF error chains through read_full and map them to S3 IncompleteBody\n- stop erasure encode from swallowing UnexpectedEof on truncated input\n- add regression tests for reader, erasure encode, and API error mapping\n\nRefs: rustfs/backlog#654 * fix(s3): honor decoded length for aws chunked put Use x-amz-decoded-content-length for aws-chunked PutObject requests so trailer-checksum uploads are sized against the decoded payload instead of the wire-encoded content-length.\n\n- prefer decoded content length for aws-chunked put bodies\n- add a regression test covering the size selection logic\n- keeps the incomplete body fix working for truly truncated uploads while restoring checksum trailer compatibility\n\nRefs: rustfs/backlog#654 * fix(io): follow up review comments on incompletebody handling Address PR review feedback by restoring read_full's existing EOF contract, adding a dedicated read_full_or_eof helper for erasure encoding, covering nested incomplete-body error chains, and documenting plus hardening aws-chunked size selection.\n\n- keep read_full returning early EOF on empty reads\n- use read_full_or_eof only in erasure encoding paths\n- detect aws-chunked via content-encoding or transfer-encoding\n- add nested error-chain and aws-chunked regression tests\n\nRefs: rustfs/backlog#654 * fix(rio): surface incomplete put bodies Propagate incomplete PUT request bodies as IncompleteBody instead of allowing erasure encode to treat truncated input as a normal EOF.\n\n- mark premature EOFs in HardLimitReader with an explicit IncompleteBody error\n- preserve EOF error chains through read_full and map them to S3 IncompleteBody\n- stop erasure encode from swallowing UnexpectedEof on truncated input\n- add regression tests for reader, erasure encode, and API error mapping\n\nRefs: rustfs/backlog#654 * fix(s3): honor decoded length for aws chunked put Use x-amz-decoded-content-length for aws-chunked PutObject requests so trailer-checksum uploads are sized against the decoded payload instead of the wire-encoded content-length.\n\n- prefer decoded content length for aws-chunked put bodies\n- add a regression test covering the size selection logic\n- keeps the incomplete body fix working for truly truncated uploads while restoring checksum trailer compatibility\n\nRefs: rustfs/backlog#654 * fix(io): follow up review comments on incompletebody handling Address PR review feedback by restoring read_full's existing EOF contract, adding a dedicated read_full_or_eof helper for erasure encoding, covering nested incomplete-body error chains, and documenting plus hardening aws-chunked size selection.\n\n- keep read_full returning early EOF on empty reads\n- use read_full_or_eof only in erasure encoding paths\n- detect aws-chunked via content-encoding or transfer-encoding\n- add nested error-chain and aws-chunked regression tests\n\nRefs: rustfs/backlog#654 * fix(rio): reject bytes beyond hard limit * fix(ecstore): reject zero-sized erasure blocks
199 lines
6.5 KiB
Rust
199 lines
6.5 KiB
Rust
// Copyright 2024 RustFS Team
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use crate::IncompleteBody;
|
|
use pin_project_lite::pin_project;
|
|
use std::io::{Error, Result};
|
|
use std::pin::Pin;
|
|
use std::task::{Context, Poll};
|
|
use tokio::io::{AsyncRead, ReadBuf};
|
|
|
|
pin_project! {
|
|
pub struct HardLimitReader<R> {
|
|
#[pin]
|
|
pub inner: R,
|
|
remaining: i64,
|
|
}
|
|
}
|
|
|
|
impl<R> HardLimitReader<R> {
|
|
pub fn new(inner: R, limit: i64) -> Self {
|
|
HardLimitReader { inner, remaining: limit }
|
|
}
|
|
}
|
|
|
|
impl<R> AsyncRead for HardLimitReader<R>
|
|
where
|
|
R: AsyncRead,
|
|
{
|
|
fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut ReadBuf<'_>) -> Poll<Result<()>> {
|
|
if self.remaining < 0 {
|
|
return Poll::Ready(Err(Error::other("input provided more bytes than specified")));
|
|
}
|
|
let original_filled = buf.filled().len();
|
|
if self.remaining == 0 {
|
|
let mut discard = [0u8; 8192];
|
|
let mut discard_buf = ReadBuf::new(&mut discard);
|
|
return match self.as_mut().project().inner.poll_read(cx, &mut discard_buf) {
|
|
Poll::Pending => Poll::Pending,
|
|
Poll::Ready(Ok(())) => {
|
|
if discard_buf.filled().is_empty() {
|
|
debug_assert_eq!(buf.filled().len(), original_filled);
|
|
Poll::Ready(Ok(()))
|
|
} else {
|
|
Poll::Ready(Err(Error::other("input provided more bytes than specified")))
|
|
}
|
|
}
|
|
Poll::Ready(Err(err)) => Poll::Ready(Err(err)),
|
|
};
|
|
}
|
|
// Save the initial length
|
|
let before = original_filled;
|
|
|
|
// Poll the inner reader
|
|
let this = self.as_mut().project();
|
|
let poll = this.inner.poll_read(cx, buf);
|
|
|
|
if let Poll::Ready(Ok(())) = &poll {
|
|
let after = buf.filled().len();
|
|
let read = (after - before) as i64;
|
|
if read == 0 && *this.remaining > 0 {
|
|
return Poll::Ready(Err(Error::new(
|
|
std::io::ErrorKind::UnexpectedEof,
|
|
IncompleteBody {
|
|
remaining: *this.remaining,
|
|
},
|
|
)));
|
|
}
|
|
*this.remaining -= read;
|
|
if *this.remaining < 0 {
|
|
return Poll::Ready(Err(Error::other("input provided more bytes than specified")));
|
|
}
|
|
}
|
|
poll
|
|
}
|
|
}
|
|
|
|
delegate_reader_capabilities_generic!(HardLimitReader<R>, inner);
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::vec;
|
|
|
|
use super::*;
|
|
use rustfs_utils::read_full;
|
|
use tokio::io::{AsyncReadExt, BufReader};
|
|
|
|
#[tokio::test]
|
|
async fn test_hardlimit_reader_normal() {
|
|
let data = b"hello world";
|
|
let reader = BufReader::new(&data[..]);
|
|
let hardlimit = HardLimitReader::new(reader, data.len() as i64);
|
|
let mut r = hardlimit;
|
|
let mut buf = Vec::new();
|
|
let n = r.read_to_end(&mut buf).await.unwrap();
|
|
assert_eq!(n, data.len());
|
|
assert_eq!(&buf, data);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_hardlimit_reader_exact_limit() {
|
|
let data = b"1234567890";
|
|
let reader = BufReader::new(&data[..]);
|
|
let hardlimit = HardLimitReader::new(reader, 10);
|
|
let mut r = hardlimit;
|
|
let mut buf = Vec::new();
|
|
let n = r.read_to_end(&mut buf).await.unwrap();
|
|
assert_eq!(n, 10);
|
|
assert_eq!(&buf, data);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_hardlimit_reader_exceed_limit() {
|
|
let data = b"abcdef";
|
|
let reader = BufReader::new(&data[..]);
|
|
let hardlimit = HardLimitReader::new(reader, 3);
|
|
let mut r = hardlimit;
|
|
let mut buf = vec![0u8; 10];
|
|
// Reading exceeds limit, should return error
|
|
let err = match read_full(&mut r, &mut buf).await {
|
|
Ok(n) => {
|
|
println!("Read {n} bytes");
|
|
assert_eq!(n, 3);
|
|
assert_eq!(&buf[..n], b"abc");
|
|
None
|
|
}
|
|
Err(e) => Some(e),
|
|
};
|
|
|
|
assert!(err.is_some());
|
|
|
|
let err = err.unwrap();
|
|
assert_eq!(err.kind(), std::io::ErrorKind::Other);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_hardlimit_reader_empty() {
|
|
let data = b"";
|
|
let reader = BufReader::new(&data[..]);
|
|
let hardlimit = HardLimitReader::new(reader, 0);
|
|
let mut r = hardlimit;
|
|
let mut buf = Vec::new();
|
|
let n = r.read_to_end(&mut buf).await.unwrap();
|
|
assert_eq!(n, 0);
|
|
assert_eq!(&buf, data);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_hardlimit_reader_short_input_returns_unexpected_eof() {
|
|
let data = b"abc";
|
|
let reader = BufReader::new(&data[..]);
|
|
let mut r = HardLimitReader::new(reader, 5);
|
|
let mut buf = [0u8; 8];
|
|
|
|
let err = read_full(&mut r, &mut buf)
|
|
.await
|
|
.expect_err("short input must surface unexpected eof");
|
|
|
|
assert_eq!(err.kind(), std::io::ErrorKind::UnexpectedEof);
|
|
assert!(
|
|
err.get_ref()
|
|
.and_then(|inner| inner.downcast_ref::<std::io::Error>())
|
|
.and_then(|inner| inner.get_ref())
|
|
.and_then(|inner| inner.downcast_ref::<IncompleteBody>())
|
|
.is_some(),
|
|
"error should retain the incomplete body marker"
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_hardlimit_reader_rejects_extra_bytes_after_limit() {
|
|
let data = b"abcdef";
|
|
let reader = BufReader::new(&data[..]);
|
|
let mut r = HardLimitReader::new(reader, 3);
|
|
|
|
let mut first = [0u8; 3];
|
|
let n = read_full(&mut r, &mut first).await.expect("first read should consume limit");
|
|
assert_eq!(n, 3);
|
|
assert_eq!(&first, b"abc");
|
|
|
|
let mut second = [0u8; 1];
|
|
let err = read_full(&mut r, &mut second)
|
|
.await
|
|
.expect_err("bytes beyond the declared limit must be rejected");
|
|
assert_eq!(err.kind(), std::io::ErrorKind::Other);
|
|
assert!(err.to_string().contains("more bytes than specified"));
|
|
}
|
|
}
|