mirror of
https://github.com/rwf2/Rocket.git
synced 2025-02-24 09:32:18 +00:00
So. Many. Changes. This is an insane commit: simultaneously one of the best (because of all the wonderful improvements!) and one of the worst (because it is just massive) in the project's history. Routing: * All UTF-8 characters are accepted everywhere in route paths. (#998) * `path` is now `uri` in `route` attribute: `#[route(GET, path = "..")]` becomes `#[route(GET, uri = "..")]`. Forms Revamp * All form related types now reside in a new `form` module. * Multipart forms are supported. (resolves #106) * Collections are supported in forms and queries. (resolves #205) * Nested structures in forms and queries are supported. (resolves #313) * Form fields can be ad-hoc validated with `#[field(validate = expr)]`. * `FromFormValue` is now `FromFormField`, blanket implements `FromForm`. * Form field values are always percent-decoded apriori. Temporary Files * A new `TempFile` data and form guard allows streaming data directly to a file which can then be persisted. * A new `temp_dir` config parameter specifies where to store `TempFile`. * The limits `file` and `file/$ext`, where `$ext` is the file extension, determines the data limit for a `TempFile`. Capped * A new `Capped` type is used to indicate when data has been truncated due to incoming data limits. It allows checking whether data is complete or truncated. * `DataStream` methods return `Capped` types. * `DataStream` API has been revamped to account for `Capped` types. * Several `Capped<T>` types implement `FromData`, `FromForm`. * HTTP 413 (Payload Too Large) errors are now returned when data limits are exceeded. (resolves #972) Hierarchical Limits * Data limits are now hierarchical, delimited with `/`. A limit of `a/b/c` falls back to `a/b` then `a`. Core * `&RawStr` no longer implements `FromParam`. * `&str` implements `FromParam`, `FromData`, `FromForm`. * `FromTransformedData` was removed. * `FromData` gained a lifetime for use with request-local data. * The default error HTML is more compact. * `&Config` is a request guard. * The `DataStream` interface was entirely revamped. * `State` is only exported via `rocket::State`. * A `request::local_cache!()` macro was added for storing values in request-local cache without consideration for type uniqueness by using a locally generated anonymous type. * `Request::get_param()` is now `Request::param()`. * `Request::get_segments()` is now `Request::segments()`, takes a range. * `Request::get_query_value()` is now `Request::query_value()`, can parse any `FromForm` including sequences. * `std::io::Error` implements `Responder` like `Debug<std::io::Error>`. * `(Status, R)` where `R: Responder` implements `Responder` by overriding the `Status` of `R`. * The name of a route is printed first during route matching. * `FlashMessage` now only has one lifetime generic. HTTP * `RawStr` implements `serde::{Serialize, Deserialize}`. * `RawStr` implements _many_ more methods, in particular, those related to the `Pattern` API. * `RawStr::from_str()` is now `RawStr::new()`. * `RawStr::url_decode()` and `RawStr::url_decode_lossy()` only allocate as necessary, return `Cow`. * `Status` implements `Default` with `Status::Ok`. * `Status` implements `PartialEq`, `Eq`, `Hash`, `PartialOrd`, `Ord`. * Authority and origin part of `Absolute` can be modified with new `Absolute::{with,set}_authority()`, `Absolute::{with,set}_origin()` methods. * `Origin::segments()` was removed in favor of methods split into query and path parts and into raw and decoded versions. * The `Segments` iterator is smarter, returns decoded `&str` items. * `Segments::into_path_buf()` is now `Segments::to_path_buf()`. * A new `QuerySegments` is the analogous query segment iterator. * Once set, `expires` on private cookies is not overwritten. (resolves #1506) * `Origin::path()` and `Origin::query()` return `&RawStr`, not `&str`. Codegen * Preserve more spans in `uri!` macro. * Preserve spans `FromForm` field types. * All dynamic parameters in a query string must typecheck as `FromForm`. * `FromFormValue` derive removed; `FromFormField` added. * The `form` `FromForm` and `FromFormField` field attribute is now named `field`. `#[form(field = ..)]` is now `#[field(name = ..)]`. Contrib * `Json` implements `FromForm`. * `MsgPack` implements `FromForm`. * The `json!` macro is exported as `rocket_contrib::json::json!`. * Added clarifying docs to `StaticFiles`. Examples * `form_validation` and `form_kitchen_sink` removed in favor of `forms`. * The `hello_world` example uses unicode in paths. * The `json` example only allocates as necessary. Internal * Codegen uses new `exports` module with the following conventions: - Locals starts with `__` and are lowercased. - Rocket modules start with `_` and are lowercased. - `std` types start with `_` and are titlecased. - Rocket types are titlecased. * A `header` module was added to `http`, contains header types. * `SAFETY` is used as doc-string keyword for `unsafe` related comments. * The `Uri` parser no longer recognizes Rocket route URIs.
191 lines
6.7 KiB
Rust
191 lines
6.7 KiB
Rust
#[cfg(feature = "templates")]
|
|
#[macro_use] extern crate rocket;
|
|
|
|
#[cfg(feature = "templates")]
|
|
mod templates_tests {
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use rocket::Rocket;
|
|
use rocket::config::Config;
|
|
use rocket_contrib::templates::{Template, Metadata};
|
|
|
|
#[get("/<engine>/<name>")]
|
|
fn template_check(md: Metadata<'_>, engine: &str, name: &str) -> Option<()> {
|
|
match md.contains_template(&format!("{}/{}", engine, name)) {
|
|
true => Some(()),
|
|
false => None
|
|
}
|
|
}
|
|
|
|
#[get("/is_reloading")]
|
|
fn is_reloading(md: Metadata<'_>) -> Option<()> {
|
|
if md.reloading() { Some(()) } else { None }
|
|
}
|
|
|
|
fn template_root() -> PathBuf {
|
|
Path::new(env!("CARGO_MANIFEST_DIR")).join("tests").join("templates")
|
|
}
|
|
|
|
fn rocket() -> Rocket {
|
|
rocket::custom(Config::figment().merge(("template_dir", template_root())))
|
|
.attach(Template::fairing())
|
|
.mount("/", routes![template_check, is_reloading])
|
|
}
|
|
|
|
#[test]
|
|
fn test_callback_error() {
|
|
use rocket::{local::blocking::Client, error::ErrorKind::FailedFairings};
|
|
|
|
let rocket = rocket::ignite().attach(Template::try_custom(|_| {
|
|
Err("error reloading templates!".into())
|
|
}));
|
|
|
|
match Client::untracked(rocket) {
|
|
Err(e) => match e.kind() {
|
|
FailedFairings(failures) => assert_eq!(failures[0], "Templates"),
|
|
_ => panic!("Wrong kind of launch error"),
|
|
}
|
|
_ => panic!("Wrong kind of error"),
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "tera_templates")]
|
|
mod tera_tests {
|
|
use super::*;
|
|
use std::collections::HashMap;
|
|
use rocket::http::Status;
|
|
use rocket::local::blocking::Client;
|
|
|
|
const UNESCAPED_EXPECTED: &'static str
|
|
= "\nh_start\ntitle: _test_\nh_end\n\n\n<script />\n\nfoot\n";
|
|
const ESCAPED_EXPECTED: &'static str
|
|
= "\nh_start\ntitle: _test_\nh_end\n\n\n<script />\n\nfoot\n";
|
|
|
|
#[test]
|
|
fn test_tera_templates() {
|
|
let rocket = rocket();
|
|
let mut map = HashMap::new();
|
|
map.insert("title", "_test_");
|
|
map.insert("content", "<script />");
|
|
|
|
// Test with a txt file, which shouldn't escape.
|
|
let template = Template::show(&rocket, "tera/txt_test", &map);
|
|
assert_eq!(template, Some(UNESCAPED_EXPECTED.into()));
|
|
|
|
// Now with an HTML file, which should.
|
|
let template = Template::show(&rocket, "tera/html_test", &map);
|
|
assert_eq!(template, Some(ESCAPED_EXPECTED.into()));
|
|
}
|
|
|
|
#[test]
|
|
fn test_template_metadata_with_tera() {
|
|
let client = Client::tracked(rocket()).unwrap();
|
|
|
|
let response = client.get("/tera/txt_test").dispatch();
|
|
assert_eq!(response.status(), Status::Ok);
|
|
|
|
let response = client.get("/tera/html_test").dispatch();
|
|
assert_eq!(response.status(), Status::Ok);
|
|
|
|
let response = client.get("/tera/not_existing").dispatch();
|
|
assert_eq!(response.status(), Status::NotFound);
|
|
|
|
let response = client.get("/hbs/txt_test").dispatch();
|
|
assert_eq!(response.status(), Status::NotFound);
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "handlebars_templates")]
|
|
mod handlebars_tests {
|
|
use super::*;
|
|
use std::collections::HashMap;
|
|
use rocket::http::Status;
|
|
use rocket::local::blocking::Client;
|
|
|
|
const EXPECTED: &'static str
|
|
= "Hello _test_!\n\n<main> <script /> hi </main>\nDone.\n\n";
|
|
|
|
#[test]
|
|
fn test_handlebars_templates() {
|
|
let rocket = rocket();
|
|
let mut map = HashMap::new();
|
|
map.insert("title", "_test_");
|
|
map.insert("content", "<script /> hi");
|
|
|
|
// Test with a txt file, which shouldn't escape.
|
|
let template = Template::show(&rocket, "hbs/test", &map);
|
|
assert_eq!(template, Some(EXPECTED.into()));
|
|
}
|
|
|
|
#[test]
|
|
fn test_template_metadata_with_handlebars() {
|
|
let client = Client::tracked(rocket()).unwrap();
|
|
|
|
let response = client.get("/hbs/test").dispatch();
|
|
assert_eq!(response.status(), Status::Ok);
|
|
|
|
let response = client.get("/hbs/not_existing").dispatch();
|
|
assert_eq!(response.status(), Status::NotFound);
|
|
|
|
let response = client.get("/tera/test").dispatch();
|
|
assert_eq!(response.status(), Status::NotFound);
|
|
}
|
|
|
|
#[test]
|
|
#[cfg(debug_assertions)]
|
|
fn test_template_reload() {
|
|
use std::fs::File;
|
|
use std::io::Write;
|
|
use std::time::Duration;
|
|
|
|
use rocket::local::blocking::Client;
|
|
|
|
const RELOAD_TEMPLATE: &str = "hbs/reload";
|
|
const INITIAL_TEXT: &str = "initial";
|
|
const NEW_TEXT: &str = "reload";
|
|
|
|
fn write_file(path: &Path, text: &str) {
|
|
let mut file = File::create(path).expect("open file");
|
|
file.write_all(text.as_bytes()).expect("write file");
|
|
file.sync_all().expect("sync file");
|
|
}
|
|
|
|
// set up the template before initializing the Rocket instance so
|
|
// that it will be picked up in the initial loading of templates.
|
|
let reload_path = template_root().join("hbs").join("reload.txt.hbs");
|
|
write_file(&reload_path, INITIAL_TEXT);
|
|
|
|
// set up the client. if we can't reload templates, then just quit
|
|
let client = Client::tracked(rocket()).unwrap();
|
|
let res = client.get("/is_reloading").dispatch();
|
|
if res.status() != Status::Ok {
|
|
return;
|
|
}
|
|
|
|
// verify that the initial content is correct
|
|
let initial_rendered = Template::show(client.rocket(), RELOAD_TEMPLATE, ());
|
|
assert_eq!(initial_rendered, Some(INITIAL_TEXT.into()));
|
|
|
|
// write a change to the file
|
|
write_file(&reload_path, NEW_TEXT);
|
|
|
|
for _ in 0..6 {
|
|
// dispatch any request to trigger a template reload
|
|
client.get("/").dispatch();
|
|
|
|
// if the new content is correct, we are done
|
|
let new_rendered = Template::show(client.rocket(), RELOAD_TEMPLATE, ());
|
|
if new_rendered == Some(NEW_TEXT.into()) {
|
|
write_file(&reload_path, INITIAL_TEXT);
|
|
return;
|
|
}
|
|
|
|
// otherwise, retry a few times, waiting 250ms in between
|
|
std::thread::sleep(Duration::from_millis(250));
|
|
}
|
|
|
|
panic!("failed to reload modified template in 1.5s");
|
|
}
|
|
}
|
|
}
|