forked from Deuxfleurs/garage
Fix formatting
This commit is contained in:
parent
4093833ae8
commit
27795a390c
3 changed files with 38 additions and 39 deletions
|
@ -9,9 +9,9 @@ use garage_util::config::*;
|
||||||
use garage_util::error::Error;
|
use garage_util::error::Error;
|
||||||
|
|
||||||
use garage_api::api_server;
|
use garage_api::api_server;
|
||||||
use garage_web::web_server;
|
|
||||||
use garage_model::garage::Garage;
|
use garage_model::garage::Garage;
|
||||||
use garage_rpc::rpc_server::RpcServer;
|
use garage_rpc::rpc_server::RpcServer;
|
||||||
|
use garage_web::web_server;
|
||||||
|
|
||||||
use crate::admin_rpc::*;
|
use crate::admin_rpc::*;
|
||||||
|
|
||||||
|
|
|
@ -2,4 +2,3 @@
|
||||||
extern crate log;
|
extern crate log;
|
||||||
|
|
||||||
pub mod web_server;
|
pub mod web_server;
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
use std::sync::Arc;
|
|
||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
use futures::future::Future;
|
use futures::future::Future;
|
||||||
|
|
||||||
use hyper::server::conn::AddrStream;
|
|
||||||
use hyper::{Body,Request,Response,Server,Uri};
|
|
||||||
use hyper::header::HOST;
|
use hyper::header::HOST;
|
||||||
|
use hyper::server::conn::AddrStream;
|
||||||
use hyper::service::{make_service_fn, service_fn};
|
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_model::garage::Garage;
|
||||||
|
use garage_util::error::Error;
|
||||||
|
|
||||||
pub async fn run_web_server(
|
pub async fn run_web_server(
|
||||||
garage: Arc<Garage>,
|
garage: Arc<Garage>,
|
||||||
|
@ -21,7 +21,7 @@ pub async fn run_web_server(
|
||||||
let garage = garage.clone();
|
let garage = garage.clone();
|
||||||
let client_addr = conn.remote_addr();
|
let client_addr = conn.remote_addr();
|
||||||
info!("{:?}", client_addr);
|
info!("{:?}", client_addr);
|
||||||
async move {
|
async move {
|
||||||
Ok::<_, Error>(service_fn(move |req: Request<Body>| {
|
Ok::<_, Error>(service_fn(move |req: Request<Body>| {
|
||||||
let garage = garage.clone();
|
let garage = garage.clone();
|
||||||
handler(garage, req, client_addr)
|
handler(garage, req, client_addr)
|
||||||
|
@ -42,7 +42,6 @@ async fn handler(
|
||||||
req: Request<Body>,
|
req: Request<Body>,
|
||||||
addr: SocketAddr,
|
addr: SocketAddr,
|
||||||
) -> Result<Response<Body>, Error> {
|
) -> Result<Response<Body>, Error> {
|
||||||
|
|
||||||
// Get http authority string (eg. [::1]:3902 or garage.tld:80)
|
// Get http authority string (eg. [::1]:3902 or garage.tld:80)
|
||||||
let authority = req
|
let authority = req
|
||||||
.headers()
|
.headers()
|
||||||
|
@ -52,13 +51,13 @@ async fn handler(
|
||||||
|
|
||||||
// Get bucket
|
// Get bucket
|
||||||
let host = authority_to_host(authority)?;
|
let host = authority_to_host(authority)?;
|
||||||
let root = &garage.config.s3_web.root_domain;
|
let root = &garage.config.s3_web.root_domain;
|
||||||
let bucket = host_to_bucket(&host, root);
|
let bucket = host_to_bucket(&host, root);
|
||||||
|
|
||||||
// Get path
|
// Get path
|
||||||
let path = req.uri().path().to_string();
|
let path = req.uri().path().to_string();
|
||||||
let key = percent_encoding::percent_decode_str(&path).decode_utf8()?;
|
let key = percent_encoding::percent_decode_str(&path).decode_utf8()?;
|
||||||
|
|
||||||
info!("host: {}, bucket: {}, key: {}", host, bucket, key);
|
info!("host: {}, bucket: {}, key: {}", host, bucket, key);
|
||||||
|
|
||||||
Ok(Response::new(Body::from("hello world\n")))
|
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>() {
|
match uri_str.parse::<Uri>() {
|
||||||
Ok(uri) => {
|
Ok(uri) => {
|
||||||
let host = uri
|
let host = uri.host().ok_or(Error::BadRequest(format!(
|
||||||
.host()
|
"Unable to extract host from authority"
|
||||||
.ok_or(Error::BadRequest(format!("Unable to extract host from authority")))?;
|
)))?;
|
||||||
Ok(String::from(host))
|
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 len_diff = host.len() - root.len();
|
||||||
let missing_starting_dot = root.chars().next() != Some('.');
|
let missing_starting_dot = root.chars().next() != Some('.');
|
||||||
let cursor = if missing_starting_dot { len_diff - 1 } else { len_diff };
|
let cursor = if missing_starting_dot {
|
||||||
&host[..cursor]
|
len_diff - 1
|
||||||
|
} else {
|
||||||
|
len_diff
|
||||||
|
};
|
||||||
|
&host[..cursor]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
@ -128,28 +131,25 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn host_to_bucket_test() {
|
fn host_to_bucket_test() {
|
||||||
assert_eq!(
|
|
||||||
host_to_bucket("john.doe.garage.tld", ".garage.tld"),
|
|
||||||
"john.doe");
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
host_to_bucket("john.doe.garage.tld", "garage.tld"),
|
|
||||||
"john.doe");
|
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
host_to_bucket("john.doe.com", "garage.tld"),
|
host_to_bucket("john.doe.garage.tld", ".garage.tld"),
|
||||||
"john.doe.com");
|
"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");
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
host_to_bucket("john.doe.com", ".garage.tld"),
|
host_to_bucket("john.doe.com", ".garage.tld"),
|
||||||
"john.doe.com");
|
"john.doe.com"
|
||||||
|
);
|
||||||
assert_eq!(
|
|
||||||
host_to_bucket("garage.tld", "garage.tld"),
|
assert_eq!(host_to_bucket("garage.tld", "garage.tld"), "garage.tld");
|
||||||
"garage.tld");
|
|
||||||
|
assert_eq!(host_to_bucket("garage.tld", ".garage.tld"), "garage.tld");
|
||||||
assert_eq!(
|
|
||||||
host_to_bucket("garage.tld", ".garage.tld"),
|
|
||||||
"garage.tld");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue