diff --git a/.cargo/config.toml b/.cargo/config.toml
index 350a924de24..6d5a8b810d6 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -8,7 +8,3 @@ ci-check-default = "hack --workspace check"
ci-check-default-tests = "check --workspace --tests"
ci-check-all-feature-powerset="hack --workspace --feature-powerset --skip=__compress,experimental-io-uring check"
ci-check-all-feature-powerset-linux="hack --workspace --feature-powerset --skip=__compress check"
-
-# testing
-ci-doctest-default = "test --workspace --doc --no-fail-fast -- --nocapture"
-ci-doctest = "test --workspace --all-features --doc --no-fail-fast -- --nocapture"
diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
index 55202ba6cbe..8d509d691d9 100644
--- a/.github/workflows/ci-post-merge.yml
+++ b/.github/workflows/ci-post-merge.yml
@@ -30,6 +30,10 @@ jobs:
steps:
- uses: actions/checkout@v4
+ - name: Install nasm
+ if: matrix.target.os == 'windows-latest'
+ uses: ilammy/setup-nasm@v1.5.1
+
- name: Install OpenSSL
if: matrix.target.os == 'windows-latest'
shell: bash
@@ -44,10 +48,10 @@ jobs:
with:
toolchain: ${{ matrix.version.version }}
- - name: Install cargo-hack and cargo-ci-cache-clean
- uses: taiki-e/install-action@v2.32.17
+ - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
+ uses: taiki-e/install-action@v2.33.22
with:
- tool: cargo-hack,cargo-ci-cache-clean
+ tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
- name: check minimal
run: cargo ci-check-min
@@ -57,19 +61,7 @@ jobs:
- name: tests
timeout-minutes: 60
- shell: bash
- run: |
- set -e
- cargo test --lib --tests -p=actix-router --all-features
- cargo test --lib --tests -p=actix-http --all-features
- cargo test --lib --tests -p=actix-web --features=rustls-0_20,rustls-0_21,rustls-0_22,openssl -- --skip=test_reading_deflate_encoding_large_random_rustls
- cargo test --lib --tests -p=actix-web-codegen --all-features
- cargo test --lib --tests -p=awc --all-features
- cargo test --lib --tests -p=actix-http-test --all-features
- cargo test --lib --tests -p=actix-test --all-features
- cargo test --lib --tests -p=actix-files
- cargo test --lib --tests -p=actix-multipart --all-features
- cargo test --lib --tests -p=actix-web-actors --all-features
+ run: just test
- name: CI cache clean
run: cargo-ci-cache-clean
@@ -88,7 +80,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
- name: Install cargo-hack
- uses: taiki-e/install-action@v2.32.17
+ uses: taiki-e/install-action@v2.33.22
with:
tool: cargo-hack
@@ -97,21 +89,3 @@ jobs:
- name: check feature combinations
run: cargo ci-check-all-feature-powerset-linux
-
- nextest:
- name: nextest
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v4
-
- - name: Install Rust
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
-
- - name: Install nextest
- uses: taiki-e/install-action@v2.32.17
- with:
- tool: nextest
-
- - name: Test with cargo-nextest
- run: cargo nextest run
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2488f7496d2..56333e187f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,13 @@ concurrency:
cancel-in-progress: true
jobs:
+ read_msrv:
+ name: Read MSRV
+ uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@main
+
build_and_test:
+ needs: read_msrv
+
strategy:
fail-fast: false
matrix:
@@ -26,7 +32,7 @@ jobs:
- { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
- { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
version:
- - { name: msrv, version: 1.72.0 }
+ - { name: msrv, version: "${{ needs.read_msrv.outputs.msrv }}" }
- { name: stable, version: stable }
name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
@@ -35,6 +41,10 @@ jobs:
steps:
- uses: actions/checkout@v4
+ - name: Install nasm
+ if: matrix.target.os == 'windows-latest'
+ uses: ilammy/setup-nasm@v1.5.1
+
- name: Install OpenSSL
if: matrix.target.os == 'windows-latest'
shell: bash
@@ -49,15 +59,14 @@ jobs:
with:
toolchain: ${{ matrix.version.version }}
- - name: Install cargo-hack and cargo-ci-cache-clean
- uses: taiki-e/install-action@v2.32.17
+ - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
+ uses: taiki-e/install-action@v2.33.22
with:
- tool: cargo-hack,cargo-ci-cache-clean
+ tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
- name: workaround MSRV issues
if: matrix.version.name == 'msrv'
- run: |
- cargo update -p=clap --precise=4.4.18
+ run: just downgrade-for-msrv
- name: check minimal
run: cargo ci-check-min
@@ -67,20 +76,7 @@ jobs:
- name: tests
timeout-minutes: 60
- shell: bash
- run: |
- set -e
- cargo test --lib --tests -p=actix-router --no-default-features
- cargo test --lib --tests -p=actix-router --all-features
- cargo test --lib --tests -p=actix-http --all-features
- cargo test --lib --tests -p=actix-web --features=rustls-0_20,rustls-0_21,rustls-0_22,openssl -- --skip=test_reading_deflate_encoding_large_random_rustls
- cargo test --lib --tests -p=actix-web-codegen --all-features
- cargo test --lib --tests -p=awc --all-features
- cargo test --lib --tests -p=actix-http-test --all-features
- cargo test --lib --tests -p=actix-test --all-features
- cargo test --lib --tests -p=actix-files
- cargo test --lib --tests -p=actix-multipart --all-features
- cargo test --lib --tests -p=actix-web-actors --all-features
+ run: just test
- name: CI cache clean
run: cargo-ci-cache-clean
@@ -112,6 +108,10 @@ jobs:
with:
toolchain: nightly
+ - name: Install just
+ uses: taiki-e/install-action@v2.33.22
+ with:
+ tool: just
+
- name: doc tests
- run: cargo ci-doctest
- timeout-minutes: 60
+ run: just test-docs
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index ac5143d584e..943f6322333 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -23,7 +23,7 @@ jobs:
components: llvm-tools-preview
- name: Install cargo-llvm-cov
- uses: taiki-e/install-action@v2.32.17
+ uses: taiki-e/install-action@v2.33.22
with:
tool: cargo-llvm-cov
@@ -31,7 +31,7 @@ jobs:
run: cargo llvm-cov --workspace --all-features --codecov --output-path codecov.json
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@v4.3.0
+ uses: codecov/codecov-action@v4.3.1
with:
files: codecov.json
fail_ci_if_error: true
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b0ac537a29f..03b25ecda50 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -79,10 +79,10 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
with:
- toolchain: nightly-2023-08-25
+ toolchain: nightly-2024-04-26
- name: Install cargo-public-api
- uses: taiki-e/install-action@v2.32.17
+ uses: taiki-e/install-action@v2.33.22
with:
tool: cargo-public-api
diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml
index 963b7f6b33b..6352e44d27f 100644
--- a/.github/workflows/upload-doc.yml
+++ b/.github/workflows/upload-doc.yml
@@ -35,7 +35,7 @@ jobs:
run: echo '' > target/doc/index.html
- name: Deploy to GitHub Pages
- uses: JamesIves/github-pages-deploy-action@v4.5.0
+ uses: JamesIves/github-pages-deploy-action@v4.6.0
with:
folder: target/doc
single-commit: true
diff --git a/Cargo.toml b/Cargo.toml
index 9efeda4d191..19d5dd11670 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,8 @@ members = [
]
[workspace.package]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-web"
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.72"
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index fddd1c2c33d..f7b20dd6ab8 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -2,8 +2,14 @@
## Unreleased
+### Added
+
+- Add `rustls-0_23` crate feature
+- Add `{h1::H1Service, h2::H2Service, HttpService}::rustls_0_23()` and `HttpService::rustls_0_23_with_config()` service constructors.
+
### Changed
+- Update `brotli` dependency to `6`.
- Minimum supported Rust version (MSRV) is now 1.72.
## 3.6.0
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 38969e901c1..efd20905aca 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -28,6 +28,7 @@ features = [
"rustls-0_20",
"rustls-0_21",
"rustls-0_22",
+ "rustls-0_23",
"compress-brotli",
"compress-gzip",
"compress-zstd",
@@ -66,6 +67,9 @@ rustls-0_21 = ["actix-tls/accept", "actix-tls/rustls-0_21"]
# TLS via Rustls v0.22
rustls-0_22 = ["actix-tls/accept", "actix-tls/rustls-0_22"]
+# TLS via Rustls v0.23
+rustls-0_23 = ["actix-tls/accept", "actix-tls/rustls-0_23"]
+
# Compression codecs
compress-brotli = ["__compress", "brotli"]
compress-gzip = ["__compress", "flate2"]
@@ -114,14 +118,14 @@ sha1 = { version = "0.10", optional = true }
actix-tls = { version = "3.3", default-features = false, optional = true }
# compress-*
-brotli = { version = "3.3.3", optional = true }
+brotli = { version = "6", optional = true }
flate2 = { version = "1.0.13", optional = true }
zstd = { version = "0.13", optional = true }
[dev-dependencies]
actix-http-test = { version = "3", features = ["openssl"] }
actix-server = "2"
-actix-tls = { version = "3.3", features = ["openssl", "rustls-0_22-webpki-roots"] }
+actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23-webpki-roots"] }
actix-web = "4"
async-stream = "0.3"
@@ -139,16 +143,16 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
static_assertions = "1"
tls-openssl = { package = "openssl", version = "0.10.55" }
-tls-rustls_022 = { package = "rustls", version = "0.22" }
+tls-rustls_023 = { package = "rustls", version = "0.23" }
tokio = { version = "1.24.2", features = ["net", "rt", "macros"] }
[[example]]
name = "ws"
-required-features = ["ws", "rustls-0_22"]
+required-features = ["ws", "rustls-0_23"]
[[example]]
name = "tls_rustls"
-required-features = ["http2", "rustls-0_22"]
+required-features = ["http2", "rustls-0_23"]
[[bench]]
name = "response-body-compression"
diff --git a/actix-http/examples/tls_rustls.rs b/actix-http/examples/tls_rustls.rs
index 47ff061cd75..ebb7b8b38da 100644
--- a/actix-http/examples/tls_rustls.rs
+++ b/actix-http/examples/tls_rustls.rs
@@ -12,12 +12,11 @@
//! Protocol: HTTP/1.1
//! ```
-extern crate tls_rustls_022 as rustls;
-
use std::io;
use actix_http::{Error, HttpService, Request, Response};
use actix_utils::future::ok;
+use tls_rustls_023 as rustls;
#[actix_rt::main]
async fn main() -> io::Result<()> {
@@ -36,7 +35,7 @@ async fn main() -> io::Result<()> {
);
ok::<_, Error>(Response::ok().set_body(body))
})
- .rustls_0_22(rustls_config())
+ .rustls_0_23(rustls_config())
})?
.run()
.await
diff --git a/actix-http/examples/ws.rs b/actix-http/examples/ws.rs
index 55085fd73c6..fac6b136b3f 100644
--- a/actix-http/examples/ws.rs
+++ b/actix-http/examples/ws.rs
@@ -1,7 +1,7 @@
//! Sets up a WebSocket server over TCP and TLS.
//! Sends a heartbeat message every 4 seconds but does not respond to any incoming frames.
-extern crate tls_rustls_022 as rustls;
+extern crate tls_rustls_023 as rustls;
use std::{
io,
@@ -30,7 +30,7 @@ async fn main() -> io::Result<()> {
.bind("tls", ("127.0.0.1", 8443), || {
HttpService::build()
.finish(handler)
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})?
.run()
.await
diff --git a/actix-http/src/h1/dispatcher.rs b/actix-http/src/h1/dispatcher.rs
index a24a6bb07d9..00b51360ee5 100644
--- a/actix-http/src/h1/dispatcher.rs
+++ b/actix-http/src/h1/dispatcher.rs
@@ -706,7 +706,7 @@ where
req.head_mut().peer_addr = *this.peer_addr;
- req.conn_data = this.conn_data.clone();
+ req.conn_data.clone_from(this.conn_data);
match this.codec.message_type() {
// request has no payload
diff --git a/actix-http/src/h1/service.rs b/actix-http/src/h1/service.rs
index 64eb39c8278..f2f8a0e48b6 100644
--- a/actix-http/src/h1/service.rs
+++ b/actix-http/src/h1/service.rs
@@ -335,6 +335,67 @@ mod rustls_0_22 {
}
}
+#[cfg(feature = "rustls-0_23")]
+mod rustls_0_23 {
+ use std::io;
+
+ use actix_service::ServiceFactoryExt as _;
+ use actix_tls::accept::{
+ rustls_0_23::{reexports::ServerConfig, Acceptor, TlsStream},
+ TlsError,
+ };
+
+ use super::*;
+
+ impl H1Service, S, B, X, U>
+ where
+ S: ServiceFactory,
+ S::Future: 'static,
+ S::Error: Into>,
+ S::InitError: fmt::Debug,
+ S::Response: Into>,
+
+ B: MessageBody,
+
+ X: ServiceFactory,
+ X::Future: 'static,
+ X::Error: Into>,
+ X::InitError: fmt::Debug,
+
+ U: ServiceFactory<
+ (Request, Framed, Codec>),
+ Config = (),
+ Response = (),
+ >,
+ U::Future: 'static,
+ U::Error: fmt::Display + Into>,
+ U::InitError: fmt::Debug,
+ {
+ /// Create Rustls v0.23 based service.
+ pub fn rustls_0_23(
+ self,
+ config: ServerConfig,
+ ) -> impl ServiceFactory<
+ TcpStream,
+ Config = (),
+ Response = (),
+ Error = TlsError,
+ InitError = (),
+ > {
+ Acceptor::new(config)
+ .map_init_err(|_| {
+ unreachable!("TLS acceptor service factory does not error on init")
+ })
+ .map_err(TlsError::into_service_error)
+ .map(|io: TlsStream| {
+ let peer_addr = io.get_ref().0.peer_addr().ok();
+ (io, peer_addr)
+ })
+ .and_then(self.map_err(TlsError::Service))
+ }
+ }
+}
+
impl H1Service
where
S: ServiceFactory,
diff --git a/actix-http/src/h2/dispatcher.rs b/actix-http/src/h2/dispatcher.rs
index 97ceb51e9cf..400476c8834 100644
--- a/actix-http/src/h2/dispatcher.rs
+++ b/actix-http/src/h2/dispatcher.rs
@@ -126,7 +126,7 @@ where
head.headers = parts.headers.into();
head.peer_addr = this.peer_addr;
- req.conn_data = this.conn_data.clone();
+ req.conn_data.clone_from(&this.conn_data);
let fut = this.flow.service.call(req);
let config = this.config.clone();
diff --git a/actix-http/src/h2/service.rs b/actix-http/src/h2/service.rs
index d50ffc4e30b..636ac316190 100644
--- a/actix-http/src/h2/service.rs
+++ b/actix-http/src/h2/service.rs
@@ -293,6 +293,57 @@ mod rustls_0_22 {
}
}
+#[cfg(feature = "rustls-0_23")]
+mod rustls_0_23 {
+ use std::io;
+
+ use actix_service::ServiceFactoryExt as _;
+ use actix_tls::accept::{
+ rustls_0_23::{reexports::ServerConfig, Acceptor, TlsStream},
+ TlsError,
+ };
+
+ use super::*;
+
+ impl H2Service, S, B>
+ where
+ S: ServiceFactory,
+ S::Future: 'static,
+ S::Error: Into> + 'static,
+ S::Response: Into> + 'static,
+ >::Future: 'static,
+
+ B: MessageBody + 'static,
+ {
+ /// Create Rustls v0.23 based service.
+ pub fn rustls_0_23(
+ self,
+ mut config: ServerConfig,
+ ) -> impl ServiceFactory<
+ TcpStream,
+ Config = (),
+ Response = (),
+ Error = TlsError,
+ InitError = S::InitError,
+ > {
+ let mut protos = vec![b"h2".to_vec()];
+ protos.extend_from_slice(&config.alpn_protocols);
+ config.alpn_protocols = protos;
+
+ Acceptor::new(config)
+ .map_init_err(|_| {
+ unreachable!("TLS acceptor service factory does not error on init")
+ })
+ .map_err(TlsError::into_service_error)
+ .map(|io: TlsStream| {
+ let peer_addr = io.get_ref().0.peer_addr().ok();
+ (io, peer_addr)
+ })
+ .and_then(self.map_err(TlsError::Service))
+ }
+ }
+}
+
impl ServiceFactory<(T, Option)> for H2Service
where
T: AsyncRead + AsyncWrite + Unpin + 'static,
diff --git a/actix-http/src/lib.rs b/actix-http/src/lib.rs
index cb82ced0018..f9697c4d5fb 100644
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@@ -6,7 +6,10 @@
//! | ------------------- | ------------------------------------------- |
//! | `http2` | HTTP/2 support via [h2]. |
//! | `openssl` | TLS support via [OpenSSL]. |
-//! | `rustls` | TLS support via [rustls]. |
+//! | `rustls` | TLS support via [rustls] 0.20. |
+//! | `rustls-0_21` | TLS support via [rustls] 0.21. |
+//! | `rustls-0_22` | TLS support via [rustls] 0.22. |
+//! | `rustls-0_23` | TLS support via [rustls] 0.23. |
//! | `compress-brotli` | Payload compression support: Brotli. |
//! | `compress-gzip` | Payload compression support: Deflate, Gzip. |
//! | `compress-zstd` | Payload compression support: Zstd. |
@@ -28,7 +31,7 @@
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
-pub use ::http::{uri, uri::Uri, Method, StatusCode, Version};
+pub use http::{uri, uri::Uri, Method, StatusCode, Version};
pub mod body;
mod builder;
@@ -63,6 +66,7 @@ pub use self::payload::PayloadStream;
feature = "rustls-0_20",
feature = "rustls-0_21",
feature = "rustls-0_22",
+ feature = "rustls-0_23",
))]
pub use self::service::TlsAcceptorConfig;
pub use self::{
diff --git a/actix-http/src/service.rs b/actix-http/src/service.rs
index e2438718271..a58be93c756 100644
--- a/actix-http/src/service.rs
+++ b/actix-http/src/service.rs
@@ -246,6 +246,7 @@ where
feature = "rustls-0_20",
feature = "rustls-0_21",
feature = "rustls-0_22",
+ feature = "rustls-0_23",
))]
#[derive(Debug, Default)]
pub struct TlsAcceptorConfig {
@@ -257,6 +258,7 @@ pub struct TlsAcceptorConfig {
feature = "rustls-0_20",
feature = "rustls-0_21",
feature = "rustls-0_22",
+ feature = "rustls-0_23",
))]
impl TlsAcceptorConfig {
/// Set TLS handshake timeout duration.
@@ -650,6 +652,102 @@ mod rustls_0_22 {
}
}
+#[cfg(feature = "rustls-0_23")]
+mod rustls_0_23 {
+ use std::io;
+
+ use actix_service::ServiceFactoryExt as _;
+ use actix_tls::accept::{
+ rustls_0_23::{reexports::ServerConfig, Acceptor, TlsStream},
+ TlsError,
+ };
+
+ use super::*;
+
+ impl HttpService, S, B, X, U>
+ where
+ S: ServiceFactory,
+ S::Future: 'static,
+ S::Error: Into> + 'static,
+ S::InitError: fmt::Debug,
+ S::Response: Into> + 'static,
+ >::Future: 'static,
+
+ B: MessageBody + 'static,
+
+ X: ServiceFactory,
+ X::Future: 'static,
+ X::Error: Into>,
+ X::InitError: fmt::Debug,
+
+ U: ServiceFactory<
+ (Request, Framed, h1::Codec>),
+ Config = (),
+ Response = (),
+ >,
+ U::Future: 'static,
+ U::Error: fmt::Display + Into>,
+ U::InitError: fmt::Debug,
+ {
+ /// Create Rustls v0.23 based service.
+ pub fn rustls_0_23(
+ self,
+ config: ServerConfig,
+ ) -> impl ServiceFactory<
+ TcpStream,
+ Config = (),
+ Response = (),
+ Error = TlsError,
+ InitError = (),
+ > {
+ self.rustls_0_23_with_config(config, TlsAcceptorConfig::default())
+ }
+
+ /// Create Rustls v0.23 based service with custom TLS acceptor configuration.
+ pub fn rustls_0_23_with_config(
+ self,
+ mut config: ServerConfig,
+ tls_acceptor_config: TlsAcceptorConfig,
+ ) -> impl ServiceFactory<
+ TcpStream,
+ Config = (),
+ Response = (),
+ Error = TlsError,
+ InitError = (),
+ > {
+ let mut protos = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
+ protos.extend_from_slice(&config.alpn_protocols);
+ config.alpn_protocols = protos;
+
+ let mut acceptor = Acceptor::new(config);
+
+ if let Some(handshake_timeout) = tls_acceptor_config.handshake_timeout {
+ acceptor.set_handshake_timeout(handshake_timeout);
+ }
+
+ acceptor
+ .map_init_err(|_| {
+ unreachable!("TLS acceptor service factory does not error on init")
+ })
+ .map_err(TlsError::into_service_error)
+ .and_then(|io: TlsStream| async {
+ let proto = if let Some(protos) = io.get_ref().1.alpn_protocol() {
+ if protos.windows(2).any(|window| window == b"h2") {
+ Protocol::Http2
+ } else {
+ Protocol::Http1
+ }
+ } else {
+ Protocol::Http1
+ };
+ let peer_addr = io.get_ref().0.peer_addr().ok();
+ Ok((io, proto, peer_addr))
+ })
+ .and_then(self.map_err(TlsError::Service))
+ }
+ }
+}
+
impl ServiceFactory<(T, Protocol, Option)>
for HttpService
where
diff --git a/actix-http/tests/test_rustls.rs b/actix-http/tests/test_rustls.rs
index 08b3a249b0b..fd2064d566c 100644
--- a/actix-http/tests/test_rustls.rs
+++ b/actix-http/tests/test_rustls.rs
@@ -1,6 +1,6 @@
-#![cfg(feature = "rustls-0_22")]
+#![cfg(feature = "rustls-0_23")]
-extern crate tls_rustls_022 as rustls;
+extern crate tls_rustls_023 as rustls;
use std::{
convert::Infallible,
@@ -20,7 +20,7 @@ use actix_http::{
use actix_http_test::test_server;
use actix_rt::pin;
use actix_service::{fn_factory_with_config, fn_service};
-use actix_tls::connect::rustls_0_22::webpki_roots_cert_store;
+use actix_tls::connect::rustls_0_23::webpki_roots_cert_store;
use actix_utils::future::{err, ok, poll_fn};
use bytes::{Bytes, BytesMut};
use derive_more::{Display, Error};
@@ -108,7 +108,7 @@ async fn h1() -> io::Result<()> {
let srv = test_server(move || {
HttpService::build()
.h1(|_| ok::<_, Error>(Response::ok()))
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -122,7 +122,7 @@ async fn h2() -> io::Result<()> {
let srv = test_server(move || {
HttpService::build()
.h2(|_| ok::<_, Error>(Response::ok()))
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -140,7 +140,7 @@ async fn h1_1() -> io::Result<()> {
assert_eq!(req.version(), Version::HTTP_11);
ok::<_, Error>(Response::ok())
})
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -158,7 +158,7 @@ async fn h2_1() -> io::Result<()> {
assert_eq!(req.version(), Version::HTTP_2);
ok::<_, Error>(Response::ok())
})
- .rustls_0_22_with_config(
+ .rustls_0_23_with_config(
tls_config(),
TlsAcceptorConfig::default().handshake_timeout(Duration::from_secs(5)),
)
@@ -179,7 +179,7 @@ async fn h2_body1() -> io::Result<()> {
let body = load_body(req.take_payload()).await?;
Ok::<_, Error>(Response::ok().set_body(body))
})
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -205,7 +205,7 @@ async fn h2_content_length() {
];
ok::<_, Infallible>(Response::new(statuses[indx]))
})
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -277,7 +277,7 @@ async fn h2_headers() {
}
ok::<_, Infallible>(config.body(data.clone()))
})
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -316,7 +316,7 @@ async fn h2_body2() {
let mut srv = test_server(move || {
HttpService::build()
.h2(|_| ok::<_, Infallible>(Response::ok().set_body(STR)))
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -333,7 +333,7 @@ async fn h2_head_empty() {
let mut srv = test_server(move || {
HttpService::build()
.finish(|_| ok::<_, Infallible>(Response::ok().set_body(STR)))
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -359,7 +359,7 @@ async fn h2_head_binary() {
let mut srv = test_server(move || {
HttpService::build()
.h2(|_| ok::<_, Infallible>(Response::ok().set_body(STR)))
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -384,7 +384,7 @@ async fn h2_head_binary2() {
let srv = test_server(move || {
HttpService::build()
.h2(|_| ok::<_, Infallible>(Response::ok().set_body(STR)))
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -410,7 +410,7 @@ async fn h2_body_length() {
Response::ok().set_body(SizedStream::new(STR.len() as u64, body)),
)
})
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -434,7 +434,7 @@ async fn h2_body_chunked_explicit() {
.body(BodyStream::new(body)),
)
})
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -463,7 +463,7 @@ async fn h2_response_http_error_handling() {
)
}))
}))
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -493,7 +493,7 @@ async fn h2_service_error() {
let mut srv = test_server(move || {
HttpService::build()
.h2(|_| err::, _>(BadRequest))
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -510,7 +510,7 @@ async fn h1_service_error() {
let mut srv = test_server(move || {
HttpService::build()
.h1(|_| err::, _>(BadRequest))
- .rustls_0_22(tls_config())
+ .rustls_0_23(tls_config())
})
.await;
@@ -533,7 +533,7 @@ async fn alpn_h1() -> io::Result<()> {
config.alpn_protocols.push(CUSTOM_ALPN_PROTOCOL.to_vec());
HttpService::build()
.h1(|_| ok::<_, Error>(Response::ok()))
- .rustls_0_22(config)
+ .rustls_0_23(config)
})
.await;
@@ -555,7 +555,7 @@ async fn alpn_h2() -> io::Result<()> {
config.alpn_protocols.push(CUSTOM_ALPN_PROTOCOL.to_vec());
HttpService::build()
.h2(|_| ok::<_, Error>(Response::ok()))
- .rustls_0_22(config)
+ .rustls_0_23(config)
})
.await;
@@ -581,7 +581,7 @@ async fn alpn_h2_1() -> io::Result<()> {
config.alpn_protocols.push(CUSTOM_ALPN_PROTOCOL.to_vec());
HttpService::build()
.finish(|_| ok::<_, Error>(Response::ok()))
- .rustls_0_22(config)
+ .rustls_0_23(config)
})
.await;
diff --git a/actix-multipart-derive/Cargo.toml b/actix-multipart-derive/Cargo.toml
index 2f049a3fb67..e978864a38c 100644
--- a/actix-multipart-derive/Cargo.toml
+++ b/actix-multipart-derive/Cargo.toml
@@ -4,10 +4,11 @@ version = "0.6.1"
authors = ["Jacob Halsey "]
description = "Multipart form derive macro for Actix Web"
keywords = ["http", "web", "framework", "async", "futures"]
-homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web"
-license = "MIT OR Apache-2.0"
-edition = "2021"
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
[package.metadata.docs.rs]
rustdoc-args = ["--cfg", "docsrs"]
diff --git a/actix-multipart/src/form/mod.rs b/actix-multipart/src/form/mod.rs
index 67adfd4b2c8..451b103fd7d 100644
--- a/actix-multipart/src/form/mod.rs
+++ b/actix-multipart/src/form/mod.rs
@@ -313,7 +313,8 @@ where
let entry = field_limits
.entry(field.name().to_owned())
.or_insert_with(|| T::limit(field.name()));
- limits.field_limit_remaining = entry.to_owned();
+
+ limits.field_limit_remaining.clone_from(entry);
T::handle_field(&req, field, &mut limits, &mut state).await?;
diff --git a/actix-router/src/path.rs b/actix-router/src/path.rs
index 467420cd3ad..9031ab76325 100644
--- a/actix-router/src/path.rs
+++ b/actix-router/src/path.rs
@@ -154,15 +154,11 @@ impl Path {
None
}
- /// Get matched parameter by name.
+ /// Returns matched parameter by name.
///
/// If keyed parameter is not available empty string is used as default value.
pub fn query(&self, key: &str) -> &str {
- if let Some(s) = self.get(key) {
- s
- } else {
- ""
- }
+ self.get(key).unwrap_or_default()
}
/// Return iterator to items in parameter container.
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index 7039ea7df70..4a45d4fef3e 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -2,14 +2,15 @@
name = "actix-web-codegen"
version = "4.2.2"
description = "Routing and runtime macros for Actix Web"
-homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web"
authors = [
"Nikolay Kim ",
"Rob Ede ",
]
-license = "MIT OR Apache-2.0"
-edition = "2021"
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
[lib]
proc-macro = true
diff --git a/actix-web/CHANGES.md b/actix-web/CHANGES.md
index c6454ed65fc..ea9967693d3 100644
--- a/actix-web/CHANGES.md
+++ b/actix-web/CHANGES.md
@@ -8,8 +8,13 @@
### Changed
+- Update `brotli` dependency to `6`.
- Minimum supported Rust version (MSRV) is now 1.72.
+### Fixed
+
+- Avoid type confusion with `rustls` in some circumstances.
+
## 4.5.1
### Fixed
diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml
index aea8856b107..b4c713817a8 100644
--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@@ -125,7 +125,7 @@ actix-files = "0.6"
actix-test = { version = "0.1", features = ["openssl", "rustls-0_22"] }
awc = { version = "3", features = ["openssl"] }
-brotli = "3.3.3"
+brotli = "6"
const-str = "0.5"
criterion = { version = "0.5", features = ["html_reports"] }
env_logger = "0.11"
diff --git a/actix-web/src/app_service.rs b/actix-web/src/app_service.rs
index f2dca954c0c..65a6ed87beb 100644
--- a/actix-web/src/app_service.rs
+++ b/actix-web/src/app_service.rs
@@ -263,8 +263,9 @@ impl ServiceFactory for AppRoutingFactory {
let guards = guards.borrow_mut().take().unwrap_or_default();
let factory_fut = factory.new_service(());
async move {
- let service = factory_fut.await?;
- Ok((path, guards, service))
+ factory_fut
+ .await
+ .map(move |service| (path, guards, service))
}
}));
diff --git a/actix-web/src/config.rs b/actix-web/src/config.rs
index fba0c2717d9..5e8b056f138 100644
--- a/actix-web/src/config.rs
+++ b/actix-web/src/config.rs
@@ -148,7 +148,7 @@ impl AppConfig {
#[cfg(test)]
pub(crate) fn set_host(&mut self, host: &str) {
- self.host = host.to_owned();
+ host.clone_into(&mut self.host);
}
}
diff --git a/actix-web/src/resource.rs b/actix-web/src/resource.rs
index 291d67460f4..00555b7b29a 100644
--- a/actix-web/src/resource.rs
+++ b/actix-web/src/resource.rs
@@ -771,7 +771,7 @@ mod tests {
data3: web::Data| {
assert_eq!(**data1, 10);
assert_eq!(**data2, '*');
- let error = std::f64::EPSILON;
+ let error = f64::EPSILON;
assert!((**data3 - 1.0).abs() < error);
HttpResponse::Ok()
},
diff --git a/actix-web/src/scope.rs b/actix-web/src/scope.rs
index 27a2827a63b..adc9f75d3bc 100644
--- a/actix-web/src/scope.rs
+++ b/actix-web/src/scope.rs
@@ -470,8 +470,9 @@ impl ServiceFactory for ScopeFactory {
let guards = guards.borrow_mut().take().unwrap_or_default();
let factory_fut = factory.new_service(());
async move {
- let service = factory_fut.await?;
- Ok((path, guards, service))
+ factory_fut
+ .await
+ .map(move |service| (path, guards, service))
}
}));
diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 507c8a080e2..9bb787ab6f0 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -2,6 +2,7 @@
## Unreleased
+- Update `brotli` dependency to `6`.
- Minimum supported Rust version (MSRV) is now 1.72.
## 3.4.0
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index da9e78ae8c3..aa77b024154 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -116,7 +116,7 @@ actix-tls = { version = "3.3", features = ["openssl", "rustls-0_22"] }
actix-utils = "3"
actix-web = { version = "4", features = ["openssl"] }
-brotli = "3.3.3"
+brotli = "6"
const-str = "0.5"
env_logger = "0.11"
flate2 = "1.0.13"
diff --git a/awc/src/client/connector.rs b/awc/src/client/connector.rs
index 94629b9557e..b66e13ec75c 100644
--- a/awc/src/client/connector.rs
+++ b/awc/src/client/connector.rs
@@ -649,6 +649,14 @@ where
/// service for establish tcp connection and do client tls handshake.
/// operation is canceled when timeout limit reached.
+#[cfg(any(
+ feature = "dangerous-h2c",
+ feature = "openssl",
+ feature = "rustls-0_20",
+ feature = "rustls-0_21",
+ feature = "rustls-0_22-webpki-roots",
+ feature = "rustls-0_22-native-roots",
+))]
struct TlsConnectorService {
/// TCP connection is canceled on `TcpConnectorInnerService`'s timeout setting.
tcp_service: Tcp,
@@ -659,6 +667,14 @@ struct TlsConnectorService {
timeout: Duration,
}
+#[cfg(any(
+ feature = "dangerous-h2c",
+ feature = "openssl",
+ feature = "rustls-0_20",
+ feature = "rustls-0_21",
+ feature = "rustls-0_22-webpki-roots",
+ feature = "rustls-0_22-native-roots",
+))]
impl Service for TlsConnectorService
where
Tcp:
diff --git a/justfile b/justfile
index 42979f18c97..d92f4bd3dfb 100644
--- a/justfile
+++ b/justfile
@@ -6,14 +6,57 @@ fmt:
cargo +nightly fmt
npx -y prettier --write $(fd --type=file --hidden --extension=md --extension=yml)
+# Downgrade dev-dependencies necessary to run MSRV checks/tests.
+[private]
+downgrade-for-msrv:
+ cargo update -p=clap --precise=4.4.18
+
+msrv := ```
+ cargo metadata --format-version=1 \
+ | jq -r 'first(.packages[] | select(.source == null and .rust_version)) | .rust_version' \
+ | sed -E 's/^1\.([0-9]{2})$/1\.\1\.0/'
+```
+msrv_rustup := "+" + msrv
+
+non_linux_all_features_list := ```
+ cargo metadata --format-version=1 \
+ | jq '.packages[] | select(.source == null) | .features | keys' \
+ | jq -r --slurp \
+ --arg exclusions "tokio-uring,io-uring,experimental-io-uring" \
+ 'add | unique | . - ($exclusions | split(",")) | join(",")'
+```
+
+all_crate_features := if os() == "linux" {
+ "--all-features"
+} else {
+ "--features='" + non_linux_all_features_list + "'"
+}
+
+# Test workspace using MSRV.
+test-msrv: downgrade-for-msrv (test msrv_rustup)
+
+# Test workspace code.
+test toolchain="":
+ cargo {{ toolchain }} test --lib --tests -p=actix-web-codegen --all-features
+ cargo {{ toolchain }} test --lib --tests -p=actix-multipart-derive --all-features
+ cargo {{ toolchain }} nextest run -p=actix-router --no-default-features
+ cargo {{ toolchain }} nextest run --workspace --exclude=actix-web-codegen --exclude=actix-multipart-derive {{ all_crate_features }} --filter-expr="not test(test_reading_deflate_encoding_large_random_rustls)"
+
+# Test workspace docs.
+test-docs toolchain="": && doc
+ cargo {{ toolchain }} test --doc --workspace {{ all_crate_features }} --no-fail-fast -- --nocapture
+
+# Test workspace.
+test-all toolchain="": (test toolchain) (test-docs toolchain)
+
# Document crates in workspace.
-doc:
- RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc --no-deps --workspace --features=rustls,openssl
+doc *args:
+ RUSTDOCFLAGS="--cfg=docsrs -Dwarnings" cargo +nightly doc --no-deps --workspace {{ all_crate_features }} {{ args }}
# Document crates in workspace and watch for changes.
doc-watch:
- RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc --no-deps --workspace --features=rustls,openssl --open
- cargo watch -- RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc --no-deps --workspace --features=rustls,openssl
+ @just doc --open
+ cargo watch -- just doc
# Update READMEs from crate root documentation.
update-readmes: && fmt