diff options
| -rw-r--r-- | src/config.rs | 16 | ||||
| -rw-r--r-- | tests/serve_request.rs | 25 |
2 files changed, 37 insertions, 4 deletions
diff --git a/src/config.rs b/src/config.rs index 2ee014f..ec7ec66 100644 --- a/src/config.rs +++ b/src/config.rs @@ -151,8 +151,20 @@ impl MiniserveConfig { // Generate some random routes for the favicon and css so that they are very unlikely to conflict with // real files. - let favicon_route = format!("/{}", nanoid::nanoid!(10, &ROUTE_ALPHABET)); - let css_route = format!("/{}", nanoid::nanoid!(10, &ROUTE_ALPHABET)); + // If --random-route is enabled , in order to not leak the random generated route, we must not use it + // as static files prefix. + // Otherwise, we should apply route_prefix to static files. + let (favicon_route, css_route) = if args.random_route { + ( + format!("/{}", nanoid::nanoid!(10, &ROUTE_ALPHABET)), + format!("/{}", nanoid::nanoid!(10, &ROUTE_ALPHABET)), + ) + } else { + ( + format!("{}/{}", route_prefix, nanoid::nanoid!(10, &ROUTE_ALPHABET)), + format!("{}/{}", route_prefix, nanoid::nanoid!(10, &ROUTE_ALPHABET)), + ) + }; let default_color_scheme = args.color_scheme; let default_color_scheme_dark = args.color_scheme_dark; diff --git a/tests/serve_request.rs b/tests/serve_request.rs index 450a8f5..3f5eeff 100644 --- a/tests/serve_request.rs +++ b/tests/serve_request.rs @@ -9,8 +9,7 @@ use fixtures::{ use http::StatusCode; use regex::Regex; use rstest::rstest; -use select::document::Document; -use select::node::Node; +use select::{document::Document, node::Node, predicate::Attr}; use std::process::{Command, Stdio}; use std::thread::sleep; use std::time::Duration; @@ -281,3 +280,25 @@ fn serves_requests_with_route_prefix(#[case] server: TestServer) -> Result<(), E Ok(()) } + +#[rstest] +#[case(server_no_stderr(&[] as &[&str]), "/[a-f0-9]+")] +#[case(server_no_stderr(&["--random-route"]), "/[a-f0-9]+")] +#[case(server_no_stderr(&["--route-prefix", "foobar"]), "/foobar/[a-f0-9]+")] +fn serves_requests_static_file_check( + #[case] server: TestServer, + #[case] static_file_pattern: String, +) -> Result<(), Error> { + let body = reqwest::blocking::get(server.url())?; + let parsed = Document::from_read(body)?; + let re = Regex::new(&static_file_pattern).unwrap(); + + assert!(parsed + .find(Attr("rel", "stylesheet")) + .all(|x| re.is_match(x.attr("href").unwrap()))); + assert!(parsed + .find(Attr("rel", "icon")) + .all(|x| re.is_match(x.attr("href").unwrap()))); + + Ok(()) +} |