diff options
| author | cyqsimon <28627918+cyqsimon@users.noreply.github.com> | 2023-12-06 03:45:55 +0000 |
|---|---|---|
| committer | cyqsimon <28627918+cyqsimon@users.noreply.github.com> | 2023-12-06 03:45:55 +0000 |
| commit | 8f4491326036f01269a410cfa9bb012b55cb422b (patch) | |
| tree | 451718156ecc17cab5f980003de752c5225d195c | |
| parent | Merge pull request #1282 from svenstaro/dependabot/cargo/comrak-0.20.0 (diff) | |
| download | miniserve-8f4491326036f01269a410cfa9bb012b55cb422b.tar.gz miniserve-8f4491326036f01269a410cfa9bb012b55cb422b.zip | |
Prevent illegal request path from crashing program
| -rw-r--r-- | src/listing.rs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/listing.rs b/src/listing.rs index a8feeb4..66f77e1 100644 --- a/src/listing.rs +++ b/src/listing.rs @@ -162,12 +162,17 @@ pub fn directory_listing( let base = Path::new(serve_path); let random_route_abs = format!("/{}", conf.route_prefix); - let abs_uri = http::Uri::builder() - .scheme(req.connection_info().scheme()) - .authority(req.connection_info().host()) - .path_and_query(req.uri().to_string()) - .build() - .unwrap(); + let abs_uri = { + let res = http::Uri::builder() + .scheme(req.connection_info().scheme()) + .authority(req.connection_info().host()) + .path_and_query(req.uri().to_string()) + .build(); + match res { + Ok(uri) => uri, + Err(err) => return Ok(ServiceResponse::from_err(err, req.clone())), + } + }; let is_root = base.parent().is_none() || Path::new(&req.path()) == Path::new(&random_route_abs); let encoded_dir = match base.strip_prefix(random_route_abs) { |