From 890d5d6de8d047a9b3edeee3d3b77dd55500c111 Mon Sep 17 00:00:00 2001 From: David Pedersen Date: Sat, 10 Sep 2022 08:56:10 +0200 Subject: [PATCH 1/6] rc.2 --- axum-core/CHANGELOG.md | 4 ++++ axum-core/Cargo.toml | 4 ++-- axum-core/src/extract/default_body_limit.rs | 8 ++++---- axum-core/src/extract/mod.rs | 4 ++-- axum-extra/CHANGELOG.md | 4 ++++ axum-extra/Cargo.toml | 8 ++++---- axum-macros/CHANGELOG.md | 4 ++++ axum-macros/Cargo.toml | 6 +++--- axum/CHANGELOG.md | 4 ++++ axum/Cargo.toml | 6 +++--- 10 files changed, 34 insertions(+), 18 deletions(-) diff --git a/axum-core/CHANGELOG.md b/axum-core/CHANGELOG.md index b61b5fae09..71cccf5df7 100644 --- a/axum-core/CHANGELOG.md +++ b/axum-core/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 # Unreleased +- None. + +# 0.3.0-rc.2 (10. September, 2022) + - **breaking:** Added default limit to how much data `Bytes::from_request` will consume. Previously it would attempt to consume the entire request body without checking its length. This meant if a malicious peer sent an large (or diff --git a/axum-core/Cargo.toml b/axum-core/Cargo.toml index 94f672faae..044d23ed82 100644 --- a/axum-core/Cargo.toml +++ b/axum-core/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" name = "axum-core" readme = "README.md" repository = "https://github.com/tokio-rs/axum" -version = "0.3.0-rc.1" # remember to also bump the version that axum depends on +version = "0.3.0-rc.2" # remember to also bump the version that axum depends on [dependencies] async-trait = "0.1" @@ -22,7 +22,7 @@ tower-layer = "0.3" tower-service = "0.3" [dev-dependencies] -axum = { path = "../axum", version = "0.6.0-rc.1" } +axum = { path = "../axum", version = "0.6.0-rc.2" } futures-util = "0.3" hyper = "0.14" tokio = { version = "1.0", features = ["macros"] } diff --git a/axum-core/src/extract/default_body_limit.rs b/axum-core/src/extract/default_body_limit.rs index 87759c8a9a..fcf44b790f 100644 --- a/axum-core/src/extract/default_body_limit.rs +++ b/axum-core/src/extract/default_body_limit.rs @@ -13,8 +13,8 @@ use tower_layer::Layer; /// /// [`Body::data`]: http_body::Body::data /// [`Bytes`]: bytes::Bytes -/// [`Json`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Json.html -/// [`Form`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Form.html +/// [`Json`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Json.html +/// [`Form`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Form.html #[derive(Debug, Clone)] #[non_exhaustive] pub struct DefaultBodyLimit; @@ -50,8 +50,8 @@ impl DefaultBodyLimit { /// /// [`tower_http::limit`]: https://docs.rs/tower-http/0.3.4/tower_http/limit/index.html /// [`Bytes`]: bytes::Bytes - /// [`Json`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Json.html - /// [`Form`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Form.html + /// [`Json`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Json.html + /// [`Form`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Form.html pub fn disable() -> Self { Self } diff --git a/axum-core/src/extract/mod.rs b/axum-core/src/extract/mod.rs index c25166290e..96b62d2849 100644 --- a/axum-core/src/extract/mod.rs +++ b/axum-core/src/extract/mod.rs @@ -36,7 +36,7 @@ mod private { /// /// See [`axum::extract`] for more general docs about extraxtors. /// -/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.1/axum/extract/index.html +/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.2/axum/extract/index.html #[async_trait] pub trait FromRequestParts: Sized { /// If the extractor fails it'll use this "rejection" type. A rejection is @@ -99,7 +99,7 @@ pub trait FromRequestParts: Sized { /// This ensures your extractor is as flexible as possible. /// /// [`http::Request`]: http::Request -/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.1/axum/extract/index.html +/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.2/axum/extract/index.html #[async_trait] pub trait FromRequest: Sized { /// If the extractor fails it'll use this "rejection" type. A rejection is diff --git a/axum-extra/CHANGELOG.md b/axum-extra/CHANGELOG.md index 42205113c7..fb4747d9c2 100644 --- a/axum-extra/CHANGELOG.md +++ b/axum-extra/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning]. - None. +# 0.4.0-rc.2 (10. September, 2022) + +- Depend on 0.6.0-rc.2. + # 0.4.0-rc.1 (23. August, 2022) - **added:** Add `RouterExt::route_with_tsr` for adding routes with an diff --git a/axum-extra/Cargo.toml b/axum-extra/Cargo.toml index 57aac260c7..33f5080101 100644 --- a/axum-extra/Cargo.toml +++ b/axum-extra/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" name = "axum-extra" readme = "README.md" repository = "https://github.com/tokio-rs/axum" -version = "0.4.0-rc.1" +version = "0.4.0-rc.2" [features] default = [] @@ -34,7 +34,7 @@ spa = ["tower-http/fs"] typed-routing = ["dep:axum-macros", "dep:serde", "dep:percent-encoding"] [dependencies] -axum = { path = "../axum", version = "0.6.0-rc.1", default-features = false } +axum = { path = "../axum", version = "0.6.0-rc.2", default-features = false } bytes = "1.1.0" futures-util = { version = "0.3", default-features = false, features = ["alloc"] } http = "0.2" @@ -47,7 +47,7 @@ tower-layer = "0.3" tower-service = "0.3" # optional dependencies -axum-macros = { path = "../axum-macros", version = "0.3.0-rc.1", optional = true } +axum-macros = { path = "../axum-macros", version = "0.3.0-rc.2", optional = true } cookie = { package = "cookie", version = "0.16", features = ["percent-encode"], optional = true } percent-encoding = { version = "2.1", optional = true } prost = { version = "0.11", optional = true } @@ -58,7 +58,7 @@ tokio-stream = { version = "0.1.9", optional = true } tokio-util = { version = "0.7", optional = true } [dev-dependencies] -axum = { path = "../axum", version = "0.6.0-rc.1", features = ["headers"] } +axum = { path = "../axum", version = "0.6.0-rc.2", features = ["headers"] } futures = "0.3" hyper = "0.14" reqwest = { version = "0.11", default-features = false, features = ["json", "stream", "multipart"] } diff --git a/axum-macros/CHANGELOG.md b/axum-macros/CHANGELOG.md index 47fa8b1e0d..7e3ab31e99 100644 --- a/axum-macros/CHANGELOG.md +++ b/axum-macros/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - None +# 0.3.0-rc.2 (10. September, 2022) + +- Depend on 0.6.0-rc.2. + # 0.3.0-rc.1 (23. August, 2022) - **change:** axum-macro's MSRV is now 1.60 ([#1239]) diff --git a/axum-macros/Cargo.toml b/axum-macros/Cargo.toml index 85d3ccd0a1..803a82f227 100644 --- a/axum-macros/Cargo.toml +++ b/axum-macros/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" name = "axum-macros" readme = "README.md" repository = "https://github.com/tokio-rs/axum" -version = "0.3.0-rc.1" # remember to also bump the version that axum and axum-extra depends on +version = "0.3.0-rc.2" # remember to also bump the version that axum and axum-extra depends on [lib] proc-macro = true @@ -25,8 +25,8 @@ syn = { version = "1.0", features = [ ] } [dev-dependencies] -axum = { path = "../axum", version = "0.6.0-rc.1", features = ["headers"] } -axum-extra = { path = "../axum-extra", version = "0.4.0-rc.1", features = ["typed-routing"] } +axum = { path = "../axum", version = "0.6.0-rc.2", features = ["headers"] } +axum-extra = { path = "../axum-extra", version = "0.4.0-rc.2", features = ["typed-routing"] } rustversion = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/axum/CHANGELOG.md b/axum/CHANGELOG.md index e3239f02c1..a47fd1dd7e 100644 --- a/axum/CHANGELOG.md +++ b/axum/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 # Unreleased +- None. + +# 0.6.0-rc.2 (10. September, 2022) + ## Security - **breaking:** Added default limit to how much data `Bytes::from_request` will diff --git a/axum/Cargo.toml b/axum/Cargo.toml index de4b2f3ec1..4191d5aa40 100644 --- a/axum/Cargo.toml +++ b/axum/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "axum" -version = "0.6.0-rc.1" +version = "0.6.0-rc.2" categories = ["asynchronous", "network-programming", "web-programming::http-server"] description = "Web framework that focuses on ergonomics and modularity" edition = "2021" @@ -30,7 +30,7 @@ __private_docs = ["tower/full", "tower-http/full"] [dependencies] async-trait = "0.1.43" -axum-core = { path = "../axum-core", version = "0.3.0-rc.1" } +axum-core = { path = "../axum-core", version = "0.3.0-rc.2" } bitflags = "1.0" bytes = "1.0" futures-util = { version = "0.3", default-features = false, features = ["alloc"] } @@ -52,7 +52,7 @@ tower-layer = "0.3" tower-service = "0.3" # optional dependencies -axum-macros = { path = "../axum-macros", version = "0.3.0-rc.1", optional = true } +axum-macros = { path = "../axum-macros", version = "0.3.0-rc.2", optional = true } base64 = { version = "0.13", optional = true } headers = { version = "0.3.7", optional = true } multer = { version = "2.0.0", optional = true } From a5e2e27c3a8f3030423b3147a3fd16334242af84 Mon Sep 17 00:00:00 2001 From: David Pedersen Date: Sat, 10 Sep 2022 09:42:41 +0200 Subject: [PATCH 2/6] don't bump version of axum-macros --- axum-macros/CHANGELOG.md | 4 ---- axum-macros/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/axum-macros/CHANGELOG.md b/axum-macros/CHANGELOG.md index 7e3ab31e99..47fa8b1e0d 100644 --- a/axum-macros/CHANGELOG.md +++ b/axum-macros/CHANGELOG.md @@ -9,10 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - None -# 0.3.0-rc.2 (10. September, 2022) - -- Depend on 0.6.0-rc.2. - # 0.3.0-rc.1 (23. August, 2022) - **change:** axum-macro's MSRV is now 1.60 ([#1239]) diff --git a/axum-macros/Cargo.toml b/axum-macros/Cargo.toml index 803a82f227..c5e1bdf0bd 100644 --- a/axum-macros/Cargo.toml +++ b/axum-macros/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" name = "axum-macros" readme = "README.md" repository = "https://github.com/tokio-rs/axum" -version = "0.3.0-rc.2" # remember to also bump the version that axum and axum-extra depends on +version = "0.3.0-rc.1" # remember to also bump the version that axum and axum-extra depends on [lib] proc-macro = true From 2a8b195a8cb18f991a2fc1520e7c588ffe7e43a4 Mon Sep 17 00:00:00 2001 From: David Pedersen Date: Sat, 10 Sep 2022 09:44:27 +0200 Subject: [PATCH 3/6] fix --- axum-extra/Cargo.toml | 2 +- axum/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/axum-extra/Cargo.toml b/axum-extra/Cargo.toml index 33f5080101..ef32d44ddd 100644 --- a/axum-extra/Cargo.toml +++ b/axum-extra/Cargo.toml @@ -47,7 +47,7 @@ tower-layer = "0.3" tower-service = "0.3" # optional dependencies -axum-macros = { path = "../axum-macros", version = "0.3.0-rc.2", optional = true } +axum-macros = { path = "../axum-macros", version = "0.3.0-rc.1", optional = true } cookie = { package = "cookie", version = "0.16", features = ["percent-encode"], optional = true } percent-encoding = { version = "2.1", optional = true } prost = { version = "0.11", optional = true } diff --git a/axum/Cargo.toml b/axum/Cargo.toml index 4191d5aa40..9803b4f1a8 100644 --- a/axum/Cargo.toml +++ b/axum/Cargo.toml @@ -52,7 +52,7 @@ tower-layer = "0.3" tower-service = "0.3" # optional dependencies -axum-macros = { path = "../axum-macros", version = "0.3.0-rc.2", optional = true } +axum-macros = { path = "../axum-macros", version = "0.3.0-rc.1", optional = true } base64 = { version = "0.13", optional = true } headers = { version = "0.3.7", optional = true } multer = { version = "2.0.0", optional = true } From b51bbf07f14733acf3115f1b104827cd4cd5197c Mon Sep 17 00:00:00 2001 From: David Pedersen Date: Sat, 10 Sep 2022 09:51:57 +0200 Subject: [PATCH 4/6] Update axum/Cargo.toml Co-authored-by: Jonas Platte --- axum/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/axum/Cargo.toml b/axum/Cargo.toml index 9803b4f1a8..33c5ab5367 100644 --- a/axum/Cargo.toml +++ b/axum/Cargo.toml @@ -30,7 +30,7 @@ __private_docs = ["tower/full", "tower-http/full"] [dependencies] async-trait = "0.1.43" -axum-core = { path = "../axum-core", version = "0.3.0-rc.2" } +axum-core = { path = "../axum-core", version = "=0.3.0-rc.2" } bitflags = "1.0" bytes = "1.0" futures-util = { version = "0.3", default-features = false, features = ["alloc"] } From 185aca8407c88718af1005fead89ef1214944f5f Mon Sep 17 00:00:00 2001 From: David Pedersen Date: Sat, 10 Sep 2022 10:26:24 +0200 Subject: [PATCH 5/6] undo release of axum-extra --- axum-extra/CHANGELOG.md | 4 ---- axum-extra/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/axum-extra/CHANGELOG.md b/axum-extra/CHANGELOG.md index fb4747d9c2..42205113c7 100644 --- a/axum-extra/CHANGELOG.md +++ b/axum-extra/CHANGELOG.md @@ -9,10 +9,6 @@ and this project adheres to [Semantic Versioning]. - None. -# 0.4.0-rc.2 (10. September, 2022) - -- Depend on 0.6.0-rc.2. - # 0.4.0-rc.1 (23. August, 2022) - **added:** Add `RouterExt::route_with_tsr` for adding routes with an diff --git a/axum-extra/Cargo.toml b/axum-extra/Cargo.toml index ef32d44ddd..48b607d3c3 100644 --- a/axum-extra/Cargo.toml +++ b/axum-extra/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" name = "axum-extra" readme = "README.md" repository = "https://github.com/tokio-rs/axum" -version = "0.4.0-rc.2" +version = "0.4.0-rc.1" [features] default = [] From 5a67828222d93260db34d49f422b90aacb8a80b3 Mon Sep 17 00:00:00 2001 From: David Pedersen Date: Sat, 10 Sep 2022 10:39:07 +0200 Subject: [PATCH 6/6] fix --- axum-macros/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/axum-macros/Cargo.toml b/axum-macros/Cargo.toml index c5e1bdf0bd..a490702e9e 100644 --- a/axum-macros/Cargo.toml +++ b/axum-macros/Cargo.toml @@ -26,7 +26,7 @@ syn = { version = "1.0", features = [ [dev-dependencies] axum = { path = "../axum", version = "0.6.0-rc.2", features = ["headers"] } -axum-extra = { path = "../axum-extra", version = "0.4.0-rc.2", features = ["typed-routing"] } +axum-extra = { path = "../axum-extra", version = "0.4.0-rc.1", features = ["typed-routing"] } rustversion = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0"