asonix/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Activity
garage/src/web/web_server.rs

169 lines
4.5 KiB
Rust
Raw Normal View History

Use handle_get
2020-11-21 16:50:19 +00:00
use std::{borrow::Cow, convert::Infallible, net::SocketAddr, sync::Arc};
Skeleton to the new web API
2020-11-02 14:48:39 +00:00
use futures::future::Future;
We are able to serve a file
2020-11-21 14:15:25 +00:00
use hyper::{
header::HOST,
server::conn::AddrStream,
service::{make_service_fn, service_fn},
Handle HEAD
2020-11-21 16:58:14 +00:00
Body, Method, Request, Response, Server,
Use handle_get
2020-11-21 16:50:19 +00:00
};
Skeleton to the new web API
2020-11-02 14:48:39 +00:00
Use handle_get
2020-11-21 16:50:19 +00:00
use crate::error::*;
Model changes
2021-12-16 10:47:58 +00:00
add support for vhost-style s3 bucket
2021-11-11 10:26:02 +00:00
use garage_api::helpers::{authority_to_host, host_to_bucket};
Handle HEAD
2020-11-21 16:58:14 +00:00
use garage_api::s3_get::{handle_get, handle_head};
Model changes
2021-12-16 10:47:58 +00:00
use garage_model::bucket_table::Bucket;
Skeleton to the new web API
2020-11-02 14:48:39 +00:00
use garage_model::garage::Garage;
Model changes
2021-12-16 10:47:58 +00:00
Fix formatting
2020-12-17 21:51:44 +00:00
use garage_table::*;
Make it compile again
2020-11-19 13:56:00 +00:00
use garage_util::error::Error as GarageError;
Skeleton to the new web API
2020-11-02 14:48:39 +00:00
document web crate
2021-03-26 21:05:16 +00:00
/// Run a web server
Skeleton to the new web API
2020-11-02 14:48:39 +00:00
pub async fn run_web_server(
garage: Arc<Garage>,
shutdown_signal: impl Future<Output = ()>,
Make it compile again
2020-11-19 13:56:00 +00:00
) -> Result<(), GarageError> {
Extract bucket
2020-11-10 08:57:07 +00:00
let addr = &garage.config.s3_web.bind_addr;
Skeleton to the new web API
2020-11-02 14:48:39 +00:00
let service = make_service_fn(|conn: &AddrStream| {
let garage = garage.clone();
let client_addr = conn.remote_addr();
Fix formatting
2020-11-10 08:59:52 +00:00
async move {
Skeleton to the new web API
2020-11-02 14:48:39 +00:00
Ok::<_, Error>(service_fn(move |req: Request<Body>| {
let garage = garage.clone();
Build error
2020-11-11 20:17:34 +00:00
handle_request(garage, req, client_addr)
Skeleton to the new web API
2020-11-02 14:48:39 +00:00
}))
}
});
Fix clippy lints (fix #121)
2021-10-26 08:20:05 +00:00
let server = Server::bind(addr).serve(service);
Skeleton to the new web API
2020-11-02 14:48:39 +00:00
let graceful = server.with_graceful_shutdown(shutdown_signal);
info!("Web server listening on http://{}", addr);
graceful.await?;
Ok(())
}
Parse host header
2020-11-08 14:47:25 +00:00
Build error
2020-11-11 20:17:34 +00:00
async fn handle_request(
Parse host header
2020-11-08 14:47:25 +00:00
garage: Arc<Garage>,
req: Request<Body>,
addr: SocketAddr,
Build error
2020-11-11 20:17:34 +00:00
) -> Result<Response<Body>, Infallible> {
info!("{} {} {}", addr, req.method(), req.uri());
let res = serve_file(garage, req).await;
match &res {
Ok(r) => debug!("{} {:?}", r.status(), r.headers()),
Err(e) => warn!("Response: error {}, {}", e.http_status_code(), e),
}
Ok(res.unwrap_or_else(error_to_res))
}
fn error_to_res(e: Error) -> Response<Body> {
let body: Body = Body::from(format!("{}\n", e));
let mut http_error = Response::new(body);
*http_error.status_mut() = e.http_status_code();
Improved handling of HTTP ranges - correct HTTP code when range syntax is invalid (fix #140) - when multiple ranges are given, simply ignore and send whole file Co-authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/157 Reviewed-by: Alex <alex@adnab.me> Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>
2021-11-29 10:52:42 +00:00
e.add_headers(http_error.headers_mut());
Build error
2020-11-11 20:17:34 +00:00
http_error
}
async fn serve_file(garage: Arc<Garage>, req: Request<Body>) -> Result<Response<Body>, Error> {
Extract bucket
2020-11-10 08:57:07 +00:00
// Get http authority string (eg. [::1]:3902 or garage.tld:80)
Parse host header
2020-11-08 14:47:25 +00:00
let authority = req
.headers()
.get(HOST)
fix clippy warnings on web
2021-04-23 20:26:27 +00:00
.ok_or_else(|| Error::BadRequest("HOST header required".to_owned()))?
Parse host header
2020-11-08 14:47:25 +00:00
.to_str()?;
Extract bucket
2020-11-10 08:57:07 +00:00
// Get bucket
add support for vhost-style s3 bucket
2021-11-11 10:26:02 +00:00
let host = authority_to_host(authority)?;
Fix formatting
2020-11-10 08:59:52 +00:00
let root = &garage.config.s3_web.root_domain;
Extract bucket
2020-11-10 08:57:07 +00:00
New model for buckets
2021-12-14 12:55:11 +00:00
let bucket_name = host_to_bucket(&host, root).unwrap_or(&host);
let bucket_id = garage
.bucket_alias_table
.get(&EmptyKey, &bucket_name.to_string())
.await?
New buckets for 0.6.0: small changes - Fix bucket delete - fix merge of bucket creation date - Replace deletable with option in aliases Rationale: if two aliases point to conflicting bucket, resolving by making an arbitrary choice risks making data accessible when it shouldn't be. We'd rather resolve to deleting the alias until someone puts it back.
2022-01-03 17:32:15 +00:00
.map(|x| x.state.take())
New model for buckets
2021-12-14 12:55:11 +00:00
.flatten()
.ok_or(Error::NotFound)?;
Model changes
2021-12-16 10:47:58 +00:00
// Check bucket isn't deleted and has website access enabled
let _: Bucket = garage
Fix formatting
2020-12-17 21:51:44 +00:00
.bucket_table
New model for buckets
2021-12-14 12:55:11 +00:00
.get(&bucket_id, &EmptyKey)
Fix formatting
2020-12-17 21:51:44 +00:00
.await?
Model changes
2021-12-16 10:47:58 +00:00
.filter(|b| {
b.state
.as_option()
New buckets for 0.6.0: small fixes, including: - ensure bucket names are correct aws s3 names - when making aliases, ensure timestamps of links in both ways are the same - fix small remarks by trinity - don't have a separate website_access field
2021-12-17 10:53:13 +00:00
.map(|x| x.website_config.get().is_some())
Model changes
2021-12-16 10:47:58 +00:00
.unwrap_or(false)
})
Fix formatting
2020-12-17 21:51:44 +00:00
.ok_or(Error::NotFound)?;
Extract bucket
2020-11-10 08:57:07 +00:00
// Get path
let path = req.uri().path().to_string();
Build path correctly
2020-11-11 18:48:01 +00:00
let index = &garage.config.s3_web.index;
Fix clippy lints (fix #121)
2021-10-26 08:20:05 +00:00
let key = path_to_key(&path, index)?;
Fix formatting
2020-11-10 08:59:52 +00:00
New model for buckets
2021-12-14 12:55:11 +00:00
info!(
"Selected bucket: \"{}\" {:?}, selected key: \"{}\"",
bucket_name, bucket_id, key
);
Build path correctly
2020-11-11 18:48:01 +00:00
fix clippy warnings on web
2021-04-23 20:26:27 +00:00
let res = match *req.method() {
New model for buckets
2021-12-14 12:55:11 +00:00
Method::HEAD => handle_head(garage, &req, bucket_id, &key).await?,
Method::GET => handle_get(garage, &req, bucket_id, &key).await?,
fix clippy warnings on web
2021-04-23 20:26:27 +00:00
_ => return Err(Error::BadRequest("HTTP method not supported".to_string())),
Handle HEAD
2020-11-21 16:58:14 +00:00
};
We are able to serve a file
2020-11-21 14:15:25 +00:00
Handle HEAD
2020-11-21 16:58:14 +00:00
Ok(res)
Parse host header
2020-11-08 14:47:25 +00:00
}
Build path correctly
2020-11-11 18:48:01 +00:00
/// Path to key
///
/// Convert the provided path to the internal key
/// When a path ends with "/", we append the index name to match traditional web server behavior
/// which is also AWS S3 behavior.
fn path_to_key<'a>(path: &'a str, index: &str) -> Result<Cow<'a, str>, Error> {
Fix clippy lints (fix #121)
2021-10-26 08:20:05 +00:00
let path_utf8 = percent_encoding::percent_decode_str(path).decode_utf8()?;
Use handle_get
2020-11-21 16:50:19 +00:00
fix clippy warnings on web
2021-04-23 20:26:27 +00:00
if !path_utf8.starts_with('/') {
return Err(Error::BadRequest(
"Path must start with a / (slash)".to_string(),
));
Fix host to key
2020-11-21 11:01:02 +00:00
}
Build path correctly
2020-11-11 18:48:01 +00:00
match path_utf8.chars().last() {
Explicitly set code path unreachable
2021-01-15 16:11:15 +00:00
None => unreachable!(),
Build path correctly
2020-11-11 18:48:01 +00:00
Some('/') => {
let mut key = String::with_capacity(path_utf8.len() + index.len());
Fix host to key
2020-11-21 11:01:02 +00:00
key.push_str(&path_utf8[1..]);
Build path correctly
2020-11-11 18:48:01 +00:00
key.push_str(index);
Ok(key.into())
}
Use handle_get
2020-11-21 16:50:19 +00:00
Some(_) => match path_utf8 {
Cow::Borrowed(pu8) => Ok((&pu8[1..]).into()),
Cow::Owned(pu8) => Ok((&pu8[1..]).to_string().into()),
},
Build path correctly
2020-11-11 18:48:01 +00:00
}
}
Parse host header
2020-11-08 14:47:25 +00:00
#[cfg(test)]
mod tests {
use super::*;
Build path correctly
2020-11-11 18:48:01 +00:00
#[test]
fn path_to_key_test() -> Result<(), Error> {
Fix host to key
2020-11-21 11:01:02 +00:00
assert_eq!(path_to_key("/file%20.jpg", "index.html")?, "file .jpg");
assert_eq!(path_to_key("/%20t/", "index.html")?, " t/index.html");
assert_eq!(path_to_key("/", "index.html")?, "index.html");
assert_eq!(path_to_key("/hello", "index.html")?, "hello");
Build path correctly
2020-11-11 18:48:01 +00:00
assert!(path_to_key("", "index.html").is_err());
Fix host to key
2020-11-21 11:01:02 +00:00
assert!(path_to_key("i/am/relative", "index.html").is_err());
Build path correctly
2020-11-11 18:48:01 +00:00
Ok(())
}
Parse host header
2020-11-08 14:47:25 +00:00
}
Copy permalink