aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/garage/Cargo.toml1
-rw-r--r--src/garage/server.rs6
-rw-r--r--src/util/config.rs7
-rw-r--r--src/web/Cargo.toml43
-rw-r--r--src/web/lib.rs5
-rw-r--r--src/web/web_server.rs102
6 files changed, 164 insertions, 0 deletions
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml
index cb16bcd4..39288f40 100644
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -19,6 +19,7 @@ garage_rpc = { version = "0.1", path = "../rpc" }
garage_table = { version = "0.1.1", path = "../table" }
garage_model = { version = "0.1.1", path = "../model" }
garage_api = { version = "0.1.1", path = "../api" }
+garage_web = { version = "0.1", path = "../web" }
bytes = "0.4"
rand = "0.7"
diff --git a/src/garage/server.rs b/src/garage/server.rs
index 6caea5eb..8962a8da 100644
--- a/src/garage/server.rs
+++ b/src/garage/server.rs
@@ -9,6 +9,7 @@ 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;
@@ -56,6 +57,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
info!("Initializing RPC and API servers...");
let run_rpc_server = Arc::new(rpc_server).run(wait_from(watch_cancel.clone()));
let api_server = api_server::run_api_server(garage.clone(), wait_from(watch_cancel.clone()));
+ let web_server = web_server::run_web_server(garage.clone(), wait_from(watch_cancel.clone()));
futures::try_join!(
garage
@@ -78,6 +80,10 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
info!("API server exited");
rv
}),
+ web_server.map(|rv| {
+ info!("Web server exited");
+ rv
+ }),
background.run().map(|rv| {
info!("Background runner exited");
Ok(rv)
diff --git a/src/util/config.rs b/src/util/config.rs
index b985114d..a5fbe4b4 100644
--- a/src/util/config.rs
+++ b/src/util/config.rs
@@ -35,6 +35,8 @@ pub struct Config {
pub rpc_tls: Option<TlsConfig>,
pub s3_api: ApiConfig,
+
+ pub s3_web: WebConfig,
}
#[derive(Deserialize, Debug, Clone)]
@@ -50,6 +52,11 @@ pub struct ApiConfig {
pub s3_region: String,
}
+#[derive(Deserialize, Debug, Clone)]
+pub struct WebConfig {
+ pub web_bind_addr: SocketAddr,
+}
+
fn default_max_concurrent_rpc_requests() -> usize {
12
}
diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml
new file mode 100644
index 00000000..796478ae
--- /dev/null
+++ b/src/web/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "garage_web"
+version = "0.1.0"
+authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"]
+edition = "2018"
+license = "GPL-3.0"
+description = "S3-like website endpoint crate for the Garage object store"
+repository = "https://git.deuxfleurs.fr/Deuxfleurs/garage"
+
+[lib]
+path = "lib.rs"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+garage_util = { version = "0.1", path = "../util" }
+garage_table = { version = "0.1.1", path = "../table" }
+garage_model = { version = "0.1.1", path = "../model" }
+
+rand = "0.7"
+hex = "0.3"
+sha2 = "0.8"
+err-derive = "0.2.3"
+log = "0.4"
+
+sled = "0.31"
+
+toml = "0.5"
+rmp-serde = "0.14.3"
+serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
+serde_json = "1.0"
+
+futures = "0.3"
+futures-util = "0.3"
+tokio = { version = "0.2", default-features = false, features = ["rt-core", "rt-threaded", "io-driver", "net", "tcp", "time", "macros", "sync", "signal", "fs"] }
+
+http = "0.2"
+hyper = "0.13"
+rustls = "0.17"
+webpki = "0.21"
+
+roxmltree = "0.11"
+
diff --git a/src/web/lib.rs b/src/web/lib.rs
new file mode 100644
index 00000000..80957669
--- /dev/null
+++ b/src/web/lib.rs
@@ -0,0 +1,5 @@
+#[macro_use]
+extern crate log;
+
+pub mod web_server;
+
diff --git a/src/web/web_server.rs b/src/web/web_server.rs
new file mode 100644
index 00000000..a615ec8f
--- /dev/null
+++ b/src/web/web_server.rs
@@ -0,0 +1,102 @@
+use std::sync::Arc;
+use std::net::SocketAddr;
+
+use futures::future::Future;
+
+use hyper::server::conn::AddrStream;
+use hyper::{Body,Request,Response,Server,Uri};
+use hyper::header::HOST;
+use hyper::service::{make_service_fn, service_fn};
+
+use garage_util::error::Error;
+use garage_model::garage::Garage;
+
+pub async fn run_web_server(
+ garage: Arc<Garage>,
+ shutdown_signal: impl Future<Output = ()>,
+) -> Result<(), Error> {
+ let addr = &garage.config.s3_web.web_bind_addr;
+
+ let service = make_service_fn(|conn: &AddrStream| {
+ let garage = garage.clone();
+ let client_addr = conn.remote_addr();
+ info!("{:?}", client_addr);
+ async move {
+ Ok::<_, Error>(service_fn(move |req: Request<Body>| {
+ let garage = garage.clone();
+ handler(garage, req, client_addr)
+ }))
+ }
+ });
+
+ let server = Server::bind(&addr).serve(service);
+ let graceful = server.with_graceful_shutdown(shutdown_signal);
+ info!("Web server listening on http://{}", addr);
+
+ graceful.await?;
+ 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]
+ 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(())
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:34:03 +0000