mirror of
https://github.com/rwf2/Rocket.git
synced 2025-01-09 19:19:12 +00:00
fa3e0334c1
This commit entirely rewrites Rocket's URI parsing routines and overhauls the 'uri!' macro resolving all known issues and removing any potential limitations for compile-time URI creation. This commit: * Introduces a new 'Reference' URI variant for URI-references. * Modifies 'Redirect' to accept 'TryFrom<Reference>'. * Introduces a new 'Asterisk' URI variant for parity. * Allows creation of any URI type from a string literal via 'uri!'. * Enables dynamic/static prefixing/suffixing of route URIs in 'uri!'. * Unifies 'Segments' and 'QuerySegments' into one generic 'Segments'. * Consolidates URI formatting types/traits into a 'uri::fmt' module. * Makes APIs more symmetric across URI types. It also includes the following less-relevant changes: * Implements 'FromParam' for a single-segment 'PathBuf'. * Adds 'FileName::is_safe()'. * No longer reparses upstream request URIs. Resolves #842. Resolves #853. Resolves #998.
56 lines
1.5 KiB
Rust
56 lines
1.5 KiB
Rust
#[macro_use] extern crate rocket;
|
|
|
|
use rocket::{Rocket, Build};
|
|
use rocket::response::Redirect;
|
|
|
|
const NAME: &str = "John[]|\\%@^";
|
|
|
|
#[get("/hello/<name>")]
|
|
fn hello(name: String) -> String {
|
|
format!("Hello, {}!", name)
|
|
}
|
|
|
|
#[get("/raw")]
|
|
fn raw_redirect() -> Redirect {
|
|
Redirect::to(uri!(hello(NAME)))
|
|
}
|
|
|
|
#[get("/uri")]
|
|
fn uri_redirect() -> Redirect {
|
|
Redirect::to(uri!(hello(NAME)))
|
|
}
|
|
|
|
fn rocket() -> Rocket<Build> {
|
|
rocket::build().mount("/", routes![hello, uri_redirect, raw_redirect])
|
|
}
|
|
|
|
mod tests {
|
|
use super::*;
|
|
use rocket::local::blocking::Client;
|
|
use rocket::http::Status;
|
|
|
|
#[test]
|
|
fn uri_percent_encoding_redirect() {
|
|
let expected_location = vec!["/hello/John%5B%5D%7C%5C%25@%5E"];
|
|
let client = Client::debug(rocket()).unwrap();
|
|
|
|
let response = client.get("/raw").dispatch();
|
|
let location: Vec<_> = response.headers().get("location").collect();
|
|
assert_eq!(response.status(), Status::SeeOther);
|
|
assert_eq!(&location, &expected_location);
|
|
|
|
let response = client.get("/uri").dispatch();
|
|
let location: Vec<_> = response.headers().get("location").collect();
|
|
assert_eq!(response.status(), Status::SeeOther);
|
|
assert_eq!(&location, &expected_location);
|
|
}
|
|
|
|
#[test]
|
|
fn uri_percent_encoding_get() {
|
|
let client = Client::debug(rocket()).unwrap();
|
|
let response = client.get(uri!(hello(NAME))).dispatch();
|
|
assert_eq!(response.status(), Status::Ok);
|
|
assert_eq!(response.into_string().unwrap(), format!("Hello, {}!", NAME));
|
|
}
|
|
}
|