Merge branch 'master' into master

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
           - { name: Windows, os: windows-2022, triple: x86_64-pc-windows-msvc }
         version:
-          - 1.57.0 # MSRV
+          - 1.59.0 # MSRV
           - stable
 
     name: ${{ matrix.target.name }} / ${{ matrix.version }}

actix-files/CHANGES.md

@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2022-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
 
 
 ## 0.6.2 - 2022-07-23

actix-files/README.md

@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-files?label=latest)](https://crates.io/crates/actix-files)
 [![Documentation](https://docs.rs/actix-files/badge.svg?version=0.6.2)](https://docs.rs/actix-files/0.6.2)
-![Version](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-files.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-files/0.6.2/status.svg)](https://deps.rs/crate/actix-files/0.6.2)

actix-http-test/CHANGES.md

@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2022-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.59.
 
 
 ## 3.0.0 - 2022-07-24

actix-http-test/README.md

@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-http-test?label=latest)](https://crates.io/crates/actix-http-test)
 [![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.0.0)](https://docs.rs/actix-http-test/3.0.0)
-![Version](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http-test)
 <br>
 [![Dependency Status](https://deps.rs/crate/actix-http-test/3.0.0/status.svg)](https://deps.rs/crate/actix-http-test/3.0.0)

actix-http/CHANGES.md

@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2022-xx-xx
+### Changed
+- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
+
 ### Fixed
 - Avoid possibility of dispatcher getting stuck while back-pressuring I/O. [#2369]
 

actix-http/README.md

@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
 [![Documentation](https://docs.rs/actix-http/badge.svg?version=3.2.1)](https://docs.rs/actix-http/3.2.1)
-![Version](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-http/3.2.1/status.svg)](https://deps.rs/crate/actix-http/3.2.1)

actix-multipart/CHANGES.md

@@ -1,7 +1,7 @@
 # Changes
 
 ## Unreleased - 2022-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
 
 
 ## 0.4.0 - 2022-02-25

actix-multipart/README.md

@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-multipart?label=latest)](https://crates.io/crates/actix-multipart)
 [![Documentation](https://docs.rs/actix-multipart/badge.svg?version=0.4.0)](https://docs.rs/actix-multipart/0.4.0)
-![Version](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-multipart.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-multipart/0.4.0/status.svg)](https://deps.rs/crate/actix-multipart/0.4.0)

actix-router/CHANGES.md

@@ -1,7 +1,7 @@
 # Changes
 
 ## Unreleased - 2022-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
 
 
 ## 0.5.0 - 2022-02-22

actix-test/CHANGES.md

@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2022-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
 
 
 ## 0.1.0 - 2022-07-24

actix-web-actors/README.md

@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-web-actors?label=latest)](https://crates.io/crates/actix-web-actors)
 [![Documentation](https://docs.rs/actix-web-actors/badge.svg?version=4.1.0)](https://docs.rs/actix-web-actors/4.1.0)
-![Version](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-web-actors.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-web-actors/4.1.0/status.svg)](https://deps.rs/crate/actix-web-actors/4.1.0)

actix-web-codegen/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased - 2022-xx-xx
 - Add `#[routes]` macro to support multiple paths for one handler. [#2718]
-- Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
 
 [#2718]: https://github.com/actix/actix-web/pull/2718
 

actix-web-codegen/README.md

@@ -4,7 +4,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-web-codegen?label=latest)](https://crates.io/crates/actix-web-codegen)
 [![Documentation](https://docs.rs/actix-web-codegen/badge.svg?version=4.0.1)](https://docs.rs/actix-web-codegen/4.0.1)
-![Version](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-web-codegen.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-web-codegen/4.0.1/status.svg)](https://deps.rs/crate/actix-web-codegen/4.0.1)

actix-web-codegen/tests/trybuild.rs

@@ -1,4 +1,4 @@
-#[rustversion::stable(1.57)] // MSRV
+#[rustversion::stable(1.59)] // MSRV
 #[test]
 fn compile_macros() {
     let t = trybuild::TestCases::new();

actix-web-codegen/tests/trybuild/route-duplicate-method-fail.stderr

@@ -4,10 +4,16 @@ error: HTTP method defined more than once: `GET`
 3 | #[route("/", method="GET", method="GET")]
   |                                   ^^^^^
 
-error[E0277]: the trait bound `fn() -> impl std::future::Future {index}: HttpServiceFactory` is not satisfied
+error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String> {index}: HttpServiceFactory` is not satisfied
-  --> tests/trybuild/route-duplicate-method-fail.rs:12:55
+   --> tests/trybuild/route-duplicate-method-fail.rs:12:55
-   |
+    |
-12 |     let srv = actix_test::start(|| App::new().service(index));
+12  |     let srv = actix_test::start(|| App::new().service(index));
-   |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future {index}`
+    |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future<Output = String> {index}`
-   |                                               |
+    |                                               |
-   |                                               required by a bound introduced by this call
+    |                                               required by a bound introduced by this call
+    |
+note: required by a bound in `App::<T>::service`
+   --> $WORKSPACE/actix-web/src/app.rs
+    |
+    |         F: HttpServiceFactory + 'static,
+    |            ^^^^^^^^^^^^^^^^^^ required by this bound in `App::<T>::service`

actix-web-codegen/tests/trybuild/route-missing-method-fail.stderr

@@ -6,10 +6,16 @@ error: The #[route(..)] macro requires at least one `method` attribute
   |
   = note: this error originates in the attribute macro `route` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: the trait bound `fn() -> impl std::future::Future {index}: HttpServiceFactory` is not satisfied
+error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String> {index}: HttpServiceFactory` is not satisfied
-  --> tests/trybuild/route-missing-method-fail.rs:12:55
+   --> tests/trybuild/route-missing-method-fail.rs:12:55
-   |
+    |
-12 |     let srv = actix_test::start(|| App::new().service(index));
+12  |     let srv = actix_test::start(|| App::new().service(index));
-   |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future {index}`
+    |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future<Output = String> {index}`
-   |                                               |
+    |                                               |
-   |                                               required by a bound introduced by this call
+    |                                               required by a bound introduced by this call
+    |
+note: required by a bound in `App::<T>::service`
+   --> $WORKSPACE/actix-web/src/app.rs
+    |
+    |         F: HttpServiceFactory + 'static,
+    |            ^^^^^^^^^^^^^^^^^^ required by this bound in `App::<T>::service`

actix-web-codegen/tests/trybuild/route-unexpected-method-fail.stderr

@@ -4,10 +4,16 @@ error: Unexpected HTTP method: `UNEXPECTED`
 3 | #[route("/", method="UNEXPECTED")]
   |                     ^^^^^^^^^^^^
 
-error[E0277]: the trait bound `fn() -> impl std::future::Future {index}: HttpServiceFactory` is not satisfied
+error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String> {index}: HttpServiceFactory` is not satisfied
-  --> tests/trybuild/route-unexpected-method-fail.rs:12:55
+   --> tests/trybuild/route-unexpected-method-fail.rs:12:55
-   |
+    |
-12 |     let srv = actix_test::start(|| App::new().service(index));
+12  |     let srv = actix_test::start(|| App::new().service(index));
-   |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future {index}`
+    |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future<Output = String> {index}`
-   |                                               |
+    |                                               |
-   |                                               required by a bound introduced by this call
+    |                                               required by a bound introduced by this call
+    |
+note: required by a bound in `App::<T>::service`
+   --> $WORKSPACE/actix-web/src/app.rs
+    |
+    |         F: HttpServiceFactory + 'static,
+    |            ^^^^^^^^^^^^^^^^^^ required by this bound in `App::<T>::service`

actix-web-codegen/tests/trybuild/routes-missing-args-fail.stderr

@@ -12,10 +12,16 @@ error: Invalid input for macro
 4 | #[get]
   | ^^^^^^
 
-error[E0277]: the trait bound `fn() -> impl std::future::Future {index}: HttpServiceFactory` is not satisfied
+error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String> {index}: HttpServiceFactory` is not satisfied
-  --> tests/trybuild/routes-missing-args-fail.rs:13:55
+   --> tests/trybuild/routes-missing-args-fail.rs:13:55
-   |
+    |
-13 |     let srv = actix_test::start(|| App::new().service(index));
+13  |     let srv = actix_test::start(|| App::new().service(index));
-   |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future {index}`
+    |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future<Output = String> {index}`
-   |                                               |
+    |                                               |
-   |                                               required by a bound introduced by this call
+    |                                               required by a bound introduced by this call
+    |
+note: required by a bound in `App::<T>::service`
+   --> $WORKSPACE/actix-web/src/app.rs
+    |
+    |         F: HttpServiceFactory + 'static,
+    |            ^^^^^^^^^^^^^^^^^^ required by this bound in `App::<T>::service`

actix-web-codegen/tests/trybuild/routes-missing-method-fail.stderr

@@ -6,10 +6,16 @@ error: The #[routes] macro requires at least one `#[<method>(..)]` attribute.
   |
   = note: this error originates in the attribute macro `routes` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0277]: the trait bound `fn() -> impl std::future::Future {index}: HttpServiceFactory` is not satisfied
+error[E0277]: the trait bound `fn() -> impl std::future::Future<Output = String> {index}: HttpServiceFactory` is not satisfied
-  --> tests/trybuild/routes-missing-method-fail.rs:12:55
+   --> tests/trybuild/routes-missing-method-fail.rs:12:55
-   |
+    |
-12 |     let srv = actix_test::start(|| App::new().service(index));
+12  |     let srv = actix_test::start(|| App::new().service(index));
-   |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future {index}`
+    |                                               ------- ^^^^^ the trait `HttpServiceFactory` is not implemented for `fn() -> impl std::future::Future<Output = String> {index}`
-   |                                               |
+    |                                               |
-   |                                               required by a bound introduced by this call
+    |                                               required by a bound introduced by this call
+    |
+note: required by a bound in `App::<T>::service`
+   --> $WORKSPACE/actix-web/src/app.rs
+    |
+    |         F: HttpServiceFactory + 'static,
+    |            ^^^^^^^^^^^^^^^^^^ required by this bound in `App::<T>::service`

actix-web/CHANGES.md

@@ -7,7 +7,7 @@
 - Add configuration options for TLS handshake timeout via `HttpServer::{rustls, openssl}_with_config` methods. [#2752]
 
 ### Changed
-- Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
 
 [#2718]: https://github.com/actix/actix-web/pull/2718
 [#2752]: https://github.com/actix/actix-web/pull/2752

actix-web/README.md

@@ -7,7 +7,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
 [![Documentation](https://docs.rs/actix-web/badge.svg?version=4.1.0)](https://docs.rs/actix-web/4.1.0)
-![MSRV](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
+![MSRV](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
 [![Dependency Status](https://deps.rs/crate/actix-web/4.1.0/status.svg)](https://deps.rs/crate/actix-web/4.1.0)
 <br />
@@ -33,7 +33,7 @@
 - SSL support using OpenSSL or Rustls
 - Middlewares ([Logger, Session, CORS, etc](https://actix.rs/docs/middleware/))
 - Integrates with the [`awc` HTTP client](https://docs.rs/awc/)
-- Runs on stable Rust 1.57+
+- Runs on stable Rust 1.59+
 
 ## Documentation
 

actix-web/src/scope.rs

@@ -40,7 +40,7 @@ type Guards = Vec<Box<dyn Guard>>;
 /// use actix_web::{web, App, HttpResponse};
 ///
 /// let app = App::new().service(
-///     web::scope("/{project_id}/")
+///     web::scope("/{project_id}")
 ///         .service(web::resource("/path1").to(|| async { "OK" }))
 ///         .service(web::resource("/path2").route(web::get().to(|| HttpResponse::Ok())))
 ///         .service(web::resource("/path3").route(web::head().to(HttpResponse::MethodNotAllowed)))

awc/CHANGES.md

@@ -2,8 +2,18 @@
 
 ## Unreleased - 2022-xx-xx
 ### Changed
+- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
+
+
+## 3.0.1 - 2022-08-25
+### Changed
 - Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency.
 
+### Fixed
+- Fixed handling of redirection requests that begin with `//`. [#2840]
+
+[#2840]: https://github.com/actix/actix-web/pull/2840
+
 
 ## 3.0.0 - 2022-03-07
 ### Dependencies

awc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "3.0.0"
+version = "3.0.1"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "fakeshadow <24548779@qq.com>",

awc/README.md

@@ -3,9 +3,9 @@
 > Async HTTP and WebSocket client library.
 
 [![crates.io](https://img.shields.io/crates/v/awc?label=latest)](https://crates.io/crates/awc)
-[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.0)](https://docs.rs/awc/3.0.0)
+[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.1)](https://docs.rs/awc/3.0.1)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/awc)
-[![Dependency Status](https://deps.rs/crate/awc/3.0.0/status.svg)](https://deps.rs/crate/awc/3.0.0)
+[![Dependency Status](https://deps.rs/crate/awc/3.0.1/status.svg)](https://deps.rs/crate/awc/3.0.1)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 ## Documentation & Resources

awc/src/middleware/redirect.rs

@@ -257,6 +257,16 @@ fn build_next_uri(res: &ClientResponse, prev_uri: &Uri) -> Result<Uri, SendReque
             .scheme(prev_uri.scheme().cloned().unwrap())
             .authority(prev_uri.authority().cloned().unwrap());
 
+        // scheme-relative address
+        if location.as_bytes().starts_with(b"//") {
+            let scheme = prev_uri.scheme_str().unwrap();
+            let mut full_url: Vec<u8> = scheme.as_bytes().to_vec();
+            full_url.push(b':');
+            full_url.extend(location.as_bytes());
+
+            return Uri::try_from(full_url)
+                .map_err(|_| SendRequestError::Url(InvalidUrl::MissingScheme));
+        }
         // when scheme or authority is missing treat the location value as path and query
         // recover error where location does not have leading slash
         let path = if location.as_bytes().starts_with(b"/") {
@@ -588,6 +598,41 @@ mod tests {
         assert_eq!(res.status().as_u16(), 200);
     }
 
+    #[actix_rt::test]
+    async fn test_double_slash_redirect() {
+        let client = ClientBuilder::new()
+            .disable_redirects()
+            .wrap(Redirect::new().max_redirect_times(10))
+            .finish();
+
+        let srv = actix_test::start(|| {
+            App::new()
+                .service(web::resource("/test").route(web::to(|| async {
+                    Ok::<_, Error>(HttpResponse::BadRequest())
+                })))
+                .service(
+                    web::resource("/").route(web::to(|req: HttpRequest| async move {
+                        Ok::<_, Error>(
+                            HttpResponse::Found()
+                                .append_header((
+                                    "location",
+                                    format!(
+                                        "//localhost:{}/test",
+                                        req.app_config().local_addr().port()
+                                    )
+                                    .as_str(),
+                                ))
+                                .finish(),
+                        )
+                    })),
+                )
+        });
+
+        let res = client.get(srv.url("/")).send().await.unwrap();
+
+        assert_eq!(res.status().as_u16(), 400);
+    }
+
     #[actix_rt::test]
     async fn test_remove_sensitive_headers() {
         fn gen_headers() -> header::HeaderMap {

clippy.toml

@@ -1 +1 @@
-msrv = "1.57"
+msrv = "1.59"