diff --git a/.cargo/config.toml b/.cargo/config.toml
deleted file mode 100644
index a2345e18..00000000
--- a/.cargo/config.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[alias]
-lint = "clippy --workspace --all-targets -- -Dclippy::todo"
-lint-all = "clippy --workspace --all-features --all-targets -- -Dclippy::todo"
-
-# lib checking
-ci-check-min = "hack --workspace check --no-default-features"
-ci-check-default = "hack --workspace check"
-ci-check-default-tests = "check --workspace --tests"
-ci-check-all-feature-powerset="hack --workspace --feature-powerset --depth=4 --skip=__compress,experimental-io-uring check"
-ci-check-all-feature-powerset-linux="hack --workspace --feature-powerset --depth=4 --skip=__compress check"
diff --git a/.clippy.toml b/.clippy.toml
new file mode 100644
index 00000000..8c0cbc8b
--- /dev/null
+++ b/.clippy.toml
@@ -0,0 +1,7 @@
+disallowed-names = [
+ "e", # no single letter error bindings
+]
+disallowed-methods = [
+ "std::cell::RefCell::default()",
+ "std::rc::Rc::default()",
+]
diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
index 8d509d69..f0ed2173 100644
--- a/.github/workflows/ci-post-merge.yml
+++ b/.github/workflows/ci-post-merge.yml
@@ -44,20 +44,20 @@ jobs:
echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
- name: Install Rust (${{ matrix.version.name }})
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
toolchain: ${{ matrix.version.version }}
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
- uses: taiki-e/install-action@v2.33.22
+ uses: taiki-e/install-action@v2.44.60
with:
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
- name: check minimal
- run: cargo ci-check-min
+ run: just check-min
- name: check default
- run: cargo ci-check-default
+ run: just check-default
- name: tests
timeout-minutes: 60
@@ -76,16 +76,16 @@ jobs:
- name: Free Disk Space
run: ./scripts/free-disk-space.sh
+ - name: Setup mold linker
+ uses: rui314/setup-mold@v1
+
- name: Install Rust
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
- - name: Install cargo-hack
- uses: taiki-e/install-action@v2.33.22
+ - name: Install just, cargo-hack
+ uses: taiki-e/install-action@v2.44.60
with:
- tool: cargo-hack
+ tool: just,cargo-hack
- - name: check feature combinations
- run: cargo ci-check-all-feature-powerset
-
- - name: check feature combinations
- run: cargo ci-check-all-feature-powerset-linux
+ - name: Check feature combinations
+ run: just check-feature-combinations
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a81f0e8e..b04213dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ concurrency:
jobs:
read_msrv:
name: Read MSRV
- uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@main
+ uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@v0.1.0
build_and_test:
needs: read_msrv
@@ -59,12 +59,12 @@ jobs:
uses: rui314/setup-mold@v1
- name: Install Rust (${{ matrix.version.name }})
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
toolchain: ${{ matrix.version.version }}
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
- uses: taiki-e/install-action@v2.33.22
+ uses: taiki-e/install-action@v2.44.60
with:
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
@@ -73,10 +73,10 @@ jobs:
run: just downgrade-for-msrv
- name: check minimal
- run: cargo ci-check-min
+ run: just check-min
- name: check default
- run: cargo ci-check-default
+ run: just check-default
- name: tests
timeout-minutes: 60
@@ -92,7 +92,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install Rust
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
toolchain: nightly
@@ -108,12 +108,12 @@ jobs:
- uses: actions/checkout@v4
- name: Install Rust (nightly)
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
toolchain: nightly
- name: Install just
- uses: taiki-e/install-action@v2.33.22
+ uses: taiki-e/install-action@v2.44.60
with:
tool: just
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 943f6322..1d4e580c 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -17,21 +17,22 @@ jobs:
steps:
- uses: actions/checkout@v4
- - name: Install Rust
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ - name: Install Rust (nightly)
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
- components: llvm-tools-preview
+ toolchain: nightly
+ components: llvm-tools
- - name: Install cargo-llvm-cov
- uses: taiki-e/install-action@v2.33.22
+ - name: Install just, cargo-llvm-cov, cargo-nextest
+ uses: taiki-e/install-action@v2.44.60
with:
- tool: cargo-llvm-cov
+ tool: just,cargo-llvm-cov,cargo-nextest
- name: Generate code coverage
- run: cargo llvm-cov --workspace --all-features --codecov --output-path codecov.json
+ run: just test-coverage-codecov
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@v4.3.1
+ uses: codecov/codecov-action@v4.6.0
with:
files: codecov.json
fail_ci_if_error: true
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 03b25ecd..94380aee 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install Rust (nightly)
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
toolchain: nightly
components: rustfmt
@@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install Rust
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
components: clippy
@@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install Rust (nightly)
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
toolchain: nightly
components: rust-docs
@@ -65,6 +65,30 @@ jobs:
RUSTDOCFLAGS: -D warnings
run: cargo +nightly doc --no-deps --workspace --all-features
+ check-external-types:
+ if: false # disable until https://github.com/awslabs/cargo-check-external-types/pull/177 is marged
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Install Rust (nightly-2024-05-01)
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
+ with:
+ toolchain: nightly-2024-05-01
+
+ - name: Install just
+ uses: taiki-e/install-action@v2.44.60
+ with:
+ tool: just
+
+ - name: Install cargo-check-external-types
+ uses: taiki-e/cache-cargo-install-action@v2.0.1
+ with:
+ tool: cargo-check-external-types
+
+ - name: check external types
+ run: just check-external-types-all +nightly-2024-05-01
+
public-api-diff:
runs-on: ubuntu-latest
steps:
@@ -76,18 +100,18 @@ jobs:
- name: Checkout PR branch
uses: actions/checkout@v4
- - name: Install Rust
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+ - name: Install Rust (nightly-2024-09-30)
+ uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
- toolchain: nightly-2024-04-26
+ toolchain: nightly-2024-09-30
- name: Install cargo-public-api
- uses: taiki-e/install-action@v2.33.22
+ uses: taiki-e/install-action@v2.44.60
with:
tool: cargo-public-api
- name: Generate API diff
run: |
for f in $(find -mindepth 2 -maxdepth 2 -name Cargo.toml); do
- cargo public-api --manifest-path "$f" diff ${{ github.event.pull_request.base.sha }}..${{ github.sha }}
+ cargo public-api --manifest-path "$f" --simplified diff ${{ github.event.pull_request.base.sha }}..${{ github.sha }}
done
diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml
deleted file mode 100644
index 6352e44d..00000000
--- a/.github/workflows/upload-doc.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Upload Documentation
-
-on:
- push:
- branches: [master]
-
-permissions:
- contents: read
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-jobs:
- build:
- permissions:
- contents: write
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v4
-
- - name: Install Rust
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
- with:
- toolchain: nightly
-
- - name: Build Docs
- run: cargo +nightly doc --no-deps --workspace --all-features
- env:
- RUSTDOCFLAGS: --cfg=docsrs
-
- - name: Tweak HTML
- run: echo '' > target/doc/index.html
-
- - name: Deploy to GitHub Pages
- 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 19d5dd11..d5601f8f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ homepage = "https://actix.rs"
repository = "https://github.com/actix/actix-web"
license = "MIT OR Apache-2.0"
edition = "2021"
-rust-version = "1.72"
+rust-version = "1.75"
[profile.dev]
# Disabling debug info speeds up builds a bunch and we don't rely on it for debugging that much.
@@ -51,3 +51,11 @@ awc = { path = "awc" }
# actix-utils = { path = "../actix-net/actix-utils" }
# actix-tls = { path = "../actix-net/actix-tls" }
# actix-server = { path = "../actix-net/actix-server" }
+
+[workspace.lints.rust]
+rust_2018_idioms = { level = "deny" }
+future_incompatible = { level = "deny" }
+nonstandard_style = { level = "deny" }
+
+[workspace.lints.clippy]
+# clone_on_ref_ptr = { level = "deny" }
diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md
index 393e7b61..afb2d5d2 100644
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@@ -2,6 +2,11 @@
## Unreleased
+- Minimum supported Rust version (MSRV) is now 1.75.
+
+## 0.6.6
+
+- Update `tokio-uring` dependency to `0.4`.
- Minimum supported Rust version (MSRV) is now 1.72.
## 0.6.5
diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml
index 3d82f8a7..48d38874 100644
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "actix-files"
-version = "0.6.5"
+version = "0.6.6"
authors = [
"Nikolay Kim ",
"Rob Ede ",
@@ -13,9 +13,14 @@ categories = ["asynchronous", "web-programming::http-server"]
license = "MIT OR Apache-2.0"
edition = "2021"
-[lib]
-name = "actix_files"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+ "actix_http::*",
+ "actix_service::*",
+ "actix_web::*",
+ "http::*",
+ "mime::*",
+]
[features]
experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
@@ -28,7 +33,7 @@ actix-web = { version = "4", default-features = false }
bitflags = "2"
bytes = "1"
-derive_more = "0.99.5"
+derive_more = { version = "1", features = ["display", "error", "from"] }
futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
http-range = "0.1.4"
log = "0.4"
@@ -40,8 +45,8 @@ v_htmlescape = "0.15.5"
# experimental-io-uring
[target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.4", optional = true, features = ["bytes"] }
-actix-server = { version = "2.2", optional = true } # ensure matching tokio-uring versions
+tokio-uring = { version = "0.5", optional = true, features = ["bytes"] }
+actix-server = { version = "2.4", optional = true } # ensure matching tokio-uring versions
[dev-dependencies]
actix-rt = "2.7"
@@ -49,3 +54,6 @@ actix-test = "0.1"
actix-web = "4"
env_logger = "0.11"
tempfile = "3.2"
+
+[lints]
+workspace = true
diff --git a/actix-files/README.md b/actix-files/README.md
index a6b3f63c..f6d5143f 100644
--- a/actix-files/README.md
+++ b/actix-files/README.md
@@ -3,11 +3,11 @@
[](https://crates.io/crates/actix-files)
-[](https://docs.rs/actix-files/0.6.5)
+[](https://docs.rs/actix-files/0.6.6)
-[](https://deps.rs/crate/actix-files/0.6.5)
+[](https://deps.rs/crate/actix-files/0.6.6)
[](https://crates.io/crates/actix-files)
[](https://discord.gg/NWpN5mmg3x)
diff --git a/actix-files/src/error.rs b/actix-files/src/error.rs
index d614651f..1d481888 100644
--- a/actix-files/src/error.rs
+++ b/actix-files/src/error.rs
@@ -1,16 +1,16 @@
use actix_web::{http::StatusCode, ResponseError};
-use derive_more::Display;
+use derive_more::derive::Display;
/// Errors which can occur when serving static files.
#[derive(Debug, PartialEq, Eq, Display)]
pub enum FilesError {
/// Path is not a directory.
#[allow(dead_code)]
- #[display(fmt = "path is not a directory. Unable to serve static files")]
+ #[display("path is not a directory. Unable to serve static files")]
IsNotDirectory,
/// Cannot render directory.
- #[display(fmt = "unable to render directory without index file")]
+ #[display("unable to render directory without index file")]
IsDirectory,
}
@@ -25,19 +25,19 @@ impl ResponseError for FilesError {
#[non_exhaustive]
pub enum UriSegmentError {
/// Segment started with the wrapped invalid character.
- #[display(fmt = "segment started with invalid character: ('{_0}')")]
+ #[display("segment started with invalid character: ('{_0}')")]
BadStart(char),
/// Segment contained the wrapped invalid character.
- #[display(fmt = "segment contained invalid character ('{_0}')")]
+ #[display("segment contained invalid character ('{_0}')")]
BadChar(char),
/// Segment ended with the wrapped invalid character.
- #[display(fmt = "segment ended with invalid character: ('{_0}')")]
+ #[display("segment ended with invalid character: ('{_0}')")]
BadEnd(char),
/// Path is not a valid UTF-8 string after percent-decoding.
- #[display(fmt = "path is not a valid UTF-8 string after percent-decoding")]
+ #[display("path is not a valid UTF-8 string after percent-decoding")]
NotValidUtf8,
}
diff --git a/actix-files/src/lib.rs b/actix-files/src/lib.rs
index 167f996c..551a14fa 100644
--- a/actix-files/src/lib.rs
+++ b/actix-files/src/lib.rs
@@ -11,8 +11,7 @@
//! .service(Files::new("/static", ".").prefer_utf8(true));
//! ```
-#![deny(rust_2018_idioms, nonstandard_style)]
-#![warn(future_incompatible, missing_docs, missing_debug_implementations)]
+#![warn(missing_docs, missing_debug_implementations)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
@@ -307,11 +306,11 @@ mod tests {
let resp = file.respond_to(&req);
assert_eq!(
resp.headers().get(header::CONTENT_TYPE).unwrap(),
- "application/javascript; charset=utf-8"
+ "text/javascript",
);
assert_eq!(
resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
- "inline; filename=\"test.js\""
+ "inline; filename=\"test.js\"",
);
}
diff --git a/actix-files/src/named.rs b/actix-files/src/named.rs
index 9e4a3773..7f839890 100644
--- a/actix-files/src/named.rs
+++ b/actix-files/src/named.rs
@@ -21,7 +21,7 @@ use actix_web::{
Error, HttpMessage, HttpRequest, HttpResponse, Responder,
};
use bitflags::bitflags;
-use derive_more::{Deref, DerefMut};
+use derive_more::derive::{Deref, DerefMut};
use futures_core::future::LocalBoxFuture;
use mime::Mime;
diff --git a/actix-files/src/range.rs b/actix-files/src/range.rs
index 528911ae..c6e34632 100644
--- a/actix-files/src/range.rs
+++ b/actix-files/src/range.rs
@@ -1,6 +1,6 @@
use std::fmt;
-use derive_more::Error;
+use derive_more::derive::Error;
/// Copy of `http_range::HttpRangeParseError`.
#[derive(Debug, Clone)]
diff --git a/actix-files/src/service.rs b/actix-files/src/service.rs
index 3d3b36c4..393ad924 100644
--- a/actix-files/src/service.rs
+++ b/actix-files/src/service.rs
@@ -79,7 +79,7 @@ impl FilesService {
let (req, _) = req.into_parts();
- (self.renderer)(&dir, &req).unwrap_or_else(|e| ServiceResponse::from_err(e, req))
+ (self.renderer)(&dir, &req).unwrap_or_else(|err| ServiceResponse::from_err(err, req))
}
}
diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index bfb0a353..7ccb70a4 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -18,9 +18,17 @@ edition = "2021"
[package.metadata.docs.rs]
features = []
-[lib]
-name = "actix_http_test"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+ "actix_codec::*",
+ "actix_http::*",
+ "actix_server::*",
+ "awc::*",
+ "bytes::*",
+ "futures_core::*",
+ "http::*",
+ "tokio::*",
+]
[features]
default = []
@@ -51,3 +59,6 @@ tokio = { version = "1.24.2", features = ["sync"] }
[dev-dependencies]
actix-http = "3"
+
+[lints]
+workspace = true
diff --git a/actix-http-test/README.md b/actix-http-test/README.md
index ee242d1d..93902812 100644
--- a/actix-http-test/README.md
+++ b/actix-http-test/README.md
@@ -1,7 +1,5 @@
# `actix-http-test`
-> Various helpers for Actix applications to use during testing.
-
[](https://crates.io/crates/actix-http-test)
@@ -14,3 +12,9 @@
[](https://discord.gg/NWpN5mmg3x)
+
+
+
+Various helpers for Actix applications to use during testing.
+
+
diff --git a/actix-http-test/src/lib.rs b/actix-http-test/src/lib.rs
index 554af910..a359cec0 100644
--- a/actix-http-test/src/lib.rs
+++ b/actix-http-test/src/lib.rs
@@ -1,7 +1,5 @@
//! Various helpers for Actix applications to use during testing.
-#![deny(rust_2018_idioms, nonstandard_style)]
-#![warn(future_incompatible)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
@@ -108,7 +106,7 @@ pub async fn test_server_with_addr>(
builder.set_verify(SslVerifyMode::NONE);
let _ = builder
.set_alpn_protos(b"\x02h2\x08http/1.1")
- .map_err(|e| log::error!("Can not set alpn protocol: {:?}", e));
+ .map_err(|err| log::error!("Can not set ALPN protocol: {err}"));
Connector::new()
.conn_lifetime(Duration::from_secs(0))
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 61eeb4be..982add26 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -2,6 +2,27 @@
## Unreleased
+### Added
+
+- Add `header::CLEAR_SITE_DATA` constant.
+
+### Changed
+
+- Update `brotli` dependency to `7`.
+- Minimum supported Rust version (MSRV) is now 1.75.
+
+## 3.9.0
+
+### Added
+
+- Implement `FromIterator<(HeaderName, HeaderValue)>` for `HeaderMap`.
+
+## 3.8.0
+
+### Added
+
+- Add `error::InvalidStatusCode` re-export.
+
## 3.7.0
### Added
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index c2551713..29420aa8 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "actix-http"
-version = "3.7.0"
+version = "3.9.0"
authors = [
"Nikolay Kim ",
"Rob Ede ",
@@ -34,51 +34,72 @@ features = [
"compress-zstd",
]
-[lib]
-name = "actix_http"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+ "actix_codec::*",
+ "actix_service::*",
+ "actix_tls::*",
+ "actix_utils::*",
+ "bytes::*",
+ "bytestring::*",
+ "encoding_rs::*",
+ "futures_core::*",
+ "h2::*",
+ "http::*",
+ "httparse::*",
+ "language_tags::*",
+ "mime::*",
+ "openssl::*",
+ "rustls::*",
+ "tokio_util::*",
+ "tokio::*",
+]
[features]
default = []
# HTTP/2 protocol support
-http2 = ["h2"]
+http2 = ["dep:h2"]
# WebSocket protocol implementation
ws = [
- "local-channel",
- "base64",
- "rand",
- "sha1",
+ "dep:local-channel",
+ "dep:base64",
+ "dep:rand",
+ "dep:sha1",
]
# TLS via OpenSSL
-openssl = ["actix-tls/accept", "actix-tls/openssl"]
+openssl = ["__tls", "actix-tls/accept", "actix-tls/openssl"]
# TLS via Rustls v0.20
-rustls = ["rustls-0_20"]
+rustls = ["__tls", "rustls-0_20"]
# TLS via Rustls v0.20
-rustls-0_20 = ["actix-tls/accept", "actix-tls/rustls-0_20"]
+rustls-0_20 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_20"]
# TLS via Rustls v0.21
-rustls-0_21 = ["actix-tls/accept", "actix-tls/rustls-0_21"]
+rustls-0_21 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_21"]
# TLS via Rustls v0.22
-rustls-0_22 = ["actix-tls/accept", "actix-tls/rustls-0_22"]
+rustls-0_22 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_22"]
# TLS via Rustls v0.23
-rustls-0_23 = ["actix-tls/accept", "actix-tls/rustls-0_23"]
+rustls-0_23 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_23"]
# Compression codecs
-compress-brotli = ["__compress", "brotli"]
-compress-gzip = ["__compress", "flate2"]
-compress-zstd = ["__compress", "zstd"]
+compress-brotli = ["__compress", "dep:brotli"]
+compress-gzip = ["__compress", "dep:flate2"]
+compress-zstd = ["__compress", "dep:zstd"]
# Internal (PRIVATE!) features used to aid testing and checking feature status.
# Don't rely on these whatsoever. They are semver-exempt and may disappear at anytime.
__compress = []
+# Internal (PRIVATE!) features used to aid checking feature status.
+# Don't rely on these whatsoever. They may disappear at anytime.
+__tls = []
+
[dependencies]
actix-service = "2"
actix-codec = "0.5"
@@ -89,7 +110,7 @@ ahash = "0.8"
bitflags = "2"
bytes = "1.7"
bytestring = "1"
-derive_more = "0.99.5"
+derive_more = { version = "1", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
encoding_rs = "0.8"
futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
http = "0.2.7"
@@ -106,7 +127,7 @@ tokio-util = { version = "0.7", features = ["io", "codec"] }
tracing = { version = "0.1.30", default-features = false, features = ["log"] }
# http2
-h2 = { version = "0.3.24", optional = true }
+h2 = { version = "0.3.26", optional = true }
# websockets
local-channel = { version = "0.1", optional = true }
@@ -118,7 +139,7 @@ sha1 = { version = "0.10", optional = true }
actix-tls = { version = "3.4", default-features = false, optional = true }
# compress-*
-brotli = { version = "6", optional = true }
+brotli = { version = "7", optional = true }
flate2 = { version = "1.0.13", optional = true }
zstd = { version = "0.13", optional = true }
@@ -139,13 +160,16 @@ rcgen = "0.13"
regex = "1.3"
rustversion = "1"
rustls-pemfile = "2"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1", features = ["derive"] }
serde_json = "1.0"
static_assertions = "1"
tls-openssl = { package = "openssl", version = "0.10.55" }
tls-rustls_023 = { package = "rustls", version = "0.23" }
tokio = { version = "1.24.2", features = ["net", "rt", "macros"] }
+[lints]
+workspace = true
+
[[example]]
name = "ws"
required-features = ["ws", "rustls-0_23"]
diff --git a/actix-http/README.md b/actix-http/README.md
index 0ba3fdca..f78ea86f 100644
--- a/actix-http/README.md
+++ b/actix-http/README.md
@@ -5,11 +5,11 @@
[](https://crates.io/crates/actix-http)
-[](https://docs.rs/actix-http/3.7.0)
+[](https://docs.rs/actix-http/3.9.0)
-[](https://deps.rs/crate/actix-http/3.7.0)
+[](https://deps.rs/crate/actix-http/3.9.0)
[](https://crates.io/crates/actix-http)
[](https://discord.gg/NWpN5mmg3x)
diff --git a/actix-http/examples/actix-web.rs b/actix-http/examples/actix-web.rs
index b1feffbd..68e12301 100644
--- a/actix-http/examples/actix-web.rs
+++ b/actix-http/examples/actix-web.rs
@@ -3,13 +3,13 @@ use std::sync::OnceLock;
use actix_http::HttpService;
use actix_server::Server;
use actix_service::map_config;
-use actix_web::{dev::AppConfig, get, App};
+use actix_web::{dev::AppConfig, get, App, Responder};
static MEDIUM: OnceLock = OnceLock::new();
static LARGE: OnceLock = OnceLock::new();
#[get("/")]
-async fn index() -> &'static str {
+async fn index() -> impl Responder {
"Hello, world. From Actix Web!"
}
diff --git a/actix-http/examples/echo.rs b/actix-http/examples/echo.rs
index ae6f00cc..11fd2750 100644
--- a/actix-http/examples/echo.rs
+++ b/actix-http/examples/echo.rs
@@ -23,7 +23,7 @@ async fn main() -> io::Result<()> {
body.extend_from_slice(&item?);
}
- info!("request body: {:?}", body);
+ info!("request body: {body:?}");
let res = Response::build(StatusCode::OK)
.insert_header(("x-head", HeaderValue::from_static("dummy value!")))
@@ -31,8 +31,7 @@ async fn main() -> io::Result<()> {
Ok::<_, Error>(res)
})
- // No TLS
- .tcp()
+ .tcp() // No TLS
})?
.run()
.await
diff --git a/actix-http/examples/hello-world.rs b/actix-http/examples/hello-world.rs
index cf10bedd..afa3883a 100644
--- a/actix-http/examples/hello-world.rs
+++ b/actix-http/examples/hello-world.rs
@@ -17,7 +17,7 @@ async fn main() -> io::Result<()> {
ext.insert(42u32);
})
.finish(|req: Request| async move {
- info!("{:?}", req);
+ info!("{req:?}");
let mut res = Response::build(StatusCode::OK);
res.insert_header(("x-head", HeaderValue::from_static("dummy value!")));
diff --git a/actix-http/examples/streaming-error.rs b/actix-http/examples/streaming-error.rs
index 8c8a249c..39f214fa 100644
--- a/actix-http/examples/streaming-error.rs
+++ b/actix-http/examples/streaming-error.rs
@@ -22,16 +22,16 @@ async fn main() -> io::Result<()> {
.bind("streaming-error", ("127.0.0.1", 8080), || {
HttpService::build()
.finish(|req| async move {
- info!("{:?}", req);
+ info!("{req:?}");
let res = Response::ok();
Ok::<_, Infallible>(res.set_body(BodyStream::new(stream! {
yield Ok(Bytes::from("123"));
yield Ok(Bytes::from("456"));
- actix_rt::time::sleep(Duration::from_millis(1000)).await;
+ actix_rt::time::sleep(Duration::from_secs(1)).await;
- yield Err(io::Error::new(io::ErrorKind::Other, ""));
+ yield Err(io::Error::new(io::ErrorKind::Other, "abc"));
})))
})
.tcp()
diff --git a/actix-http/examples/ws.rs b/actix-http/examples/ws.rs
index fb86bc5e..af83e4c3 100644
--- a/actix-http/examples/ws.rs
+++ b/actix-http/examples/ws.rs
@@ -17,7 +17,6 @@ use bytes::{Bytes, BytesMut};
use bytestring::ByteString;
use futures_core::{ready, Stream};
use tokio_util::codec::Encoder;
-use tracing::{info, trace};
#[actix_rt::main]
async fn main() -> io::Result<()> {
@@ -37,12 +36,12 @@ async fn main() -> io::Result<()> {
}
async fn handler(req: Request) -> Result>, Error> {
- info!("handshaking");
+ tracing::info!("handshaking");
let mut res = ws::handshake(req.head())?;
// handshake will always fail under HTTP/2
- info!("responding");
+ tracing::info!("responding");
res.message_body(BodyStream::new(Heartbeat::new(ws::Codec::new())))
}
@@ -64,7 +63,7 @@ impl Stream for Heartbeat {
type Item = Result;
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> {
- trace!("poll");
+ tracing::trace!("poll");
ready!(self.as_mut().interval.poll_tick(cx));
diff --git a/actix-http/src/body/body_stream.rs b/actix-http/src/body/body_stream.rs
index 4574b251..2ae12c27 100644
--- a/actix-http/src/body/body_stream.rs
+++ b/actix-http/src/body/body_stream.rs
@@ -75,7 +75,7 @@ mod tests {
time::{sleep, Sleep},
};
use actix_utils::future::poll_fn;
- use derive_more::{Display, Error};
+ use derive_more::derive::{Display, Error};
use futures_core::ready;
use futures_util::{stream, FutureExt as _};
use pin_project_lite::pin_project;
@@ -131,7 +131,7 @@ mod tests {
assert_eq!(to_bytes(body).await.ok(), Some(Bytes::from("12")));
}
#[derive(Debug, Display, Error)]
- #[display(fmt = "stream error")]
+ #[display("stream error")]
struct StreamErr;
#[actix_rt::test]
diff --git a/actix-http/src/body/utils.rs b/actix-http/src/body/utils.rs
index d1449179..1fdb3ff5 100644
--- a/actix-http/src/body/utils.rs
+++ b/actix-http/src/body/utils.rs
@@ -3,7 +3,7 @@ use std::task::Poll;
use actix_rt::pin;
use actix_utils::future::poll_fn;
use bytes::{Bytes, BytesMut};
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
use futures_core::ready;
use super::{BodySize, MessageBody};
@@ -38,7 +38,7 @@ pub async fn to_bytes(body: B) -> Result {
/// Error type returned from [`to_bytes_limited`] when body produced exceeds limit.
#[derive(Debug, Display, Error)]
-#[display(fmt = "limit exceeded while collecting body bytes")]
+#[display("limit exceeded while collecting body bytes")]
#[non_exhaustive]
pub struct BodyLimitExceeded;
diff --git a/actix-http/src/encoding/encoder.rs b/actix-http/src/encoding/encoder.rs
index 180927ac..3c9eec81 100644
--- a/actix-http/src/encoding/encoder.rs
+++ b/actix-http/src/encoding/encoder.rs
@@ -10,7 +10,7 @@ use std::{
use actix_rt::task::{spawn_blocking, JoinHandle};
use bytes::Bytes;
-use derive_more::Display;
+use derive_more::derive::Display;
#[cfg(feature = "compress-gzip")]
use flate2::write::{GzEncoder, ZlibEncoder};
use futures_core::ready;
@@ -415,11 +415,11 @@ fn new_brotli_compressor() -> Box> {
#[non_exhaustive]
pub enum EncoderError {
/// Wrapped body stream error.
- #[display(fmt = "body")]
+ #[display("body")]
Body(Box),
/// Generic I/O error.
- #[display(fmt = "io")]
+ #[display("io")]
Io(io::Error),
}
diff --git a/actix-http/src/error.rs b/actix-http/src/error.rs
index 69e2f14a..92126f79 100644
--- a/actix-http/src/error.rs
+++ b/actix-http/src/error.rs
@@ -2,8 +2,8 @@
use std::{error::Error as StdError, fmt, io, str::Utf8Error, string::FromUtf8Error};
-use derive_more::{Display, Error, From};
-pub use http::Error as HttpError;
+use derive_more::derive::{Display, Error, From};
+pub use http::{status::InvalidStatusCode, Error as HttpError};
use http::{uri::InvalidUri, StatusCode};
use crate::{body::BoxBody, Response};
@@ -80,28 +80,28 @@ impl From for Response {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Display)]
pub(crate) enum Kind {
- #[display(fmt = "error processing HTTP")]
+ #[display("error processing HTTP")]
Http,
- #[display(fmt = "error parsing HTTP message")]
+ #[display("error parsing HTTP message")]
Parse,
- #[display(fmt = "request payload read error")]
+ #[display("request payload read error")]
Payload,
- #[display(fmt = "response body write error")]
+ #[display("response body write error")]
Body,
- #[display(fmt = "send response error")]
+ #[display("send response error")]
SendResponse,
- #[display(fmt = "error in WebSocket process")]
+ #[display("error in WebSocket process")]
Ws,
- #[display(fmt = "connection error")]
+ #[display("connection error")]
Io,
- #[display(fmt = "encoder error")]
+ #[display("encoder error")]
Encoder,
}
@@ -160,44 +160,44 @@ impl From for Error {
#[non_exhaustive]
pub enum ParseError {
/// An invalid `Method`, such as `GE.T`.
- #[display(fmt = "invalid method specified")]
+ #[display("invalid method specified")]
Method,
/// An invalid `Uri`, such as `exam ple.domain`.
- #[display(fmt = "URI error: {}", _0)]
+ #[display("URI error: {}", _0)]
Uri(InvalidUri),
/// An invalid `HttpVersion`, such as `HTP/1.1`
- #[display(fmt = "invalid HTTP version specified")]
+ #[display("invalid HTTP version specified")]
Version,
/// An invalid `Header`.
- #[display(fmt = "invalid Header provided")]
+ #[display("invalid Header provided")]
Header,
/// A message head is too large to be reasonable.
- #[display(fmt = "message head is too large")]
+ #[display("message head is too large")]
TooLarge,
/// A message reached EOF, but is not complete.
- #[display(fmt = "message is incomplete")]
+ #[display("message is incomplete")]
Incomplete,
/// An invalid `Status`, such as `1337 ELITE`.
- #[display(fmt = "invalid status provided")]
+ #[display("invalid status provided")]
Status,
/// A timeout occurred waiting for an IO event.
#[allow(dead_code)]
- #[display(fmt = "timeout")]
+ #[display("timeout")]
Timeout,
/// An I/O error that occurred while trying to read or write to a network stream.
- #[display(fmt = "I/O error: {}", _0)]
+ #[display("I/O error: {}", _0)]
Io(io::Error),
/// Parsing a field as string failed.
- #[display(fmt = "UTF-8 error: {}", _0)]
+ #[display("UTF-8 error: {}", _0)]
Utf8(Utf8Error),
}
@@ -256,28 +256,28 @@ impl From for Response {
#[non_exhaustive]
pub enum PayloadError {
/// A payload reached EOF, but is not complete.
- #[display(fmt = "payload reached EOF before completing: {:?}", _0)]
+ #[display("payload reached EOF before completing: {:?}", _0)]
Incomplete(Option),
/// Content encoding stream corruption.
- #[display(fmt = "can not decode content-encoding")]
+ #[display("can not decode content-encoding")]
EncodingCorrupted,
/// Payload reached size limit.
- #[display(fmt = "payload reached size limit")]
+ #[display("payload reached size limit")]
Overflow,
/// Payload length is unknown.
- #[display(fmt = "payload length is unknown")]
+ #[display("payload length is unknown")]
UnknownLength,
/// HTTP/2 payload error.
#[cfg(feature = "http2")]
- #[display(fmt = "{}", _0)]
+ #[display("{}", _0)]
Http2Payload(::h2::Error),
/// Generic I/O error.
- #[display(fmt = "{}", _0)]
+ #[display("{}", _0)]
Io(io::Error),
}
@@ -326,44 +326,44 @@ impl From for Error {
#[non_exhaustive]
pub enum DispatchError {
/// Service error.
- #[display(fmt = "service error")]
+ #[display("service error")]
Service(Response),
/// Body streaming error.
- #[display(fmt = "body error: {}", _0)]
+ #[display("body error: {}", _0)]
Body(Box),
/// Upgrade service error.
- #[display(fmt = "upgrade error")]
+ #[display("upgrade error")]
Upgrade,
/// An `io::Error` that occurred while trying to read or write to a network stream.
- #[display(fmt = "I/O error: {}", _0)]
+ #[display("I/O error: {}", _0)]
Io(io::Error),
/// Request parse error.
- #[display(fmt = "request parse error: {}", _0)]
+ #[display("request parse error: {}", _0)]
Parse(ParseError),
/// HTTP/2 error.
- #[display(fmt = "{}", _0)]
+ #[display("{}", _0)]
#[cfg(feature = "http2")]
H2(h2::Error),
/// The first request did not complete within the specified timeout.
- #[display(fmt = "request did not complete within the specified timeout")]
+ #[display("request did not complete within the specified timeout")]
SlowRequestTimeout,
/// Disconnect timeout. Makes sense for TLS streams.
- #[display(fmt = "connection shutdown timeout")]
+ #[display("connection shutdown timeout")]
DisconnectTimeout,
/// Handler dropped payload before reading EOF.
- #[display(fmt = "handler dropped payload before reading EOF")]
+ #[display("handler dropped payload before reading EOF")]
HandlerDroppedPayload,
/// Internal error.
- #[display(fmt = "internal error")]
+ #[display("internal error")]
InternalError,
}
@@ -389,11 +389,11 @@ impl StdError for DispatchError {
#[non_exhaustive]
pub enum ContentTypeError {
/// Can not parse content type.
- #[display(fmt = "could not parse content type")]
+ #[display("could not parse content type")]
ParseError,
/// Unknown content encoding.
- #[display(fmt = "unknown content encoding")]
+ #[display("unknown content encoding")]
UnknownEncoding,
}
diff --git a/actix-http/src/h1/encoder.rs b/actix-http/src/h1/encoder.rs
index 42d7d677..33949d2e 100644
--- a/actix-http/src/h1/encoder.rs
+++ b/actix-http/src/h1/encoder.rs
@@ -314,7 +314,7 @@ impl MessageType for RequestHeadType {
_ => return Err(io::Error::new(io::ErrorKind::Other, "unsupported version")),
}
)
- .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+ .map_err(|err| io::Error::new(io::ErrorKind::Other, err))
}
}
@@ -499,7 +499,7 @@ impl TransferEncoding {
buf.extend_from_slice(b"0\r\n\r\n");
} else {
writeln!(helpers::MutWriter(buf), "{:X}\r", msg.len())
- .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
+ .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
buf.reserve(msg.len() + 2);
buf.extend_from_slice(msg);
diff --git a/actix-http/src/h1/service.rs b/actix-http/src/h1/service.rs
index f2f8a0e4..2cf76edb 100644
--- a/actix-http/src/h1/service.rs
+++ b/actix-http/src/h1/service.rs
@@ -480,15 +480,15 @@ where
let cfg = self.cfg.clone();
Box::pin(async move {
- let expect = expect
- .await
- .map_err(|e| error!("Init http expect service error: {:?}", e))?;
+ let expect = expect.await.map_err(|err| {
+ tracing::error!("Initialization of HTTP expect service error: {err:?}");
+ })?;
let upgrade = match upgrade {
Some(upgrade) => {
- let upgrade = upgrade
- .await
- .map_err(|e| error!("Init http upgrade service error: {:?}", e))?;
+ let upgrade = upgrade.await.map_err(|err| {
+ tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
+ })?;
Some(upgrade)
}
None => None,
@@ -496,7 +496,7 @@ where
let service = service
.await
- .map_err(|e| error!("Init http service error: {:?}", e))?;
+ .map_err(|err| error!("Initialization of HTTP service error: {err:?}"))?;
Ok(H1ServiceHandler::new(
cfg,
@@ -541,6 +541,6 @@ where
fn call(&self, (io, addr): (T, Option)) -> Self::Future {
let conn_data = OnConnectData::from_io(&io, self.on_connect_ext.as_deref());
- Dispatcher::new(io, self.flow.clone(), self.cfg.clone(), addr, conn_data)
+ Dispatcher::new(io, Rc::clone(&self.flow), self.cfg.clone(), addr, conn_data)
}
}
diff --git a/actix-http/src/h2/service.rs b/actix-http/src/h2/service.rs
index 636ac316..debc73e5 100644
--- a/actix-http/src/h2/service.rs
+++ b/actix-http/src/h2/service.rs
@@ -434,7 +434,7 @@ where
H2ServiceHandlerResponse {
state: State::Handshake(
- Some(self.flow.clone()),
+ Some(Rc::clone(&self.flow)),
Some(self.cfg.clone()),
addr,
on_connect_data,
diff --git a/actix-http/src/header/common.rs b/actix-http/src/header/common.rs
index 6942dc26..ebdd6708 100644
--- a/actix-http/src/header/common.rs
+++ b/actix-http/src/header/common.rs
@@ -18,6 +18,14 @@ pub const CACHE_STATUS: HeaderName = HeaderName::from_static("cache-status");
// TODO(breaking): replace with http's version
pub const CDN_CACHE_CONTROL: HeaderName = HeaderName::from_static("cdn-cache-control");
+/// Response header field that sends a signal to the user agent that it ought to remove all data of
+/// a certain set of types.
+///
+/// See the [W3C Clear-Site-Data spec] for full semantics.
+///
+/// [W3C Clear-Site-Data spec]: https://www.w3.org/TR/clear-site-data/#header
+pub const CLEAR_SITE_DATA: HeaderName = HeaderName::from_static("clear-site-data");
+
/// Response header that prevents a document from loading any cross-origin resources that don't
/// explicitly grant the document permission (using [CORP] or [CORS]).
///
diff --git a/actix-http/src/header/map.rs b/actix-http/src/header/map.rs
index b86798a4..6da01d2c 100644
--- a/actix-http/src/header/map.rs
+++ b/actix-http/src/header/map.rs
@@ -13,8 +13,9 @@ use super::AsHeaderName;
/// `HeaderMap` is a "multi-map" of [`HeaderName`] to one or more [`HeaderValue`]s.
///
/// # Examples
+///
/// ```
-/// use actix_http::header::{self, HeaderMap, HeaderValue};
+/// # use actix_http::header::{self, HeaderMap, HeaderValue};
///
/// let mut map = HeaderMap::new();
///
@@ -29,6 +30,21 @@ use super::AsHeaderName;
///
/// assert!(!map.contains_key(header::ORIGIN));
/// ```
+///
+/// Construct a header map using the [`FromIterator`] implementation. Note that it uses the append
+/// strategy, so duplicate header names are preserved.
+///
+/// ```
+/// use actix_http::header::{self, HeaderMap, HeaderValue};
+///
+/// let headers = HeaderMap::from_iter([
+/// (header::CONTENT_TYPE, HeaderValue::from_static("text/plain")),
+/// (header::COOKIE, HeaderValue::from_static("foo=1")),
+/// (header::COOKIE, HeaderValue::from_static("bar=1")),
+/// ]);
+///
+/// assert_eq!(headers.len(), 3);
+/// ```
#[derive(Debug, Clone, Default)]
pub struct HeaderMap {
pub(crate) inner: AHashMap,
@@ -368,8 +384,8 @@ impl HeaderMap {
/// let removed = map.insert(header::ACCEPT, HeaderValue::from_static("text/html"));
/// assert!(!removed.is_empty());
/// ```
- pub fn insert(&mut self, key: HeaderName, val: HeaderValue) -> Removed {
- let value = self.inner.insert(key, Value::one(val));
+ pub fn insert(&mut self, name: HeaderName, val: HeaderValue) -> Removed {
+ let value = self.inner.insert(name, Value::one(val));
Removed::new(value)
}
@@ -636,6 +652,16 @@ impl<'a> IntoIterator for &'a HeaderMap {
}
}
+impl FromIterator<(HeaderName, HeaderValue)> for HeaderMap {
+ fn from_iter>(iter: T) -> Self {
+ iter.into_iter()
+ .fold(Self::new(), |mut map, (name, value)| {
+ map.append(name, value);
+ map
+ })
+ }
+}
+
/// Convert a `http::HeaderMap` to our `HeaderMap`.
impl From for HeaderMap {
fn from(mut map: http::HeaderMap) -> Self {
diff --git a/actix-http/src/header/mod.rs b/actix-http/src/header/mod.rs
index 79f91afe..b22c43f7 100644
--- a/actix-http/src/header/mod.rs
+++ b/actix-http/src/header/mod.rs
@@ -42,9 +42,9 @@ pub use self::{
as_name::AsHeaderName,
// re-export list is explicit so that any updates to `http` do not conflict with this set
common::{
- CACHE_STATUS, CDN_CACHE_CONTROL, CROSS_ORIGIN_EMBEDDER_POLICY, CROSS_ORIGIN_OPENER_POLICY,
- CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY, X_FORWARDED_FOR, X_FORWARDED_HOST,
- X_FORWARDED_PROTO,
+ CACHE_STATUS, CDN_CACHE_CONTROL, CLEAR_SITE_DATA, CROSS_ORIGIN_EMBEDDER_POLICY,
+ CROSS_ORIGIN_OPENER_POLICY, CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY,
+ X_FORWARDED_FOR, X_FORWARDED_HOST, X_FORWARDED_PROTO,
},
into_pair::TryIntoHeaderPair,
into_value::TryIntoHeaderValue,
diff --git a/actix-http/src/header/shared/content_encoding.rs b/actix-http/src/header/shared/content_encoding.rs
index c3b4bc4c..0b83659d 100644
--- a/actix-http/src/header/shared/content_encoding.rs
+++ b/actix-http/src/header/shared/content_encoding.rs
@@ -1,6 +1,6 @@
use std::str::FromStr;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
use http::header::InvalidHeaderValue;
use crate::{
@@ -11,7 +11,7 @@ use crate::{
/// Error returned when a content encoding is unknown.
#[derive(Debug, Display, Error)]
-#[display(fmt = "unsupported content encoding")]
+#[display("unsupported content encoding")]
pub struct ContentEncodingParseError;
/// Represents a supported content encoding.
diff --git a/actix-http/src/header/shared/quality.rs b/actix-http/src/header/shared/quality.rs
index c2276cf1..2a76bc8c 100644
--- a/actix-http/src/header/shared/quality.rs
+++ b/actix-http/src/header/shared/quality.rs
@@ -1,6 +1,6 @@
use std::fmt;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
const MAX_QUALITY_INT: u16 = 1000;
const MAX_QUALITY_FLOAT: f32 = 1.0;
@@ -125,7 +125,7 @@ pub fn itoa_fmt(mut wr: W, value: V) -> fmt::Re
}
#[derive(Debug, Clone, Display, Error)]
-#[display(fmt = "quality out of bounds")]
+#[display("quality out of bounds")]
#[non_exhaustive]
pub struct QualityOutOfBounds;
diff --git a/actix-http/src/lib.rs b/actix-http/src/lib.rs
index 5d287a17..cf29766e 100644
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@@ -6,10 +6,10 @@
//! | ------------------- | ------------------------------------------- |
//! | `http2` | HTTP/2 support via [h2]. |
//! | `openssl` | TLS support via [OpenSSL]. |
-//! | `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. |
+//! | `rustls-0_20` | 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. |
@@ -20,8 +20,6 @@
//! [rustls]: https://crates.io/crates/rustls
//! [trust-dns]: https://crates.io/crates/trust-dns
-#![deny(rust_2018_idioms, nonstandard_style)]
-#![warn(future_incompatible)]
#![allow(
clippy::type_complexity,
clippy::too_many_arguments,
@@ -62,13 +60,7 @@ pub mod ws;
#[allow(deprecated)]
pub use self::payload::PayloadStream;
-#[cfg(any(
- feature = "openssl",
- feature = "rustls-0_20",
- feature = "rustls-0_21",
- feature = "rustls-0_22",
- feature = "rustls-0_23",
-))]
+#[cfg(feature = "__tls")]
pub use self::service::TlsAcceptorConfig;
pub use self::{
builder::HttpServiceBuilder,
diff --git a/actix-http/src/message.rs b/actix-http/src/message.rs
index 47b128fd..d2241b22 100644
--- a/actix-http/src/message.rs
+++ b/actix-http/src/message.rs
@@ -66,7 +66,7 @@ impl ops::DerefMut for Message {
impl Drop for Message {
fn drop(&mut self) {
- T::with_pool(|p| p.release(self.head.clone()))
+ T::with_pool(|p| p.release(Rc::clone(&self.head)))
}
}
diff --git a/actix-http/src/responses/builder.rs b/actix-http/src/responses/builder.rs
index 91c69ba5..bb7d0f71 100644
--- a/actix-http/src/responses/builder.rs
+++ b/actix-http/src/responses/builder.rs
@@ -351,12 +351,9 @@ mod tests {
assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "text/plain");
let resp = Response::build(StatusCode::OK)
- .content_type(mime::APPLICATION_JAVASCRIPT_UTF_8)
+ .content_type(mime::TEXT_JAVASCRIPT)
.body(Bytes::new());
- assert_eq!(
- resp.headers().get(CONTENT_TYPE).unwrap(),
- "application/javascript; charset=utf-8"
- );
+ assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "text/javascript");
}
#[test]
diff --git a/actix-http/src/service.rs b/actix-http/src/service.rs
index a58be93c..3be099d9 100644
--- a/actix-http/src/service.rs
+++ b/actix-http/src/service.rs
@@ -241,25 +241,13 @@ where
}
/// Configuration options used when accepting TLS connection.
-#[cfg(any(
- feature = "openssl",
- feature = "rustls-0_20",
- feature = "rustls-0_21",
- feature = "rustls-0_22",
- feature = "rustls-0_23",
-))]
+#[cfg(feature = "__tls")]
#[derive(Debug, Default)]
pub struct TlsAcceptorConfig {
pub(crate) handshake_timeout: Option,
}
-#[cfg(any(
- feature = "openssl",
- feature = "rustls-0_20",
- feature = "rustls-0_21",
- feature = "rustls-0_22",
- feature = "rustls-0_23",
-))]
+#[cfg(feature = "__tls")]
impl TlsAcceptorConfig {
/// Set TLS handshake timeout duration.
pub fn handshake_timeout(self, dur: std::time::Duration) -> Self {
@@ -787,23 +775,23 @@ where
let cfg = self.cfg.clone();
Box::pin(async move {
- let expect = expect
- .await
- .map_err(|e| error!("Init http expect service error: {:?}", e))?;
+ let expect = expect.await.map_err(|err| {
+ tracing::error!("Initialization of HTTP expect service error: {err:?}");
+ })?;
let upgrade = match upgrade {
Some(upgrade) => {
- let upgrade = upgrade
- .await
- .map_err(|e| error!("Init http upgrade service error: {:?}", e))?;
+ let upgrade = upgrade.await.map_err(|err| {
+ tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
+ })?;
Some(upgrade)
}
None => None,
};
- let service = service
- .await
- .map_err(|e| error!("Init http service error: {:?}", e))?;
+ let service = service.await.map_err(|err| {
+ tracing::error!("Initialization of HTTP service error: {err:?}");
+ })?;
Ok(HttpServiceHandler::new(
cfg,
@@ -922,7 +910,7 @@ where
handshake: Some((
crate::h2::handshake_with_timeout(io, &self.cfg),
self.cfg.clone(),
- self.flow.clone(),
+ Rc::clone(&self.flow),
conn_data,
peer_addr,
)),
@@ -938,7 +926,7 @@ where
state: State::H1 {
dispatcher: h1::Dispatcher::new(
io,
- self.flow.clone(),
+ Rc::clone(&self.flow),
self.cfg.clone(),
peer_addr,
conn_data,
diff --git a/actix-http/src/test.rs b/actix-http/src/test.rs
index 3815e64c..dfa9a86c 100644
--- a/actix-http/src/test.rs
+++ b/actix-http/src/test.rs
@@ -159,8 +159,8 @@ impl TestBuffer {
#[allow(dead_code)]
pub(crate) fn clone(&self) -> Self {
Self {
- read_buf: self.read_buf.clone(),
- write_buf: self.write_buf.clone(),
+ read_buf: Rc::clone(&self.read_buf),
+ write_buf: Rc::clone(&self.write_buf),
err: self.err.clone(),
}
}
diff --git a/actix-http/src/ws/dispatcher.rs b/actix-http/src/ws/dispatcher.rs
index 1354d5ae..7d0a300b 100644
--- a/actix-http/src/ws/dispatcher.rs
+++ b/actix-http/src/ws/dispatcher.rs
@@ -114,14 +114,14 @@ mod inner {
{
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
match *self {
- DispatcherError::Service(ref e) => {
- write!(fmt, "DispatcherError::Service({:?})", e)
+ DispatcherError::Service(ref err) => {
+ write!(fmt, "DispatcherError::Service({err:?})")
}
- DispatcherError::Encoder(ref e) => {
- write!(fmt, "DispatcherError::Encoder({:?})", e)
+ DispatcherError::Encoder(ref err) => {
+ write!(fmt, "DispatcherError::Encoder({err:?})")
}
- DispatcherError::Decoder(ref e) => {
- write!(fmt, "DispatcherError::Decoder({:?})", e)
+ DispatcherError::Decoder(ref err) => {
+ write!(fmt, "DispatcherError::Decoder({err:?})")
}
}
}
@@ -136,9 +136,9 @@ mod inner {
{
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
match *self {
- DispatcherError::Service(ref e) => write!(fmt, "{}", e),
- DispatcherError::Encoder(ref e) => write!(fmt, "{:?}", e),
- DispatcherError::Decoder(ref e) => write!(fmt, "{:?}", e),
+ DispatcherError::Service(ref err) => write!(fmt, "{err}"),
+ DispatcherError::Encoder(ref err) => write!(fmt, "{err:?}"),
+ DispatcherError::Decoder(ref err) => write!(fmt, "{err:?}"),
}
}
}
diff --git a/actix-http/src/ws/frame.rs b/actix-http/src/ws/frame.rs
index a70063a4..c95c1508 100644
--- a/actix-http/src/ws/frame.rs
+++ b/actix-http/src/ws/frame.rs
@@ -178,17 +178,14 @@ impl Parser {
};
if payload_len < 126 {
- dst.buffer_mut()
- .reserve(p_len + 2 + if mask { 4 } else { 0 });
+ dst.buffer_mut().reserve(p_len + 2);
dst.buffer_mut().put_slice(&[one, two | payload_len as u8]);
} else if payload_len <= 65_535 {
- dst.buffer_mut()
- .reserve(p_len + 4 + if mask { 4 } else { 0 });
+ dst.buffer_mut().reserve(p_len + 4);
dst.buffer_mut().put_slice(&[one, two | 126]);
dst.buffer_mut().put_u16(payload_len as u16);
} else {
- dst.buffer_mut()
- .reserve(p_len + 10 + if mask { 4 } else { 0 });
+ dst.buffer_mut().reserve(p_len + 10);
dst.buffer_mut().put_slice(&[one, two | 127]);
dst.buffer_mut().put_u64(payload_len as u64);
};
diff --git a/actix-http/src/ws/mod.rs b/actix-http/src/ws/mod.rs
index 3ed53b70..88053b25 100644
--- a/actix-http/src/ws/mod.rs
+++ b/actix-http/src/ws/mod.rs
@@ -5,7 +5,7 @@
use std::io;
-use derive_more::{Display, Error, From};
+use derive_more::derive::{Display, Error, From};
use http::{header, Method, StatusCode};
use crate::{body::BoxBody, header::HeaderValue, RequestHead, Response, ResponseBuilder};
@@ -27,43 +27,43 @@ pub use self::{
#[derive(Debug, Display, Error, From)]
pub enum ProtocolError {
/// Received an unmasked frame from client.
- #[display(fmt = "received an unmasked frame from client")]
+ #[display("received an unmasked frame from client")]
UnmaskedFrame,
/// Received a masked frame from server.
- #[display(fmt = "received a masked frame from server")]
+ #[display("received a masked frame from server")]
MaskedFrame,
/// Encountered invalid opcode.
- #[display(fmt = "invalid opcode ({})", _0)]
+ #[display("invalid opcode ({})", _0)]
InvalidOpcode(#[error(not(source))] u8),
/// Invalid control frame length
- #[display(fmt = "invalid control frame length ({})", _0)]
+ #[display("invalid control frame length ({})", _0)]
InvalidLength(#[error(not(source))] usize),
/// Bad opcode.
- #[display(fmt = "bad opcode")]
+ #[display("bad opcode")]
BadOpCode,
/// A payload reached size limit.
- #[display(fmt = "payload reached size limit")]
+ #[display("payload reached size limit")]
Overflow,
/// Continuation has not started.
- #[display(fmt = "continuation has not started")]
+ #[display("continuation has not started")]
ContinuationNotStarted,
/// Received new continuation but it is already started.
- #[display(fmt = "received new continuation but it has already started")]
+ #[display("received new continuation but it has already started")]
ContinuationStarted,
/// Unknown continuation fragment.
- #[display(fmt = "unknown continuation fragment: {}", _0)]
+ #[display("unknown continuation fragment: {}", _0)]
ContinuationFragment(#[error(not(source))] OpCode),
/// I/O error.
- #[display(fmt = "I/O error: {}", _0)]
+ #[display("I/O error: {}", _0)]
Io(io::Error),
}
@@ -71,27 +71,27 @@ pub enum ProtocolError {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Display, Error)]
pub enum HandshakeError {
/// Only get method is allowed.
- #[display(fmt = "method not allowed")]
+ #[display("method not allowed")]
GetMethodRequired,
/// Upgrade header if not set to WebSocket.
- #[display(fmt = "WebSocket upgrade is expected")]
+ #[display("WebSocket upgrade is expected")]
NoWebsocketUpgrade,
/// Connection header is not set to upgrade.
- #[display(fmt = "connection upgrade is expected")]
+ #[display("connection upgrade is expected")]
NoConnectionUpgrade,
/// WebSocket version header is not set.
- #[display(fmt = "WebSocket version header is required")]
+ #[display("WebSocket version header is required")]
NoVersionHeader,
/// Unsupported WebSocket version.
- #[display(fmt = "unsupported WebSocket version")]
+ #[display("unsupported WebSocket version")]
UnsupportedVersion,
/// WebSocket key is not set or wrong.
- #[display(fmt = "unknown WebSocket key")]
+ #[display("unknown WebSocket key")]
BadWebsocketKey,
}
diff --git a/actix-http/tests/test_client.rs b/actix-http/tests/test_client.rs
index 5888527f..c0019d06 100644
--- a/actix-http/tests/test_client.rs
+++ b/actix-http/tests/test_client.rs
@@ -5,7 +5,7 @@ use actix_http_test::test_server;
use actix_service::ServiceFactoryExt;
use actix_utils::future;
use bytes::Bytes;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
use futures_util::StreamExt as _;
const STR: &str = "Hello World Hello World Hello World Hello World Hello World \
@@ -94,7 +94,7 @@ async fn with_query_parameter() {
}
#[derive(Debug, Display, Error)]
-#[display(fmt = "expect failed")]
+#[display("expect failed")]
struct ExpectFailed;
impl From for Response {
diff --git a/actix-http/tests/test_openssl.rs b/actix-http/tests/test_openssl.rs
index 4dd22b58..77a66f32 100644
--- a/actix-http/tests/test_openssl.rs
+++ b/actix-http/tests/test_openssl.rs
@@ -14,7 +14,7 @@ use actix_http_test::test_server;
use actix_service::{fn_service, ServiceFactoryExt};
use actix_utils::future::{err, ok, ready};
use bytes::{Bytes, BytesMut};
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
use futures_core::Stream;
use futures_util::{stream::once, StreamExt as _};
use openssl::{
@@ -398,7 +398,7 @@ async fn h2_response_http_error_handling() {
}
#[derive(Debug, Display, Error)]
-#[display(fmt = "error")]
+#[display("error")]
struct BadRequest;
impl From for Response {
diff --git a/actix-http/tests/test_rustls.rs b/actix-http/tests/test_rustls.rs
index 3ca0d94c..5b02637d 100644
--- a/actix-http/tests/test_rustls.rs
+++ b/actix-http/tests/test_rustls.rs
@@ -23,7 +23,7 @@ use actix_service::{fn_factory_with_config, fn_service};
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};
+use derive_more::derive::{Display, Error};
use futures_core::{ready, Stream};
use futures_util::stream::once;
use rustls::{pki_types::ServerName, ServerConfig as RustlsServerConfig};
@@ -480,7 +480,7 @@ async fn h2_response_http_error_handling() {
}
#[derive(Debug, Display, Error)]
-#[display(fmt = "error")]
+#[display("error")]
struct BadRequest;
impl From for Response {
diff --git a/actix-http/tests/test_server.rs b/actix-http/tests/test_server.rs
index 4ba64a53..e93d3559 100644
--- a/actix-http/tests/test_server.rs
+++ b/actix-http/tests/test_server.rs
@@ -14,7 +14,7 @@ use actix_rt::{net::TcpStream, time::sleep};
use actix_service::fn_service;
use actix_utils::future::{err, ok, ready};
use bytes::Bytes;
-use derive_more::{Display, Error};
+use derive_more::derive::{Display, Error};
use futures_util::{stream::once, FutureExt as _, StreamExt as _};
use regex::Regex;
@@ -62,7 +62,7 @@ async fn h1_2() {
}
#[derive(Debug, Display, Error)]
-#[display(fmt = "expect failed")]
+#[display("expect failed")]
struct ExpectFailed;
impl From for Response {
@@ -723,7 +723,7 @@ async fn h1_response_http_error_handling() {
}
#[derive(Debug, Display, Error)]
-#[display(fmt = "error")]
+#[display("error")]
struct BadRequest;
impl From for Response {
diff --git a/actix-http/tests/test_ws.rs b/actix-http/tests/test_ws.rs
index 9a78074c..e9c4a01a 100644
--- a/actix-http/tests/test_ws.rs
+++ b/actix-http/tests/test_ws.rs
@@ -14,7 +14,7 @@ use actix_http::{
use actix_http_test::test_server;
use actix_service::{fn_factory, Service};
use bytes::Bytes;
-use derive_more::{Display, Error, From};
+use derive_more::derive::{Display, Error, From};
use futures_core::future::LocalBoxFuture;
use futures_util::{SinkExt as _, StreamExt as _};
@@ -37,16 +37,16 @@ impl WsService {
#[derive(Debug, Display, Error, From)]
enum WsServiceError {
- #[display(fmt = "HTTP error")]
+ #[display("HTTP error")]
Http(actix_http::Error),
- #[display(fmt = "WS handshake error")]
+ #[display("WS handshake error")]
Ws(actix_http::ws::HandshakeError),
- #[display(fmt = "I/O error")]
+ #[display("I/O error")]
Io(std::io::Error),
- #[display(fmt = "dispatcher error")]
+ #[display("dispatcher error")]
Dispatcher,
}
diff --git a/actix-multipart-derive/CHANGES.md b/actix-multipart-derive/CHANGES.md
index 1b44ba4b..d0c75929 100644
--- a/actix-multipart-derive/CHANGES.md
+++ b/actix-multipart-derive/CHANGES.md
@@ -2,6 +2,8 @@
## Unreleased
+## 0.7.0
+
- Minimum supported Rust version (MSRV) is now 1.72.
## 0.6.1
diff --git a/actix-multipart-derive/Cargo.toml b/actix-multipart-derive/Cargo.toml
index e978864a..964ef2b7 100644
--- a/actix-multipart-derive/Cargo.toml
+++ b/actix-multipart-derive/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "actix-multipart-derive"
-version = "0.6.1"
+version = "0.7.0"
authors = ["Jacob Halsey "]
description = "Multipart form derive macro for Actix Web"
keywords = ["http", "web", "framework", "async", "futures"]
@@ -25,7 +25,10 @@ quote = "1"
syn = "2"
[dev-dependencies]
-actix-multipart = "0.6"
+actix-multipart = "0.7"
actix-web = "4"
rustversion = "1"
trybuild = "1"
+
+[lints]
+workspace = true
diff --git a/actix-multipart-derive/README.md b/actix-multipart-derive/README.md
index ec0afffd..bf75613e 100644
--- a/actix-multipart-derive/README.md
+++ b/actix-multipart-derive/README.md
@@ -5,11 +5,11 @@
[](https://crates.io/crates/actix-multipart-derive)
-[](https://docs.rs/actix-multipart-derive/0.6.1)
+[](https://docs.rs/actix-multipart-derive/0.7.0)
-[](https://deps.rs/crate/actix-multipart-derive/0.6.1)
+[](https://deps.rs/crate/actix-multipart-derive/0.7.0)
[](https://crates.io/crates/actix-multipart-derive)
[](https://discord.gg/NWpN5mmg3x)
diff --git a/actix-multipart-derive/src/lib.rs b/actix-multipart-derive/src/lib.rs
index 9552ad2d..57d2fa87 100644
--- a/actix-multipart-derive/src/lib.rs
+++ b/actix-multipart-derive/src/lib.rs
@@ -2,11 +2,10 @@
//!
//! See [`macro@MultipartForm`] for usage examples.
-#![deny(rust_2018_idioms, nonstandard_style)]
-#![warn(future_incompatible)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![allow(clippy::disallowed_names)] // false positives in some macro expansions
use std::collections::HashSet;
@@ -37,6 +36,7 @@ struct MultipartFormAttrs {
duplicate_field: DuplicateField,
}
+#[allow(clippy::disallowed_names)] // false positive in macro expansion
#[derive(FromField, Default)]
#[darling(attributes(multipart), default)]
struct FieldAttrs {
@@ -138,7 +138,7 @@ struct ParsedField<'t> {
/// `#[multipart(duplicate_field = "")]` attribute:
///
/// - "ignore": (default) Extra fields are ignored. I.e., the first one is persisted.
-/// - "deny": A `MultipartError::UnsupportedField` error response is returned.
+/// - "deny": A `MultipartError::UnknownField` error response is returned.
/// - "replace": Each field is processed, but only the last one is persisted.
///
/// Note that `Vec` fields will ignore this option.
@@ -229,7 +229,7 @@ pub fn impl_multipart_form(input: proc_macro::TokenStream) -> proc_macro::TokenS
// Return value when a field name is not supported by the form
let unknown_field_result = if attrs.deny_unknown_fields {
quote!(::std::result::Result::Err(
- ::actix_multipart::MultipartError::UnsupportedField(field.name().to_string())
+ ::actix_multipart::MultipartError::UnknownField(field.name().unwrap().to_string())
))
} else {
quote!(::std::result::Result::Ok(()))
@@ -292,7 +292,7 @@ pub fn impl_multipart_form(input: proc_macro::TokenStream) -> proc_macro::TokenS
limits: &'t mut ::actix_multipart::form::Limits,
state: &'t mut ::actix_multipart::form::State,
) -> ::std::pin::Pin<::std::boxed::Box> + 't>> {
- match field.name() {
+ match field.name().unwrap() {
#handle_field_impl
_ => return ::std::boxed::Box::pin(::std::future::ready(#unknown_field_result)),
}
diff --git a/actix-multipart/CHANGES.md b/actix-multipart/CHANGES.md
index 196d2ca9..a030fac4 100644
--- a/actix-multipart/CHANGES.md
+++ b/actix-multipart/CHANGES.md
@@ -2,6 +2,30 @@
## Unreleased
+- Minimum supported Rust version (MSRV) is now 1.75.
+
+## 0.7.2
+
+- Fix re-exported version of `actix-multipart-derive`.
+
+## 0.7.1
+
+- Expose `LimitExceeded` error type.
+
+## 0.7.0
+
+- Add `MultipartError::ContentTypeIncompatible` variant.
+- Add `MultipartError::ContentDispositionNameMissing` variant.
+- Add `Field::bytes()` method.
+- Rename `MultipartError::{NoContentDisposition => ContentDispositionMissing}` variant.
+- Rename `MultipartError::{NoContentType => ContentTypeMissing}` variant.
+- Rename `MultipartError::{ParseContentType => ContentTypeParse}` variant.
+- Rename `MultipartError::{Boundary => BoundaryMissing}` variant.
+- Rename `MultipartError::{UnsupportedField => UnknownField}` variant.
+- Remove top-level re-exports of `test` utilities.
+
+## 0.6.2
+
- Add testing utilities under new module `test`.
- Minimum supported Rust version (MSRV) is now 1.72.
diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
index 6e36c339..aa33bfc9 100644
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -1,33 +1,48 @@
[package]
name = "actix-multipart"
-version = "0.6.1"
+version = "0.7.2"
authors = [
"Nikolay Kim ",
"Jacob Halsey ",
+ "Rob Ede ",
]
-description = "Multipart form support 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"
+description = "Multipart request & form support for Actix Web"
+keywords = ["http", "actix", "web", "multipart", "form"]
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
[package.metadata.docs.rs]
rustdoc-args = ["--cfg", "docsrs"]
all-features = true
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+ "actix_http::*",
+ "actix_multipart_derive::*",
+ "actix_utils::*",
+ "actix_web::*",
+ "bytes::*",
+ "futures_core::*",
+ "mime::*",
+ "serde_json::*",
+ "serde_plain::*",
+ "serde::*",
+ "tempfile::*",
+]
+
[features]
default = ["tempfile", "derive"]
derive = ["actix-multipart-derive"]
tempfile = ["dep:tempfile", "tokio/fs"]
[dependencies]
-actix-multipart-derive = { version = "=0.6.1", optional = true }
+actix-multipart-derive = { version = "=0.7.0", optional = true }
actix-utils = "3"
actix-web = { version = "4", default-features = false }
-bytes = "1"
-derive_more = "0.99.5"
+derive_more = { version = "1", features = ["display", "error", "from"] }
futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
httparse = "1.3"
@@ -48,8 +63,14 @@ actix-multipart-rfc7578 = "0.10"
actix-rt = "2.2"
actix-test = "0.1"
actix-web = "4"
+assert_matches = "1"
awc = "3"
+env_logger = "0.11"
futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
+futures-test = "0.3"
multer = "3"
tokio = { version = "1.24.2", features = ["sync"] }
tokio-stream = "0.1"
+
+[lints]
+workspace = true
diff --git a/actix-multipart/README.md b/actix-multipart/README.md
index 83947b0c..ec2e94bd 100644
--- a/actix-multipart/README.md
+++ b/actix-multipart/README.md
@@ -1,38 +1,32 @@
# `actix-multipart`
-> Multipart form support for Actix Web.
-
[](https://crates.io/crates/actix-multipart)
-[](https://docs.rs/actix-multipart/0.6.1)
+[](https://docs.rs/actix-multipart/0.7.2)
-[](https://deps.rs/crate/actix-multipart/0.6.1)
+[](https://deps.rs/crate/actix-multipart/0.7.2)
[](https://crates.io/crates/actix-multipart)
[](https://discord.gg/NWpN5mmg3x)
+
-## Example
+Multipart request & form support for Actix Web.
-Dependencies:
+The [`Multipart`] extractor aims to support all kinds of `multipart/*` requests, including `multipart/form-data`, `multipart/related` and `multipart/mixed`. This is a lower-level extractor which supports reading [multipart fields](Field), in the order they are sent by the client.
-```toml
-[dependencies]
-actix-multipart = "0.6"
-actix-web = "4.5"
-serde = { version = "1.0", features = ["derive"] }
-```
+Due to additional requirements for `multipart/form-data` requests, the higher level [`MultipartForm`] extractor and derive macro only supports this media type.
-Code:
+## Examples
```rust
use actix_web::{post, App, HttpServer, Responder};
-use actix_multipart::form::{json::Json as MPJson, tempfile::TempFile, MultipartForm};
+use actix_multipart::form::{json::Json as MpJson, tempfile::TempFile, MultipartForm};
use serde::Deserialize;
#[derive(Debug, Deserialize)]
@@ -44,7 +38,7 @@ struct Metadata {
struct UploadForm {
#[multipart(limit = "100MB")]
file: TempFile,
- json: MPJson,
+ json: MpJson,
}
#[post("/videos")]
@@ -64,15 +58,17 @@ async fn main() -> std::io::Result<()> {
}
```
-Curl request :
-```bash
+cURL request:
+
+```sh
curl -v --request POST \
--url http://localhost:8080/videos \
-F 'json={"name": "Cargo.lock"};type=application/json' \
-F file=@./Cargo.lock
```
+[`MultipartForm`]: struct@form::MultipartForm
-### Examples
+
-https://github.com/actix/examples/tree/master/forms/multipart
\ No newline at end of file
+[More available in the examples repo →](https://github.com/actix/examples/tree/master/forms/multipart)
diff --git a/actix-multipart/examples/form.rs b/actix-multipart/examples/form.rs
new file mode 100644
index 00000000..a90aeff9
--- /dev/null
+++ b/actix-multipart/examples/form.rs
@@ -0,0 +1,36 @@
+use actix_multipart::form::{json::Json as MpJson, tempfile::TempFile, MultipartForm};
+use actix_web::{middleware::Logger, post, App, HttpServer, Responder};
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+struct Metadata {
+ name: String,
+}
+
+#[derive(Debug, MultipartForm)]
+struct UploadForm {
+ #[multipart(limit = "100MB")]
+ file: TempFile,
+ json: MpJson,
+}
+
+#[post("/videos")]
+async fn post_video(MultipartForm(form): MultipartForm) -> impl Responder {
+ format!(
+ "Uploaded file {}, with size: {}\ntemporary file ({}) was deleted\n",
+ form.json.name,
+ form.file.size,
+ form.file.file.path().display(),
+ )
+}
+
+#[actix_web::main]
+async fn main() -> std::io::Result<()> {
+ env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
+
+ HttpServer::new(move || App::new().service(post_video).wrap(Logger::default()))
+ .workers(2)
+ .bind(("127.0.0.1", 8080))?
+ .run()
+ .await
+}
diff --git a/actix-multipart/src/error.rs b/actix-multipart/src/error.rs
index 77b5a559..8fff5c59 100644
--- a/actix-multipart/src/error.rs
+++ b/actix-multipart/src/error.rs
@@ -5,83 +5,101 @@ use actix_web::{
http::StatusCode,
ResponseError,
};
-use derive_more::{Display, Error, From};
+use derive_more::derive::{Display, Error, From};
/// A set of errors that can occur during parsing multipart streams.
#[derive(Debug, Display, From, Error)]
#[non_exhaustive]
-pub enum MultipartError {
- /// Content-Disposition header is not found or is not equal to "form-data".
+pub enum Error {
+ /// Could not find Content-Type header.
+ #[display("Could not find Content-Type header")]
+ ContentTypeMissing,
+
+ /// Could not parse Content-Type header.
+ #[display("Could not parse Content-Type header")]
+ ContentTypeParse,
+
+ /// Parsed Content-Type did not have "multipart" top-level media type.
///
- /// According to [RFC 7578 §4.2](https://datatracker.ietf.org/doc/html/rfc7578#section-4.2) a
- /// Content-Disposition header must always be present and equal to "form-data".
- #[display(fmt = "No Content-Disposition `form-data` header")]
- NoContentDisposition,
+ /// Also raised when extracting a [`MultipartForm`] from a request that does not have the
+ /// "multipart/form-data" media type.
+ ///
+ /// [`MultipartForm`]: struct@crate::form::MultipartForm
+ #[display("Parsed Content-Type did not have 'multipart' top-level media type")]
+ ContentTypeIncompatible,
- /// Content-Type header is not found
- #[display(fmt = "No Content-Type header found")]
- NoContentType,
+ /// Multipart boundary is not found.
+ #[display("Multipart boundary is not found")]
+ BoundaryMissing,
- /// Can not parse Content-Type header
- #[display(fmt = "Can not parse Content-Type header")]
- ParseContentType,
+ /// Content-Disposition header was not found or not of disposition type "form-data" when parsing
+ /// a "form-data" field.
+ ///
+ /// As per [RFC 7578 §4.2], a "multipart/form-data" field's Content-Disposition header must
+ /// always be present and have a disposition type of "form-data".
+ ///
+ /// [RFC 7578 §4.2]: https://datatracker.ietf.org/doc/html/rfc7578#section-4.2
+ #[display("Content-Disposition header was not found when parsing a \"form-data\" field")]
+ ContentDispositionMissing,
- /// Multipart boundary is not found
- #[display(fmt = "Multipart boundary is not found")]
- Boundary,
+ /// Content-Disposition name parameter was not found when parsing a "form-data" field.
+ ///
+ /// As per [RFC 7578 §4.2], a "multipart/form-data" field's Content-Disposition header must
+ /// always include a "name" parameter.
+ ///
+ /// [RFC 7578 §4.2]: https://datatracker.ietf.org/doc/html/rfc7578#section-4.2
+ #[display("Content-Disposition header was not found when parsing a \"form-data\" field")]
+ ContentDispositionNameMissing,
- /// Nested multipart is not supported
- #[display(fmt = "Nested multipart is not supported")]
+ /// Nested multipart is not supported.
+ #[display("Nested multipart is not supported")]
Nested,
- /// Multipart stream is incomplete
- #[display(fmt = "Multipart stream is incomplete")]
+ /// Multipart stream is incomplete.
+ #[display("Multipart stream is incomplete")]
Incomplete,
- /// Error during field parsing
- #[display(fmt = "{}", _0)]
+ /// Field parsing failed.
+ #[display("Error during field parsing")]
Parse(ParseError),
- /// Payload error
- #[display(fmt = "{}", _0)]
+ /// HTTP payload error.
+ #[display("Payload error")]
Payload(PayloadError),
- /// Not consumed
- #[display(fmt = "Multipart stream is not consumed")]
+ /// Stream is not consumed.
+ #[display("Stream is not consumed")]
NotConsumed,
- /// An error from a field handler in a form
- #[display(
- fmt = "An error occurred processing field `{}`: {}",
- field_name,
- source
- )]
+ /// Form field handler raised error.
+ #[display("An error occurred processing field: {name}")]
Field {
- field_name: String,
+ name: String,
source: actix_web::Error,
},
- /// Duplicate field
- #[display(fmt = "Duplicate field found for: `{}`", _0)]
+ /// Duplicate field found (for structure that opted-in to denying duplicate fields).
+ #[display("Duplicate field found: {_0}")]
#[from(ignore)]
DuplicateField(#[error(not(source))] String),
- /// Missing field
- #[display(fmt = "Field with name `{}` is required", _0)]
+ /// Required field is missing.
+ #[display("Required field is missing: {_0}")]
#[from(ignore)]
MissingField(#[error(not(source))] String),
- /// Unknown field
- #[display(fmt = "Unsupported field `{}`", _0)]
+ /// Unknown field (for structure that opted-in to denying unknown fields).
+ #[display("Unknown field: {_0}")]
#[from(ignore)]
- UnsupportedField(#[error(not(source))] String),
+ UnknownField(#[error(not(source))] String),
}
-/// Return `BadRequest` for `MultipartError`
-impl ResponseError for MultipartError {
+/// Return `BadRequest` for `MultipartError`.
+impl ResponseError for Error {
fn status_code(&self) -> StatusCode {
match &self {
- MultipartError::Field { source, .. } => source.as_response_error().status_code(),
+ Error::Field { source, .. } => source.as_response_error().status_code(),
+ Error::ContentTypeIncompatible => StatusCode::UNSUPPORTED_MEDIA_TYPE,
_ => StatusCode::BAD_REQUEST,
}
}
@@ -93,7 +111,7 @@ mod tests {
#[test]
fn test_multipart_error() {
- let resp = MultipartError::Boundary.error_response();
+ let resp = Error::BoundaryMissing.error_response();
assert_eq!(resp.status(), StatusCode::BAD_REQUEST);
}
}
diff --git a/actix-multipart/src/extractor.rs b/actix-multipart/src/extractor.rs
index 56ed69ae..31999228 100644
--- a/actix-multipart/src/extractor.rs
+++ b/actix-multipart/src/extractor.rs
@@ -1,21 +1,20 @@
-//! Multipart payload support
-
use actix_utils::future::{ready, Ready};
use actix_web::{dev::Payload, Error, FromRequest, HttpRequest};
-use crate::server::Multipart;
+use crate::multipart::Multipart;
-/// Get request's payload as multipart stream.
+/// Extract request's payload as multipart stream.
///
-/// Content-type: multipart/form-data;
+/// Content-type: multipart/*;
///
/// # Examples
+///
/// ```
-/// use actix_web::{web, HttpResponse, Error};
+/// use actix_web::{web, HttpResponse};
/// use actix_multipart::Multipart;
/// use futures_util::StreamExt as _;
///
-/// async fn index(mut payload: Multipart) -> Result {
+/// async fn index(mut payload: Multipart) -> actix_web::Result {
/// // iterate over multipart stream
/// while let Some(item) = payload.next().await {
/// let mut field = item?;
@@ -26,7 +25,7 @@ use crate::server::Multipart;
/// }
/// }
///
-/// Ok(HttpResponse::Ok().into())
+/// Ok(HttpResponse::Ok().finish())
/// }
/// ```
impl FromRequest for Multipart {
@@ -35,9 +34,6 @@ impl FromRequest for Multipart {
#[inline]
fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
- ready(Ok(match Multipart::boundary(req.headers()) {
- Ok(boundary) => Multipart::from_boundary(boundary, payload.take()),
- Err(err) => Multipart::from_error(err),
- }))
+ ready(Ok(Multipart::from_req(req, payload)))
}
}
diff --git a/actix-multipart/src/field.rs b/actix-multipart/src/field.rs
new file mode 100644
index 00000000..b42d8ae1
--- /dev/null
+++ b/actix-multipart/src/field.rs
@@ -0,0 +1,501 @@
+use std::{
+ cell::RefCell,
+ cmp, fmt,
+ future::poll_fn,
+ mem,
+ pin::Pin,
+ rc::Rc,
+ task::{ready, Context, Poll},
+};
+
+use actix_web::{
+ error::PayloadError,
+ http::header::{self, ContentDisposition, HeaderMap},
+ web::{Bytes, BytesMut},
+};
+use derive_more::derive::{Display, Error};
+use futures_core::Stream;
+use mime::Mime;
+
+use crate::{
+ error::Error,
+ payload::{PayloadBuffer, PayloadRef},
+ safety::Safety,
+};
+
+/// Error type returned from [`Field::bytes()`] when field data is larger than limit.
+#[derive(Debug, Display, Error)]
+#[display("size limit exceeded while collecting field data")]
+#[non_exhaustive]
+pub struct LimitExceeded;
+
+/// A single field in a multipart stream.
+pub struct Field {
+ /// Field's Content-Type.
+ content_type: Option,
+
+ /// Field's Content-Disposition.
+ content_disposition: Option,
+
+ /// Form field name.
+ ///
+ /// A non-optional storage for form field names to avoid unwraps in `form` module. Will be an
+ /// empty string in non-form contexts.
+ ///
+ // INVARIANT: always non-empty when request content-type is multipart/form-data.
+ pub(crate) form_field_name: String,
+
+ /// Field's header map.
+ headers: HeaderMap,
+
+ safety: Safety,
+ inner: Rc>,
+}
+
+impl Field {
+ pub(crate) fn new(
+ content_type: Option,
+ content_disposition: Option,
+ form_field_name: Option,
+ headers: HeaderMap,
+ safety: Safety,
+ inner: Rc>,
+ ) -> Self {
+ Field {
+ content_type,
+ content_disposition,
+ form_field_name: form_field_name.unwrap_or_default(),
+ headers,
+ inner,
+ safety,
+ }
+ }
+
+ /// Returns a reference to the field's header map.
+ pub fn headers(&self) -> &HeaderMap {
+ &self.headers
+ }
+
+ /// Returns a reference to the field's content (mime) type, if it is supplied by the client.
+ ///
+ /// According to [RFC 7578](https://www.rfc-editor.org/rfc/rfc7578#section-4.4), if it is not
+ /// present, it should default to "text/plain". Note it is the responsibility of the client to
+ /// provide the appropriate content type, there is no attempt to validate this by the server.
+ pub fn content_type(&self) -> Option<&Mime> {
+ self.content_type.as_ref()
+ }
+
+ /// Returns this field's parsed Content-Disposition header, if set.
+ ///
+ /// # Validation
+ ///
+ /// Per [RFC 7578 §4.2], the parts of a multipart/form-data payload MUST contain a
+ /// Content-Disposition header field where the disposition type is `form-data` and MUST also
+ /// contain an additional parameter of `name` with its value being the original field name from
+ /// the form. This requirement is enforced during extraction for multipart/form-data requests,
+ /// but not other kinds of multipart requests (such as multipart/related).
+ ///
+ /// As such, it is safe to `.unwrap()` calls `.content_disposition()` if you've verified.
+ ///
+ /// The [`name()`](Self::name) method is also provided as a convenience for obtaining the
+ /// aforementioned name parameter.
+ ///
+ /// [RFC 7578 §4.2]: https://datatracker.ietf.org/doc/html/rfc7578#section-4.2
+ pub fn content_disposition(&self) -> Option<&ContentDisposition> {
+ self.content_disposition.as_ref()
+ }
+
+ /// Returns the field's name, if set.
+ ///
+ /// See [`content_disposition()`](Self::content_disposition) regarding guarantees on presence of
+ /// the "name" field.
+ pub fn name(&self) -> Option<&str> {
+ self.content_disposition()?.get_name()
+ }
+
+ /// Collects the raw field data, up to `limit` bytes.
+ ///
+ /// # Errors
+ ///
+ /// Any errors produced by the data stream are returned as `Ok(Err(Error))` immediately.
+ ///
+ /// If the buffered data size would exceed `limit`, an `Err(LimitExceeded)` is returned. Note
+ /// that, in this case, the full data stream is exhausted before returning the error so that
+ /// subsequent fields can still be read. To better defend against malicious/infinite requests,
+ /// it is advisable to also put a timeout on this call.
+ pub async fn bytes(&mut self, limit: usize) -> Result, LimitExceeded> {
+ /// Sensible default (2kB) for initial, bounded allocation when collecting body bytes.
+ const INITIAL_ALLOC_BYTES: usize = 2 * 1024;
+
+ let mut exceeded_limit = false;
+ let mut buf = BytesMut::with_capacity(INITIAL_ALLOC_BYTES);
+
+ let mut field = Pin::new(self);
+
+ match poll_fn(|cx| loop {
+ match ready!(field.as_mut().poll_next(cx)) {
+ // if already over limit, discard chunk to advance multipart request
+ Some(Ok(_chunk)) if exceeded_limit => {}
+
+ // if limit is exceeded set flag to true and continue
+ Some(Ok(chunk)) if buf.len() + chunk.len() > limit => {
+ exceeded_limit = true;
+ // eagerly de-allocate field data buffer
+ let _ = mem::take(&mut buf);
+ }
+
+ Some(Ok(chunk)) => buf.extend_from_slice(&chunk),
+
+ None => return Poll::Ready(Ok(())),
+ Some(Err(err)) => return Poll::Ready(Err(err)),
+ }
+ })
+ .await
+ {
+ // propagate error returned from body poll
+ Err(err) => Ok(Err(err)),
+
+ // limit was exceeded while reading body
+ Ok(()) if exceeded_limit => Err(LimitExceeded),
+
+ // otherwise return body buffer
+ Ok(()) => Ok(Ok(buf.freeze())),
+ }
+ }
+}
+
+impl Stream for Field {
+ type Item = Result;
+
+ fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> {
+ let this = self.get_mut();
+ let mut inner = this.inner.borrow_mut();
+
+ if let Some(mut buffer) = inner
+ .payload
+ .as_ref()
+ .expect("Field should not be polled after completion")
+ .get_mut(&this.safety)
+ {
+ // check safety and poll read payload to buffer.
+ buffer.poll_stream(cx)?;
+ } else if !this.safety.is_clean() {
+ // safety violation
+ return Poll::Ready(Some(Err(Error::NotConsumed)));
+ } else {
+ return Poll::Pending;
+ }
+
+ inner.poll(&this.safety)
+ }
+}
+
+impl fmt::Debug for Field {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ if let Some(ct) = &self.content_type {
+ writeln!(f, "\nField: {}", ct)?;
+ } else {
+ writeln!(f, "\nField:")?;
+ }
+ writeln!(f, " boundary: {}", self.inner.borrow().boundary)?;
+ writeln!(f, " headers:")?;
+ for (key, val) in self.headers.iter() {
+ writeln!(f, " {:?}: {:?}", key, val)?;
+ }
+ Ok(())
+ }
+}
+
+pub(crate) struct InnerField {
+ /// Payload is initialized as Some and is `take`n when the field stream finishes.
+ payload: Option,
+
+ /// Field boundary (without "--" prefix).
+ boundary: String,
+
+ /// True if request payload has been exhausted.
+ eof: bool,
+
+ /// Field data's stated size according to it's Content-Length header.
+ length: Option,
+}
+
+impl InnerField {
+ pub(crate) fn new_in_rc(
+ payload: PayloadRef,
+ boundary: String,
+ headers: &HeaderMap,
+ ) -> Result>, PayloadError> {
+ Self::new(payload, boundary, headers).map(|this| Rc::new(RefCell::new(this)))
+ }
+
+ pub(crate) fn new(
+ payload: PayloadRef,
+ boundary: String,
+ headers: &HeaderMap,
+ ) -> Result {
+ let len = if let Some(len) = headers.get(&header::CONTENT_LENGTH) {
+ match len.to_str().ok().and_then(|len| len.parse::().ok()) {
+ Some(len) => Some(len),
+ None => return Err(PayloadError::Incomplete(None)),
+ }
+ } else {
+ None
+ };
+
+ Ok(InnerField {
+ boundary,
+ payload: Some(payload),
+ eof: false,
+ length: len,
+ })
+ }
+
+ /// Reads body part content chunk of the specified size.
+ ///
+ /// The body part must has `Content-Length` header with proper value.
+ pub(crate) fn read_len(
+ payload: &mut PayloadBuffer,
+ size: &mut u64,
+ ) -> Poll>> {
+ if *size == 0 {
+ Poll::Ready(None)
+ } else {
+ match payload.read_max(*size)? {
+ Some(mut chunk) => {
+ let len = cmp::min(chunk.len() as u64, *size);
+ *size -= len;
+ let ch = chunk.split_to(len as usize);
+ if !chunk.is_empty() {
+ payload.unprocessed(chunk);
+ }
+ Poll::Ready(Some(Ok(ch)))
+ }
+ None => {
+ if payload.eof && (*size != 0) {
+ Poll::Ready(Some(Err(Error::Incomplete)))
+ } else {
+ Poll::Pending
+ }
+ }
+ }
+ }
+ }
+
+ /// Reads content chunk of body part with unknown length.
+ ///
+ /// The `Content-Length` header for body part is not necessary.
+ pub(crate) fn read_stream(
+ payload: &mut PayloadBuffer,
+ boundary: &str,
+ ) -> Poll>> {
+ let mut pos = 0;
+
+ let len = payload.buf.len();
+
+ if len == 0 {
+ return if payload.eof {
+ Poll::Ready(Some(Err(Error::Incomplete)))
+ } else {
+ Poll::Pending
+ };
+ }
+
+ // check boundary
+ if len > 4 && payload.buf[0] == b'\r' {
+ let b_len = if payload.buf.starts_with(b"\r\n") && &payload.buf[2..4] == b"--" {
+ Some(4)
+ } else if &payload.buf[1..3] == b"--" {
+ Some(3)
+ } else {
+ None
+ };
+
+ if let Some(b_len) = b_len {
+ let b_size = boundary.len() + b_len;
+ if len < b_size {
+ return Poll::Pending;
+ } else if &payload.buf[b_len..b_size] == boundary.as_bytes() {
+ // found boundary
+ return Poll::Ready(None);
+ }
+ }
+ }
+
+ loop {
+ return if let Some(idx) = memchr::memmem::find(&payload.buf[pos..], b"\r") {
+ let cur = pos + idx;
+
+ // check if we have enough data for boundary detection
+ if cur + 4 > len {
+ if cur > 0 {
+ Poll::Ready(Some(Ok(payload.buf.split_to(cur).freeze())))
+ } else {
+ Poll::Pending
+ }
+ } else {
+ // check boundary
+ if (&payload.buf[cur..cur + 2] == b"\r\n"
+ && &payload.buf[cur + 2..cur + 4] == b"--")
+ || (&payload.buf[cur..=cur] == b"\r"
+ && &payload.buf[cur + 1..cur + 3] == b"--")
+ {
+ if cur != 0 {
+ // return buffer
+ Poll::Ready(Some(Ok(payload.buf.split_to(cur).freeze())))
+ } else {
+ pos = cur + 1;
+ continue;
+ }
+ } else {
+ // not boundary
+ pos = cur + 1;
+ continue;
+ }
+ }
+ } else {
+ Poll::Ready(Some(Ok(payload.buf.split().freeze())))
+ };
+ }
+ }
+
+ pub(crate) fn poll(&mut self, safety: &Safety) -> Poll>> {
+ if self.payload.is_none() {
+ return Poll::Ready(None);
+ }
+
+ let Some(mut payload) = self
+ .payload
+ .as_ref()
+ .expect("Field should not be polled after completion")
+ .get_mut(safety)
+ else {
+ return Poll::Pending;
+ };
+
+ if !self.eof {
+ let res = if let Some(ref mut len) = self.length {
+ Self::read_len(&mut payload, len)
+ } else {
+ Self::read_stream(&mut payload, &self.boundary)
+ };
+
+ match ready!(res) {
+ Some(Ok(bytes)) => return Poll::Ready(Some(Ok(bytes))),
+ Some(Err(err)) => return Poll::Ready(Some(Err(err))),
+ None => self.eof = true,
+ }
+ }
+
+ let result = match payload.readline() {
+ Ok(None) => Poll::Pending,
+ Ok(Some(line)) => {
+ if line.as_ref() != b"\r\n" {
+ log::warn!("multipart field did not read all the data or it is malformed");
+ }
+ Poll::Ready(None)
+ }
+ Err(err) => Poll::Ready(Some(Err(err))),
+ };
+
+ drop(payload);
+
+ if let Poll::Ready(None) = result {
+ // drop payload buffer and make future un-poll-able
+ let _ = self.payload.take();
+ }
+
+ result
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use futures_util::{stream, StreamExt as _};
+
+ use super::*;
+ use crate::Multipart;
+
+ // TODO: use test utility when multi-file support is introduced
+ fn create_double_request_with_header() -> (Bytes, HeaderMap) {
+ let bytes = Bytes::from(
+ "testasdadsad\r\n\
+ --abbc761f78ff4d7cb7573b5a23f96ef0\r\n\
+ Content-Disposition: form-data; name=\"file\"; filename=\"fn.txt\"\r\n\
+ Content-Type: text/plain; charset=utf-8\r\n\
+ \r\n\
+ one+one+one\r\n\
+ --abbc761f78ff4d7cb7573b5a23f96ef0\r\n\
+ Content-Disposition: form-data; name=\"file\"; filename=\"fn.txt\"\r\n\
+ Content-Type: text/plain; charset=utf-8\r\n\
+ \r\n\
+ two+two+two\r\n\
+ --abbc761f78ff4d7cb7573b5a23f96ef0--\r\n",
+ );
+ let mut headers = HeaderMap::new();
+ headers.insert(
+ header::CONTENT_TYPE,
+ header::HeaderValue::from_static(
+ "multipart/mixed; boundary=\"abbc761f78ff4d7cb7573b5a23f96ef0\"",
+ ),
+ );
+ (bytes, headers)
+ }
+
+ #[actix_rt::test]
+ async fn bytes_unlimited() {
+ let (body, headers) = create_double_request_with_header();
+
+ let mut multipart = Multipart::new(&headers, stream::iter([Ok(body)]));
+
+ let field = multipart
+ .next()
+ .await
+ .expect("multipart should have two fields")
+ .expect("multipart body should be well formatted")
+ .bytes(usize::MAX)
+ .await
+ .expect("field data should not be size limited")
+ .expect("reading field data should not error");
+ assert_eq!(field, "one+one+one");
+
+ let field = multipart
+ .next()
+ .await
+ .expect("multipart should have two fields")
+ .expect("multipart body should be well formatted")
+ .bytes(usize::MAX)
+ .await
+ .expect("field data should not be size limited")
+ .expect("reading field data should not error");
+ assert_eq!(field, "two+two+two");
+ }
+
+ #[actix_rt::test]
+ async fn bytes_limited() {
+ let (body, headers) = create_double_request_with_header();
+
+ let mut multipart = Multipart::new(&headers, stream::iter([Ok(body)]));
+
+ multipart
+ .next()
+ .await
+ .expect("multipart should have two fields")
+ .expect("multipart body should be well formatted")
+ .bytes(8) // smaller than data size
+ .await
+ .expect_err("field data should be size limited");
+
+ // next field still readable
+ let field = multipart
+ .next()
+ .await
+ .expect("multipart should have two fields")
+ .expect("multipart body should be well formatted")
+ .bytes(usize::MAX)
+ .await
+ .expect("field data should not be size limited")
+ .expect("reading field data should not error");
+ assert_eq!(field, "two+two+two");
+ }
+}
diff --git a/actix-multipart/src/form/bytes.rs b/actix-multipart/src/form/bytes.rs
index 3c5e2eb1..51b0cf7d 100644
--- a/actix-multipart/src/form/bytes.rs
+++ b/actix-multipart/src/form/bytes.rs
@@ -1,7 +1,6 @@
//! Reads a field into memory.
-use actix_web::HttpRequest;
-use bytes::BytesMut;
+use actix_web::{web::BytesMut, HttpRequest};
use futures_core::future::LocalBoxFuture;
use futures_util::TryStreamExt as _;
use mime::Mime;
@@ -15,7 +14,7 @@ use crate::{
#[derive(Debug)]
pub struct Bytes {
/// The data.
- pub data: bytes::Bytes,
+ pub data: actix_web::web::Bytes,
/// The value of the `Content-Type` header.
pub content_type: Option,
@@ -41,8 +40,9 @@ impl<'t> FieldReader<'t> for Bytes {
content_type: field.content_type().map(ToOwned::to_owned),
file_name: field
.content_disposition()
+ .expect("multipart form fields should have a content-disposition header")
.get_filename()
- .map(str::to_owned),
+ .map(ToOwned::to_owned),
})
})
}
diff --git a/actix-multipart/src/form/json.rs b/actix-multipart/src/form/json.rs
index bb4e03bf..8fb1f5ca 100644
--- a/actix-multipart/src/form/json.rs
+++ b/actix-multipart/src/form/json.rs
@@ -3,7 +3,7 @@
use std::sync::Arc;
use actix_web::{http::StatusCode, web, Error, HttpRequest, ResponseError};
-use derive_more::{Deref, DerefMut, Display, Error};
+use derive_more::derive::{Deref, DerefMut, Display, Error};
use futures_core::future::LocalBoxFuture;
use serde::de::DeserializeOwned;
@@ -32,7 +32,6 @@ where
fn read_field(req: &'t HttpRequest, field: Field, limits: &'t mut Limits) -> Self::Future {
Box::pin(async move {
let config = JsonConfig::from_req(req);
- let field_name = field.name().to_owned();
if config.validate_content_type {
let valid = if let Some(mime) = field.content_type() {
@@ -43,17 +42,19 @@ where
if !valid {
return Err(MultipartError::Field {
- field_name,
+ name: field.form_field_name,
source: config.map_error(req, JsonFieldError::ContentType),
});
}
}
+ let form_field_name = field.form_field_name.clone();
+
let bytes = Bytes::read_field(req, field, limits).await?;
Ok(Json(serde_json::from_slice(bytes.data.as_ref()).map_err(
|err| MultipartError::Field {
- field_name,
+ name: form_field_name,
source: config.map_error(req, JsonFieldError::Deserialize(err)),
},
)?))
@@ -65,11 +66,11 @@ where
#[non_exhaustive]
pub enum JsonFieldError {
/// Deserialize error.
- #[display(fmt = "Json deserialize error: {}", _0)]
+ #[display("Json deserialize error: {}", _0)]
Deserialize(serde_json::Error),
/// Content type error.
- #[display(fmt = "Content type error")]
+ #[display("Content type error")]
ContentType,
}
@@ -133,8 +134,7 @@ impl Default for JsonConfig {
mod tests {
use std::collections::HashMap;
- use actix_web::{http::StatusCode, web, App, HttpResponse, Responder};
- use bytes::Bytes;
+ use actix_web::{http::StatusCode, web, web::Bytes, App, HttpResponse, Responder};
use crate::form::{
json::{Json, JsonConfig},
diff --git a/actix-multipart/src/form/mod.rs b/actix-multipart/src/form/mod.rs
index 451b103f..a9a1ad56 100644
--- a/actix-multipart/src/form/mod.rs
+++ b/actix-multipart/src/form/mod.rs
@@ -1,4 +1,4 @@
-//! Process and extract typed data from a multipart stream.
+//! Extract and process typed data from fields of a `multipart/form-data` request.
use std::{
any::Any,
@@ -8,7 +8,7 @@ use std::{
};
use actix_web::{dev, error::PayloadError, web, Error, FromRequest, HttpRequest};
-use derive_more::{Deref, DerefMut};
+use derive_more::derive::{Deref, DerefMut};
use futures_core::future::LocalBoxFuture;
use futures_util::{TryFutureExt as _, TryStreamExt as _};
@@ -33,6 +33,14 @@ pub trait FieldReader<'t>: Sized + Any {
type Future: Future