diff options
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | src/web/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/web/web_server.rs | 4 |
3 files changed, 5 insertions, 2 deletions
@@ -661,6 +661,7 @@ dependencies = [ "hex", "http", "hyper", + "idna", "log", "percent-encoding", "rand", diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index 8eddf047..252ee58d 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -41,4 +41,4 @@ rustls = "0.17" webpki = "0.21" roxmltree = "0.11" - +idna = "0.2" diff --git a/src/web/web_server.rs b/src/web/web_server.rs index 4771d209..1c5619fa 100644 --- a/src/web/web_server.rs +++ b/src/web/web_server.rs @@ -10,6 +10,8 @@ use hyper::server::conn::AddrStream; use hyper::service::{make_service_fn, service_fn}; use hyper::{Body, Request, Response, Server}; +use idna::domain_to_unicode; + use garage_model::garage::Garage; use garage_util::error::Error as GarageError; use crate::error::*; @@ -70,7 +72,7 @@ async fn serve_file(garage: Arc<Garage>, req: Request<Body>) -> Result<Response< .to_str()?; // Get bucket - let host = authority_to_host(authority)?; + let (host, _) = domain_to_unicode(authority_to_host(authority)?); let root = &garage.config.s3_web.root_domain; let bucket = host_to_bucket(&host, root); |