Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

More headers taken into account

Browse source
This commit is contained in:
Alex 2020-07-09 17:04:43 +02:00
parent 44dba0e53c
commit 9305e5e87f
2 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/api/s3_get.rs
View file

@ -19,16 +19,21 @@ fn object_headers(
let date = UNIX_EPOCH + Duration::from_millis(version.timestamp); let date = UNIX_EPOCH + Duration::from_millis(version.timestamp);
let date_str = httpdate::fmt_http_date(date); let date_str = httpdate::fmt_http_date(date);
Response::builder() let mut resp = Response::builder()
.header( .header(
"Content-Type", "Content-Type",
version_meta.headers.content_type.to_string(), version_meta.headers.content_type.to_string(),
) )
// TODO: other headers
.header("Content-Length", format!("{}", version_meta.size)) .header("Content-Length", format!("{}", version_meta.size))
.header("ETag", version_meta.etag.to_string()) .header("ETag", version_meta.etag.to_string())
.header("Last-Modified", date_str) .header("Last-Modified", date_str)
.header("Accept-Ranges", format!("bytes")) .header("Accept-Ranges", format!("bytes"));
for (k, v) in version_meta.headers.other.iter() {
resp = resp.header(k, v.to_string());
}
resp
} }
pub async fn handle_head( pub async fn handle_head(

33
src/api/s3_put.rs
View file

@ -24,10 +24,7 @@ pub async fn handle_put(
key: &str, key: &str,
) -> Result<Response<Body>, Error> { ) -> Result<Response<Body>, Error> {
let version_uuid = gen_uuid(); let version_uuid = gen_uuid();
let headers = ObjectVersionHeaders { let headers = get_headers(&req)?;
content_type: get_mime_type(&req)?,
other: BTreeMap::new(), // TODO
};
let body = req.into_body(); let body = req.into_body();
@ -221,10 +218,7 @@ pub async fn handle_create_multipart_upload(
key: &str, key: &str,
) -> Result<Response<Body>, Error> { ) -> Result<Response<Body>, Error> {
let version_uuid = gen_uuid(); let version_uuid = gen_uuid();
let headers = ObjectVersionHeaders { let headers = get_headers(req)?;
content_type: get_mime_type(&req)?,
other: BTreeMap::new(), // TODO
};
let object_version = ObjectVersion { let object_version = ObjectVersion {
uuid: version_uuid, uuid: version_uuid,
@ -444,6 +438,29 @@ fn get_mime_type(req: &Request<Body>) -> Result<String, Error> {
.to_string()) .to_string())
} }
fn get_headers(req: &Request<Body>) -> Result<ObjectVersionHeaders, Error> {
let content_type = get_mime_type(req)?;
let other_headers = vec![
hyper::header::CACHE_CONTROL,
hyper::header::CONTENT_DISPOSITION,
hyper::header::CONTENT_ENCODING,
hyper::header::CONTENT_LANGUAGE,
hyper::header::EXPIRES,
];
let mut other = BTreeMap::new();
for h in other_headers.iter() {
if let Some(v) = req.headers().get(h) {
if let Ok(v_str) = v.to_str() {
other.insert(h.to_string(), v_str.to_string());
}
}
}
Ok(ObjectVersionHeaders {
content_type,
other: BTreeMap::new(),
})
}
fn uuid_from_str(id: &str) -> Result<UUID, ()> { fn uuid_from_str(id: &str) -> Result<UUID, ()> {
let id_bin = hex::decode(id).map_err(|_| ())?; let id_bin = hex::decode(id).map_err(|_| ())?;
if id_bin.len() != 32 { if id_bin.len() != 32 {