rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure 'TempFile' flushes when persisted. 

Tokio's `File::write_all()` method has an unexpected quirk: it doesn't
actually write all the requested content to the file when the returned
future resolves. Instead, the write is attempted and queued. This means
that the `persist()` method can resolve without the data being persisted
to the file system. Subsequent reads of the ostensibly written-to file
can thus fail to contain the expected data.

An call to `flush()` following `write_all()` would circumvent the issue.
Alternatively, calling `fs::write()` actually writes to the file system
before returning and requires fewer lines of code. This commit thus
swaps the call to `write_all()` with `fs::write()`.
This commit is contained in:
Paul Lietar 2023-12-08 15:31:59 +00:00 committed by Sergio Benitez
parent ae7e0040e8
commit 67ad8316dc
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/lib/src/fs/temp_file.rs
View File

@ -10,7 +10,7 @@ use crate::fs::FileName;
use tokio::task; use tokio::task;
use tokio::fs::{self, File}; use tokio::fs::{self, File};
use tokio::io::{AsyncWriteExt, AsyncBufRead, BufReader}; use tokio::io::{AsyncBufRead, BufReader};
use tempfile::{NamedTempFile, TempPath}; use tempfile::{NamedTempFile, TempPath};
use either::Either; use either::Either;
@ -189,8 +189,7 @@ impl<'v> TempFile<'v> {
} }
} }
TempFile::Buffered { content } => { TempFile::Buffered { content } => {
let mut file = File::create(&new_path).await?; fs::write(&new_path, &content).await?;
file.write_all(content).await?;
*self = TempFile::File { *self = TempFile::File {
file_name: None, file_name: None,
content_type: None, content_type: None,
@ -228,10 +227,12 @@ impl<'v> TempFile<'v> {
/// # let some_other_path = std::env::temp_dir().join("some-other.txt"); /// # let some_other_path = std::env::temp_dir().join("some-other.txt");
/// file.copy_to(&some_other_path).await?; /// file.copy_to(&some_other_path).await?;
/// assert_eq!(file.path(), Some(&*some_path)); /// assert_eq!(file.path(), Some(&*some_path));
/// # assert_eq!(std::fs::read(some_path).unwrap(), b"hi");
/// # assert_eq!(std::fs::read(some_other_path).unwrap(), b"hi");
/// ///
/// Ok(()) /// Ok(())
/// } /// }
/// # let file = TempFile::Buffered { content: "hi".as_bytes() }; /// # let file = TempFile::Buffered { content: b"hi" };
/// # rocket::async_test(handle(file)).unwrap(); /// # rocket::async_test(handle(file)).unwrap();
/// ``` /// ```
pub async fn copy_to<P>(&mut self, path: P) -> io::Result<()> pub async fn copy_to<P>(&mut self, path: P) -> io::Result<()>
@ -257,8 +258,7 @@ impl<'v> TempFile<'v> {
} }
TempFile::Buffered { content } => { TempFile::Buffered { content } => {
let path = path.as_ref(); let path = path.as_ref();
let mut file = File::create(path).await?; fs::write(&path, &content).await?;
file.write_all(content).await?;
*self = TempFile::File { *self = TempFile::File {
file_name: None, file_name: None,
content_type: None, content_type: None,
@ -393,10 +393,11 @@ impl<'v> TempFile<'v> {
/// # let some_path = std::env::temp_dir().join("some-path.txt"); /// # let some_path = std::env::temp_dir().join("some-path.txt");
/// file.persist_to(&some_path).await?; /// file.persist_to(&some_path).await?;
/// assert_eq!(file.path(), Some(&*some_path)); /// assert_eq!(file.path(), Some(&*some_path));
/// # assert_eq!(std::fs::read(some_path).unwrap(), b"hi");
/// ///
/// Ok(()) /// Ok(())
/// } /// }
/// # let file = TempFile::Buffered { content: "hi".as_bytes() }; /// # let file = TempFile::Buffered { content: b"hi" };
/// # rocket::async_test(handle(file)).unwrap(); /// # rocket::async_test(handle(file)).unwrap();
/// ``` /// ```
pub fn path(&self) -> Option<&Path> { pub fn path(&self) -> Option<&Path> {