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

Support website publishing #7

Merged
lx merged 61 commits from feature/website into master 2021-01-15 16:49:51 +00:00
Conversation 3 Commits 61 Files changed 17 +68 -3
1 changed files with 68 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0791e7164e - Show all commits

71
src/web/web_server.rs
View file

@ -1,9 +1,11 @@
use std::sync::Arc; use std::sync::Arc;
use std::net::SocketAddr;
use futures::future::Future; use futures::future::Future;
use hyper::server::conn::AddrStream; use hyper::server::conn::AddrStream;
use hyper::{Body,Request,Response,Server}; use hyper::{Body,Request,Response,Server,Uri};
use hyper::header::HOST;
use hyper::service::{make_service_fn, service_fn}; use hyper::service::{make_service_fn, service_fn};
use garage_util::error::Error; use garage_util::error::Error;
@ -22,8 +24,7 @@ pub async fn run_web_server(
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)
async move { Ok::<Response<Body>, Error>(Response::new(Body::from("hello world\n"))) }
})) }))
} }
}); });
@ -35,3 +36,67 @@ pub async fn run_web_server(
graceful.await?; graceful.await?;
Ok(()) Ok(())
} }
async fn handler(
garage: Arc<Garage>,
req: Request<Body>,
addr: SocketAddr,
) -> Result<Response<Body>, Error> {
// Get http authority string (eg. [::1]:3902)
let authority = req
.headers()
.get(HOST)
.ok_or(Error::BadRequest(format!("HOST header required")))?
.to_str()?;
info!("authority is {}", authority);
// Get HTTP domain/ip from host
//let domain = host.to_socket_
Ok(Response::new(Body::from("hello world\n")))
}
fn authority_to_host(authority: &str) -> Result<String, Error> {
let mut uri_str: String = "fake://".to_owned();
uri_str.push_str(authority);
match uri_str.parse::<Uri>() {
Ok(uri) => {
let host = uri
.host()
.ok_or(Error::BadRequest(format!("Unable to extract host from authority as string")))?;
Ok(String::from(host))
}
_ => Err(Error::BadRequest(format!("Unable to parse authority (host HTTP header)"))),
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn authority_to_host_with_port() -> Result<(), Error> {
let domain = authority_to_host("[::1]:3902")?;
assert_eq!(domain, "[::1]");
let domain2 = authority_to_host("garage.tld:65200")?;
assert_eq!(domain2, "garage.tld");
let domain3 = authority_to_host("127.0.0.1:80")?;
assert_eq!(domain3, "127.0.0.1");
Ok(())
}
#[test]
quentin marked this conversation as resolved
lx commented 2021-01-13 21:14:43 +00:00
Review
Copy link

Rewrite as only two cases:

BucketState::Present(params) if params.website.get() => Ok(()),
_ => Err(Error::NotFound),
Rewrite as only two cases: ``` BucketState::Present(params) if params.website.get() => Ok(()), _ => Err(Error::NotFound), ```
fn authority_to_host_without_port() -> Result<(), Error> {
let domain = authority_to_host("[::1]")?;
assert_eq!(domain, "[::1]");
let domain2 = authority_to_host("garage.tld")?;
assert_eq!(domain2, "garage.tld");
let domain3 = authority_to_host("127.0.0.1")?;
assert_eq!(domain3, "127.0.0.1");
Ok(())
}
}