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

245 lines
6.7 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::{
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
header::{HeaderValue, HOST},
We are able to serve a file
2020-11-21 14:15:25 +00:00
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
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
use garage_api::error::{Error as ApiError, OkOrBadRequest};
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
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());
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
match serve_file(garage, &req).await {
Ok(res) => {
debug!("{} {} {}", req.method(), req.uri(), res.status());
Ok(res)
}
Err(error) => {
info!(
"{} {} {} {}",
req.method(),
req.uri(),
error.http_status_code(),
error
);
Ok(error_to_res(error))
}
Build error
2020-11-11 20:17:34 +00:00
}
}
fn error_to_res(e: Error) -> Response<Body> {
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
// If we are here, it is either that:
// - there was an error before trying to get the requested URL
// from the bucket (e.g. bucket not found)
// - there was an error processing the request and (the request
// was a HEAD request or we couldn't get the error document)
// We do NOT enter this code path when returning the bucket's
// error document (this is handled in serve_file)
let body = Body::from(format!("{}\n", e));
Build error
2020-11-11 20:17:34 +00:00
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
}
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
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)
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
.ok_or_bad_request("HOST header required")?
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
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
let bucket = garage
Fix formatting
2020-12-17 21:51:44 +00:00
.bucket_table
New buckets for 0.6.0: make bucket id a SK and not a HK, CLI updates
2022-01-03 18:06:04 +00:00
.get(&EmptyKey, &bucket_id)
Fix formatting
2020-12-17 21:51:44 +00:00
.await?
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
.ok_or(Error::NotFound)?;
let website_config = bucket
.params()
.ok_or(Error::NotFound)?
.website_config
.get()
.as_ref()
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();
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
let index = &website_config.index_document;
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
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
debug!(
New model for buckets
2021-12-14 12:55:11 +00:00
"Selected bucket: \"{}\" {:?}, selected key: \"{}\"",
bucket_name, bucket_id, key
);
Build path correctly
2020-11-11 18:48:01 +00:00
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
let ret_doc = match *req.method() {
Method::HEAD => handle_head(garage.clone(), req, bucket_id, &key).await,
Method::GET => handle_get(garage.clone(), req, bucket_id, &key).await,
_ => Err(ApiError::BadRequest("HTTP method not supported".into())),
}
.map_err(Error::from);
if let Err(error) = ret_doc {
if *req.method() == Method::HEAD || !error.http_status_code().is_client_error() {
// Do not return the error document in the following cases:
// - the error is not a 4xx error code
// - the request is a HEAD method
// In this case we just return the error code and the error message in the body,
// by relying on err_to_res that is called above when we return an Err.
return Err(error);
}
We are able to serve a file
2020-11-21 14:15:25 +00:00
Make use of website config, return error document on error
2022-01-06 11:55:49 +00:00
// Same if no error document is set: just return the error directly
let error_document = match &website_config.error_document {
Some(ed) => ed.trim_start_matches('/').to_owned(),
None => return Err(error),
};
// We want to return the error document
// Create a fake HTTP request with path = the error document
let req2 = Request::builder()
.uri(format!("http://{}/{}", host, &error_document))
.body(Body::empty())
.unwrap();
match handle_get(garage, &req2, bucket_id, &error_document).await {
Ok(mut error_doc) => {
// The error won't be logged back in handle_request,
// so log it here
info!(
"{} {} {} {}",
req.method(),
req.uri(),
error.http_status_code(),
error
);
*error_doc.status_mut() = error.http_status_code();
error.add_headers(error_doc.headers_mut());
// Preserve error message in a special header
for error_line in error.to_string().split('\n') {
if let Ok(v) = HeaderValue::from_bytes(error_line.as_bytes()) {
error_doc.headers_mut().append("X-Garage-Error", v);
}
}
Ok(error_doc)
}
Err(error_doc_error) => {
warn!(
"Couldn't get error document {} for bucket {:?}: {}",
error_document, bucket_id, error_doc_error
);
Err(error)
}
}
} else {
ret_doc
}
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