tshakah/attic
0
0
Fork 0
forked from nrabulinski/attic
Code Pull requests Activity

server: Only read PUT payload up to the claimed size

Browse source
This commit is contained in:
Zhaofeng Li 2023-03-21 18:45:34 -06:00
parent ba8bd5d66c
commit 94a1d44a10
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server/src/api/v1/upload_path.rs
View file

@ -21,7 +21,7 @@ use sea_orm::sea_query::Expr;
use sea_orm::ActiveValue::Set; use sea_orm::ActiveValue::Set;
use sea_orm::{QuerySelect, TransactionTrait}; use sea_orm::{QuerySelect, TransactionTrait};
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
use tokio::io::{AsyncBufRead, AsyncRead, BufReader}; use tokio::io::{AsyncBufRead, AsyncRead, AsyncReadExt, BufReader};
use tokio::sync::{OnceCell, Semaphore}; use tokio::sync::{OnceCell, Semaphore};
use tokio::task::spawn; use tokio::task::spawn;
use tokio_util::io::StreamReader; use tokio_util::io::StreamReader;
@ -376,7 +376,7 @@ async fn upload_path_new_chunked(
} }
}); });
// FIXME: Maybe the client will send much more data than claimed let stream = stream.take(upload_info.nar_size as u64);
let (stream, nar_compute) = StreamHasher::new(stream, Sha256::new()); let (stream, nar_compute) = StreamHasher::new(stream, Sha256::new());
let mut chunks = chunk_stream( let mut chunks = chunk_stream(
stream, stream,
@ -530,6 +530,7 @@ async fn upload_path_new_unchunked(
let compression: Compression = compression_type.into(); let compression: Compression = compression_type.into();
// Upload the entire NAR as a single chunk // Upload the entire NAR as a single chunk
let stream = stream.take(upload_info.nar_size as u64);
let data = ChunkData::Stream( let data = ChunkData::Stream(
Box::new(stream), Box::new(stream),
upload_info.nar_hash.clone(), upload_info.nar_hash.clone(),