2018-09-20 04:14:30 +00:00
|
|
|
#[macro_use] extern crate rocket;
|
2020-07-21 19:06:06 +00:00
|
|
|
#[macro_use] extern crate bencher;
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2017-05-20 02:39:10 +00:00
|
|
|
#[get("/")]
|
|
|
|
fn hello_world() -> &'static str { "Hello, world!" }
|
|
|
|
|
2017-04-05 08:19:33 +00:00
|
|
|
#[put("/")]
|
|
|
|
fn put_index() -> &'static str { "index" }
|
|
|
|
|
|
|
|
#[post("/")]
|
|
|
|
fn post_index() -> &'static str { "index" }
|
|
|
|
|
|
|
|
#[get("/a")]
|
|
|
|
fn index_a() -> &'static str { "index" }
|
|
|
|
|
|
|
|
#[get("/b")]
|
|
|
|
fn index_b() -> &'static str { "index" }
|
|
|
|
|
|
|
|
#[get("/c")]
|
|
|
|
fn index_c() -> &'static str { "index" }
|
|
|
|
|
2019-07-18 03:38:24 +00:00
|
|
|
#[get("/<_a>")]
|
UTF-8 routes. Forms revamp. Temp files. Capped.
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.
2020-10-30 03:50:06 +00:00
|
|
|
fn index_dyn_a(_a: &str) -> &'static str { "index" }
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2017-05-20 02:39:10 +00:00
|
|
|
fn hello_world_rocket() -> rocket::Rocket {
|
Test 'secret_key' validation, now on pre-launch.
Prior to this commit, it was not possible to test Rocket crates in
production mode without setting a global secret key or bypassing secret
key checking - the testing script did the latter. The consequence is
that it became impossible to test secret key related failures because
the tests passed regardless.
This commit undoes this. As a consequence, all tests are now aware of
the difference between debug and release configurations, the latter of
which validates 'secret_key' by default. New 'Client::debug()' and
'Client::debug_with()' simplify creating an instance of 'Client' with
configuration in debug mode to avoid undesired test failures.
The summary of changes in this commit are:
* Config 'secret_key' success and failure are now tested.
* 'secret_key' validation was moved to pre-launch from 'Config:from()'.
* 'Config::from()' only extracts the config.
* Added 'Config::try_from()' for non-panicking extraction.
* 'Config' now knows the profile it was extracted from.
* The 'Config' provider sets a profile of 'Config.profile'.
* 'Rocket', 'Client', 'Fairings', implement 'Debug'.
* 'fairing::Info' implements 'Copy', 'Clone'.
* 'Fairings' keeps track of, logs attach fairings.
* 'Rocket::reconfigure()' was added to allow modifying a config.
Internally, the testing script was refactored to properly test the
codebase with the new changes. In particular, it no longer sets a rustc
'cfg' to avoid secret-key checking.
Resolves #1543.
Fixes #1564.
2021-03-09 08:07:43 +00:00
|
|
|
let config = rocket::Config {
|
|
|
|
log_level: rocket::config::LogLevel::Off,
|
|
|
|
..rocket::Config::debug_default()
|
|
|
|
};
|
|
|
|
|
2020-09-03 05:41:31 +00:00
|
|
|
rocket::custom(config).mount("/", routes![hello_world])
|
2017-05-20 02:39:10 +00:00
|
|
|
}
|
|
|
|
|
2017-04-05 08:19:33 +00:00
|
|
|
fn rocket() -> rocket::Rocket {
|
2020-09-03 05:41:31 +00:00
|
|
|
hello_world_rocket()
|
|
|
|
.mount("/", routes![
|
|
|
|
put_index, post_index, index_a, index_b, index_c, index_dyn_a
|
|
|
|
])
|
2017-04-05 08:19:33 +00:00
|
|
|
}
|
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
use bencher::Bencher;
|
|
|
|
use rocket::local::blocking::Client;
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
fn bench_hello_world(b: &mut Bencher) {
|
2020-10-15 04:37:16 +00:00
|
|
|
let client = Client::tracked(hello_world_rocket()).unwrap();
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
b.iter(|| {
|
|
|
|
client.get("/").dispatch();
|
|
|
|
});
|
|
|
|
}
|
2020-06-19 13:01:10 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
fn bench_single_get_index(b: &mut Bencher) {
|
2020-10-15 04:37:16 +00:00
|
|
|
let client = Client::tracked(rocket()).unwrap();
|
2017-05-20 02:39:10 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
b.iter(|| {
|
|
|
|
client.get("/").dispatch();
|
|
|
|
});
|
|
|
|
}
|
2017-05-20 02:39:10 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
fn bench_get_put_post_index(b: &mut Bencher) {
|
2020-10-15 04:37:16 +00:00
|
|
|
let client = Client::tracked(rocket()).unwrap();
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
// Hold all of the requests we're going to make during the benchmark.
|
|
|
|
let mut requests = vec![];
|
|
|
|
requests.push(client.get("/"));
|
|
|
|
requests.push(client.put("/"));
|
|
|
|
requests.push(client.post("/"));
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
b.iter(|| {
|
|
|
|
for request in &requests {
|
|
|
|
request.clone().dispatch();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
fn bench_dynamic(b: &mut Bencher) {
|
2020-10-15 04:37:16 +00:00
|
|
|
let client = Client::tracked(rocket()).unwrap();
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
// Hold all of the requests we're going to make during the benchmark.
|
|
|
|
let mut requests = vec![];
|
|
|
|
requests.push(client.get("/abc"));
|
|
|
|
requests.push(client.get("/abcdefg"));
|
|
|
|
requests.push(client.get("/123"));
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
b.iter(|| {
|
|
|
|
for request in &requests {
|
|
|
|
request.clone().dispatch();
|
2017-04-05 08:19:33 +00:00
|
|
|
}
|
2020-07-21 19:06:06 +00:00
|
|
|
});
|
|
|
|
}
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
fn bench_simple_routing(b: &mut Bencher) {
|
2020-10-15 04:37:16 +00:00
|
|
|
let client = Client::tracked(rocket()).unwrap();
|
2017-04-05 08:19:33 +00:00
|
|
|
|
2020-07-21 19:06:06 +00:00
|
|
|
// Hold all of the requests we're going to make during the benchmark.
|
|
|
|
let mut requests = vec![];
|
2020-10-22 10:27:04 +00:00
|
|
|
for route in client.rocket().routes() {
|
2021-03-17 07:46:33 +00:00
|
|
|
let request = client.req(route.method, route.uri.path());
|
2020-07-21 19:06:06 +00:00
|
|
|
requests.push(request);
|
2017-04-05 08:19:33 +00:00
|
|
|
}
|
2020-07-21 19:06:06 +00:00
|
|
|
|
|
|
|
// A few more for the dynamic route.
|
|
|
|
requests.push(client.get("/abc"));
|
|
|
|
requests.push(client.get("/abcdefg"));
|
|
|
|
requests.push(client.get("/123"));
|
|
|
|
|
|
|
|
b.iter(|| {
|
|
|
|
for request in &requests {
|
|
|
|
request.clone().dispatch();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
benchmark_main!(benches);
|
|
|
|
benchmark_group! {
|
|
|
|
benches,
|
|
|
|
bench_hello_world,
|
|
|
|
bench_single_get_index,
|
|
|
|
bench_get_put_post_index,
|
|
|
|
bench_dynamic,
|
|
|
|
bench_simple_routing,
|
2017-04-05 08:19:33 +00:00
|
|
|
}
|