kaiyou/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Releases Activity

Handle HEAD

Browse source
This commit is contained in:
Quentin 2020-11-21 17:58:14 +01:00
parent a88fd49f71
commit b7a377308b
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/web/web_server.rs
View file

@ -6,13 +6,13 @@ use hyper::{
header::HOST, header::HOST,
server::conn::AddrStream, server::conn::AddrStream,
service::{make_service_fn, service_fn}, service::{make_service_fn, service_fn},
Body, Request, Response, Server, Body, Method, Request, Response, Server,
}; };
use idna::domain_to_unicode; use idna::domain_to_unicode;
use crate::error::*; use crate::error::*;
use garage_api::s3_get::handle_get; use garage_api::s3_get::{handle_get, handle_head};
use garage_model::garage::Garage; use garage_model::garage::Garage;
use garage_util::error::Error as GarageError; use garage_util::error::Error as GarageError;
@ -83,9 +83,13 @@ async fn serve_file(garage: Arc<Garage>, req: Request<Body>) -> Result<Response<
info!("Selected bucket: \"{}\", selected key: \"{}\"", bucket, key); info!("Selected bucket: \"{}\", selected key: \"{}\"", bucket, key);
let r = handle_get(garage, &req, bucket, &key).await?; let res = match req.method() {
&Method::HEAD => handle_head(garage, &bucket, &key).await?,
&Method::GET => handle_get(garage, &req, bucket, &key).await?,
_ => return Err(Error::BadRequest(format!("HTTP method not supported"))),
};
Ok(r) Ok(res)
} }
/// Extract host from the authority section given by the HTTP host header /// Extract host from the authority section given by the HTTP host header