Deuxfleurs/garage
46
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Fix Content-Type headers for {admin,k2v} errors and admin responses #316

Merged
lx merged 1 commit from fix/admin-api-content-type into main 2022-05-30 09:21:17 +00:00
Conversation 0 Commits 1 Files changed 8 +30 -43
8 changed files with 30 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/api/admin/bucket.rs
View file

@ -6,7 +6,6 @@ use serde::{Deserialize, Serialize};
use garage_util::crdt::*; use garage_util::crdt::*;
use garage_util::data::*; use garage_util::data::*;
use garage_util::error::Error as GarageError;
use garage_util::time::*; use garage_util::time::*;
use garage_table::*; use garage_table::*;
@ -19,7 +18,7 @@ use garage_model::permission::*;
use crate::admin::error::*; use crate::admin::error::*;
use crate::admin::key::ApiBucketKeyPerm; use crate::admin::key::ApiBucketKeyPerm;
use crate::common_error::CommonError; use crate::common_error::CommonError;
use crate::helpers::parse_json_body; use crate::helpers::{json_ok_response, parse_json_body};
pub async fn handle_list_buckets(garage: &Arc<Garage>) -> Result<Response<Body>, Error> { pub async fn handle_list_buckets(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
let buckets = garage let buckets = garage
@ -60,10 +59,7 @@ pub async fn handle_list_buckets(garage: &Arc<Garage>) -> Result<Response<Body>,
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?; Ok(json_ok_response(&res)?)
Ok(Response::builder()
.status(StatusCode::OK)
.body(Body::from(resp_json))?)
} }
#[derive(Serialize)] #[derive(Serialize)]
@ -197,10 +193,7 @@ async fn bucket_info_results(
.collect::<Vec<_>>(), .collect::<Vec<_>>(),
}; };
let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?; Ok(json_ok_response(&res)?)
Ok(Response::builder()
.status(StatusCode::OK)
.body(Body::from(resp_json))?)
} }
#[derive(Serialize)] #[derive(Serialize)]

19
src/api/admin/cluster.rs
View file

@ -7,14 +7,13 @@ use serde::{Deserialize, Serialize};
use garage_util::crdt::*; use garage_util::crdt::*;
use garage_util::data::*; use garage_util::data::*;
use garage_util::error::Error as GarageError;
use garage_rpc::layout::*; use garage_rpc::layout::*;
use garage_model::garage::Garage; use garage_model::garage::Garage;
use crate::admin::error::*; use crate::admin::error::*;
use crate::helpers::parse_json_body; use crate::helpers::{json_ok_response, parse_json_body};
pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<Body>, Error> { pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
let res = GetClusterStatusResponse { let res = GetClusterStatusResponse {
@ -39,10 +38,7 @@ pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<
layout: get_cluster_layout(garage), layout: get_cluster_layout(garage),
}; };
let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?; Ok(json_ok_response(&res)?)
Ok(Response::builder()
.status(StatusCode::OK)
.body(Body::from(resp_json))?)
} }
pub async fn handle_connect_cluster_nodes( pub async fn handle_connect_cluster_nodes(
@ -66,18 +62,13 @@ pub async fn handle_connect_cluster_nodes(
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?; Ok(json_ok_response(&res)?)
Ok(Response::builder()
.status(StatusCode::OK)
.body(Body::from(resp_json))?)
} }
pub async fn handle_get_cluster_layout(garage: &Arc<Garage>) -> Result<Response<Body>, Error> { pub async fn handle_get_cluster_layout(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
let res = get_cluster_layout(garage); let res = get_cluster_layout(garage);
let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?;
Ok(Response::builder() Ok(json_ok_response(&res)?)
.status(StatusCode::OK)
.body(Body::from(resp_json))?)
} }
fn get_cluster_layout(garage: &Arc<Garage>) -> GetClusterLayoutResponse { fn get_cluster_layout(garage: &Arc<Garage>) -> GetClusterLayoutResponse {

5
src/api/admin/error.rs
View file

@ -72,8 +72,9 @@ impl ApiError for Error {
} }
} }
fn add_http_headers(&self, _header_map: &mut HeaderMap<HeaderValue>) { fn add_http_headers(&self, header_map: &mut HeaderMap<HeaderValue>) {
// nothing use hyper::header;
header_map.append(header::CONTENT_TYPE, "application/json".parse().unwrap());
} }
fn http_body(&self, garage_region: &str, path: &str) -> Body { fn http_body(&self, garage_region: &str, path: &str) -> Body {

14
src/api/admin/key.rs
View file

@ -4,15 +4,13 @@ use std::sync::Arc;
use hyper::{Body, Request, Response, StatusCode}; use hyper::{Body, Request, Response, StatusCode};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use garage_util::error::Error as GarageError;
use garage_table::*; use garage_table::*;
use garage_model::garage::Garage; use garage_model::garage::Garage;
use garage_model::key_table::*; use garage_model::key_table::*;
use crate::admin::error::*; use crate::admin::error::*;
use crate::helpers::parse_json_body; use crate::helpers::{json_ok_response, parse_json_body};
pub async fn handle_list_keys(garage: &Arc<Garage>) -> Result<Response<Body>, Error> { pub async fn handle_list_keys(garage: &Arc<Garage>) -> Result<Response<Body>, Error> {
let res = garage let res = garage
@ -32,10 +30,7 @@ pub async fn handle_list_keys(garage: &Arc<Garage>) -> Result<Response<Body>, Er
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?; Ok(json_ok_response(&res)?)
Ok(Response::builder()
.status(StatusCode::OK)
.body(Body::from(resp_json))?)
} }
#[derive(Serialize)] #[derive(Serialize)]
@ -221,10 +216,7 @@ async fn key_info_results(garage: &Arc<Garage>, key: Key) -> Result<Response<Bod
.collect::<Vec<_>>(), .collect::<Vec<_>>(),
}; };
let resp_json = serde_json::to_string_pretty(&res).map_err(GarageError::from)?; Ok(json_ok_response(&res)?)
Ok(Response::builder()
.status(StatusCode::OK)
.body(Body::from(resp_json))?)
} }
#[derive(Serialize)] #[derive(Serialize)]

4
src/api/generic_server.rs
View file

@ -150,9 +150,7 @@ impl<A: ApiHandler> ApiServer<A> {
} }
Err(e) => { Err(e) => {
let body: Body = e.http_body(&self.region, uri.path()); let body: Body = e.http_body(&self.region, uri.path());
let mut http_error_builder = Response::builder() let mut http_error_builder = Response::builder().status(e.http_status_code());
.status(e.http_status_code())
.header("Content-Type", "application/xml");
if let Some(header_map) = http_error_builder.headers_mut() { if let Some(header_map) = http_error_builder.headers_mut() {
e.add_http_headers(header_map) e.add_http_headers(header_map)

10
src/api/helpers.rs
View file

@ -1,4 +1,4 @@
use hyper::{Body, Request}; use hyper::{Body, Request, Response};
use idna::domain_to_unicode; use idna::domain_to_unicode;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -144,6 +144,14 @@ pub async fn parse_json_body<T: for<'de> Deserialize<'de>>(req: Request<Body>) -
Ok(resp) Ok(resp)
} }
pub fn json_ok_response<T: Serialize>(res: &T) -> Result<Response<Body>, Error> {
let resp_json = serde_json::to_string_pretty(res).map_err(garage_util::error::Error::from)?;
Ok(Response::builder()
.status(hyper::StatusCode::OK)
.header(http::header::CONTENT_TYPE, "application/json")
.body(Body::from(resp_json))?)
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

5
src/api/k2v/error.rs
View file

@ -110,8 +110,9 @@ impl ApiError for Error {
} }
} }
fn add_http_headers(&self, _header_map: &mut HeaderMap<HeaderValue>) { fn add_http_headers(&self, header_map: &mut HeaderMap<HeaderValue>) {
// nothing use hyper::header;
header_map.append(header::CONTENT_TYPE, "application/json".parse().unwrap());
} }
fn http_body(&self, garage_region: &str, path: &str) -> Body { fn http_body(&self, garage_region: &str, path: &str) -> Body {

3
src/api/s3/error.rs
View file

@ -172,6 +172,9 @@ impl ApiError for Error {
fn add_http_headers(&self, header_map: &mut HeaderMap<HeaderValue>) { fn add_http_headers(&self, header_map: &mut HeaderMap<HeaderValue>) {
use hyper::header; use hyper::header;
header_map.append(header::CONTENT_TYPE, "application/xml".parse().unwrap());
#[allow(clippy::single_match)] #[allow(clippy::single_match)]
match self { match self {
Error::InvalidRange((_, len)) => { Error::InvalidRange((_, len)) => {