fionera
/
datatrash
forked from neri/datatrash
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve error handling

This commit is contained in:
neri 2020-12-03 23:30:37 +01:00
parent 19ae7ff673
commit 4efea5e221
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main.rs
View File

@ -36,7 +36,7 @@ async fn index() -> Result<NamedFile, Error> {
async fn upload( async fn upload(
payload: Multipart, payload: Multipart,
db: web::Data<PgPool>, db: web::Data<PgPool>,
sender: web::Data<Sender<()>>, expiry_watch_sender: web::Data<Sender<()>>,
config: web::Data<Config>, config: web::Data<Config>,
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
let file_id = format!("{:x?}", rand::random::<u32>()); let file_id = format!("{:x?}", rand::random::<u32>());
@ -48,22 +48,35 @@ async fn upload(
Ok(data) => data, Ok(data) => data,
Err(err) => { Err(err) => {
if filename.exists().await { if filename.exists().await {
fs::remove_file(filename) fs::remove_file(filename).await.map_err(|_| {
.await error::ErrorInternalServerError(
.map_err(|_| error::ErrorInternalServerError("could not remove file"))?; "could not parse multipart; could not remove file",
)
})?;
} }
return Err(err); return Err(err);
} }
}; };
sqlx::query("INSERT INTO Files (file_id, file_name, valid_till, kind) VALUES ($1, $2, $3, $4)") let db_insert = sqlx::query(
.bind(&file_id) "INSERT INTO Files (file_id, file_name, valid_till, kind) VALUES ($1, $2, $3, $4)",
.bind(original_name.as_ref().unwrap_or_else(|| &file_id)) )
.bind(valid_till.naive_local()) .bind(&file_id)
.bind(kind.to_string()) .bind(original_name.as_ref().unwrap_or(&file_id))
.execute(db.as_ref()) .bind(valid_till.naive_local())
.await .bind(kind.to_string())
.map_err(|_| error::ErrorInternalServerError("could not insert file into database"))?; .execute(db.as_ref())
.await;
if db_insert.is_err() {
fs::remove_file(filename).await.map_err(|_| {
error::ErrorInternalServerError(
"could not insert file into database; could not remove file",
)
})?;
return Err(error::ErrorInternalServerError(
"could not insert file into database",
));
}
log::info!( log::info!(
"create new file {} (valid_till: {}, kind: {})", "create new file {} (valid_till: {}, kind: {})",
@ -72,7 +85,7 @@ async fn upload(
kind kind
); );
sender.send(()).await; expiry_watch_sender.send(()).await;
let redirect = if kind == FileKind::BINARY && original_name.is_some() { let redirect = if kind == FileKind::BINARY && original_name.is_some() {
format!("/upload/{}/{}", file_id, original_name.unwrap()) format!("/upload/{}/{}", file_id, original_name.unwrap())
@ -219,7 +232,7 @@ async fn main() -> std::io::Result<()> {
)); ));
let db = web::Data::new(pool); let db = web::Data::new(pool);
let sender = web::Data::new(sender); let expiry_watch_sender = web::Data::new(sender);
let upload_max_bytes: usize = env::var("UPLOAD_MAX_BYTES") let upload_max_bytes: usize = env::var("UPLOAD_MAX_BYTES")
.ok() .ok()
.and_then(|variable| variable.parse().ok()) .and_then(|variable| variable.parse().ok())
@ -231,7 +244,7 @@ async fn main() -> std::io::Result<()> {
App::new() App::new()
.wrap(middleware::Logger::default()) .wrap(middleware::Logger::default())
.app_data(db.clone()) .app_data(db.clone())
.app_data(sender.clone()) .app_data(expiry_watch_sender.clone())
.app_data(Bytes::configure(|cfg| cfg.limit(upload_max_bytes))) .app_data(Bytes::configure(|cfg| cfg.limit(upload_max_bytes)))
.data(config.clone()) .data(config.clone())
.service(web::resource("/").route(web::get().to(index))) .service(web::resource("/").route(web::get().to(index)))

4
src/multipart.rs
View File

@ -79,10 +79,10 @@ pub(crate) async fn parse_multipart(
fn get_field_name(field: &Field) -> Result<String, error::Error> { fn get_field_name(field: &Field) -> Result<String, error::Error> {
Ok(field Ok(field
.content_disposition() .content_disposition()
.ok_or_else(|| error::ParseError::Incomplete)? .ok_or(error::ParseError::Incomplete)?
.get_name() .get_name()
.map(|s| s.to_owned()) .map(|s| s.to_owned())
.ok_or_else(|| error::ParseError::Incomplete)?) .ok_or(error::ParseError::Incomplete)?)
} }
async fn parse_string(name: &str, field: actix_multipart::Field) -> Result<String, error::Error> { async fn parse_string(name: &str, field: actix_multipart::Field) -> Result<String, error::Error> {