aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-11-10 09:59:52 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-11-10 09:59:52 +0100
commit27795a390ced369a5fda353c046cdd4b7ca98bd0 (patch)
tree3fe6411173d6b30c5b65cc1d019466f7cbc799b0
parent4093833ae854df16bc893a21617b0902a5beae47 (diff)
downloadgarage-27795a390ced369a5fda353c046cdd4b7ca98bd0.tar.gz
garage-27795a390ced369a5fda353c046cdd4b7ca98bd0.zip
Fix formatting
-rw-r--r--src/garage/server.rs2
-rw-r--r--src/web/lib.rs1
-rw-r--r--src/web/web_server.rs70
3 files changed, 36 insertions, 37 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs
index 8962a8da..ec78c067 100644
--- a/src/garage/server.rs
+++ b/src/garage/server.rs
@@ -9,9 +9,9 @@ use garage_util::config::*;
use garage_util::error::Error;
use garage_api::api_server;
-use garage_web::web_server;
use garage_model::garage::Garage;
use garage_rpc::rpc_server::RpcServer;
+use garage_web::web_server;
use crate::admin_rpc::*;
diff --git a/src/web/lib.rs b/src/web/lib.rs
index 80957669..c0c668a1 100644
--- a/src/web/lib.rs
+++ b/src/web/lib.rs
@@ -2,4 +2,3 @@
extern crate log;
pub mod web_server;
-
diff --git a/src/web/web_server.rs b/src/web/web_server.rs
index 432d9752..ca9b559a 100644
--- a/src/web/web_server.rs
+++ b/src/web/web_server.rs
@@ -1,15 +1,15 @@
-use std::sync::Arc;
use std::net::SocketAddr;
+use std::sync::Arc;
use futures::future::Future;
-use hyper::server::conn::AddrStream;
-use hyper::{Body,Request,Response,Server,Uri};
use hyper::header::HOST;
+use hyper::server::conn::AddrStream;
use hyper::service::{make_service_fn, service_fn};
+use hyper::{Body, Request, Response, Server, Uri};
-use garage_util::error::Error;
use garage_model::garage::Garage;
+use garage_util::error::Error;
pub async fn run_web_server(
garage: Arc<Garage>,
@@ -21,7 +21,7 @@ pub async fn run_web_server(
let garage = garage.clone();
let client_addr = conn.remote_addr();
info!("{:?}", client_addr);
- async move {
+ async move {
Ok::<_, Error>(service_fn(move |req: Request<Body>| {
let garage = garage.clone();
handler(garage, req, client_addr)
@@ -42,7 +42,6 @@ async fn handler(
req: Request<Body>,
addr: SocketAddr,
) -> Result<Response<Body>, Error> {
-
// Get http authority string (eg. [::1]:3902 or garage.tld:80)
let authority = req
.headers()
@@ -52,13 +51,13 @@ async fn handler(
// Get bucket
let host = authority_to_host(authority)?;
- let root = &garage.config.s3_web.root_domain;
- let bucket = host_to_bucket(&host, root);
+ let root = &garage.config.s3_web.root_domain;
+ let bucket = host_to_bucket(&host, root);
// Get path
let path = req.uri().path().to_string();
let key = percent_encoding::percent_decode_str(&path).decode_utf8()?;
-
+
info!("host: {}, bucket: {}, key: {}", host, bucket, key);
Ok(Response::new(Body::from("hello world\n")))
@@ -78,12 +77,14 @@ fn authority_to_host(authority: &str) -> Result<String, Error> {
match uri_str.parse::<Uri>() {
Ok(uri) => {
- let host = uri
- .host()
- .ok_or(Error::BadRequest(format!("Unable to extract host from authority")))?;
+ let host = uri.host().ok_or(Error::BadRequest(format!(
+ "Unable to extract host from authority"
+ )))?;
Ok(String::from(host))
}
- _ => Err(Error::BadRequest(format!("Unable to parse authority (host HTTP header)"))),
+ _ => Err(Error::BadRequest(format!(
+ "Unable to parse authority (host HTTP header)"
+ ))),
}
}
@@ -94,12 +95,14 @@ fn host_to_bucket<'a>(host: &'a str, root: &str) -> &'a str {
let len_diff = host.len() - root.len();
let missing_starting_dot = root.chars().next() != Some('.');
- let cursor = if missing_starting_dot { len_diff - 1 } else { len_diff };
- &host[..cursor]
+ let cursor = if missing_starting_dot {
+ len_diff - 1
+ } else {
+ len_diff
+ };
+ &host[..cursor]
}
-
-
#[cfg(test)]
mod tests {
use super::*;
@@ -128,28 +131,25 @@ mod tests {
#[test]
fn host_to_bucket_test() {
- assert_eq!(
+ assert_eq!(
host_to_bucket("john.doe.garage.tld", ".garage.tld"),
- "john.doe");
+ "john.doe"
+ );
- assert_eq!(
- host_to_bucket("john.doe.garage.tld", "garage.tld"),
- "john.doe");
-
assert_eq!(
- host_to_bucket("john.doe.com", "garage.tld"),
- "john.doe.com");
-
+ host_to_bucket("john.doe.garage.tld", "garage.tld"),
+ "john.doe"
+ );
+
+ assert_eq!(host_to_bucket("john.doe.com", "garage.tld"), "john.doe.com");
+
assert_eq!(
host_to_bucket("john.doe.com", ".garage.tld"),
- "john.doe.com");
-
- assert_eq!(
- host_to_bucket("garage.tld", "garage.tld"),
- "garage.tld");
-
- assert_eq!(
- host_to_bucket("garage.tld", ".garage.tld"),
- "garage.tld");
+ "john.doe.com"
+ );
+
+ assert_eq!(host_to_bucket("garage.tld", "garage.tld"), "garage.tld");
+
+ assert_eq!(host_to_bucket("garage.tld", ".garage.tld"), "garage.tld");
}
}