From 7f26ed55cdad4a67300447cf92bf8e4975a5c978 Mon Sep 17 00:00:00 2001 From: trinity-1686a Date: Mon, 29 Nov 2021 11:52:42 +0100 Subject: Improved handling of HTTP ranges - correct HTTP code when range syntax is invalid (fix #140) - when multiple ranges are given, simply ignore and send whole file Co-authored-by: Trinity Pointard Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/157 Reviewed-by: Alex Co-authored-by: trinity-1686a Co-committed-by: trinity-1686a --- src/web/error.rs | 11 ++++++++++- src/web/web_server.rs | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src/web') diff --git a/src/web/error.rs b/src/web/error.rs index 426155c1..55990e9d 100644 --- a/src/web/error.rs +++ b/src/web/error.rs @@ -1,5 +1,6 @@ use err_derive::Error; -use hyper::StatusCode; +use hyper::header::HeaderValue; +use hyper::{HeaderMap, StatusCode}; use garage_util::error::Error as GarageError; @@ -47,4 +48,12 @@ impl Error { _ => StatusCode::BAD_REQUEST, } } + + pub fn add_headers(&self, header_map: &mut HeaderMap) { + #[allow(clippy::single_match)] + match self { + Error::ApiError(e) => e.add_headers(header_map), + _ => (), + } + } } diff --git a/src/web/web_server.rs b/src/web/web_server.rs index e9c5039d..4a603c05 100644 --- a/src/web/web_server.rs +++ b/src/web/web_server.rs @@ -62,6 +62,7 @@ fn error_to_res(e: Error) -> Response { let body: Body = Body::from(format!("{}\n", e)); let mut http_error = Response::new(body); *http_error.status_mut() = e.http_status_code(); + e.add_headers(http_error.headers_mut()); http_error } -- cgit v1.2.3