mirror of https://github.com/fafhrd91/actix-web
Compare commits
33 Commits
013a8ec6b6
...
2f64cdb60a
Author | SHA1 | Date |
---|---|---|
|
2f64cdb60a | |
|
dcad1d9b89 | |
|
d501102610 | |
|
072fdc182d | |
|
347c7204a6 | |
|
573090e01f | |
|
69dda5c943 | |
|
1b4b61d839 | |
|
2c55d659dd | |
|
276f5d5bd4 | |
|
5f3c02813a | |
|
3d3b31e16a | |
|
3147aaccc7 | |
|
079400a72b | |
|
a49f055561 | |
|
55268b6898 | |
|
89b5b04653 | |
|
e42cffc28d | |
|
8765b04476 | |
|
40179e2aa6 | |
|
9bbb5414d1 | |
|
65f254d1b2 | |
|
25511dfb38 | |
|
6e902d1d5c | |
|
f1b7cfb253 | |
|
e983276a78 | |
|
bbe0134523 | |
|
2dd165dc0b | |
|
9829f87cd1 | |
|
6892896a62 | |
|
bdb7b4da2d | |
|
7eea3d3657 | |
|
ad73cdc823 |
|
@ -1,7 +1,8 @@
|
|||
disallowed-names = [
|
||||
"e", # no single letter error bindings
|
||||
"..",
|
||||
"e", # no single letter error bindings
|
||||
]
|
||||
disallowed-methods = [
|
||||
"std::cell::RefCell::default()",
|
||||
"std::rc::Rc::default()",
|
||||
{ path = "std::cell::RefCell::default()", reason = "prefer explicit inner type default" },
|
||||
{ path = "std::rc::Rc::default()", reason = "prefer explicit inner type default" },
|
||||
]
|
||||
|
|
|
@ -1,3 +1,12 @@
|
|||
version: "0.2"
|
||||
words:
|
||||
- actix
|
||||
- addrs
|
||||
- bytestring
|
||||
- httparse
|
||||
- msrv
|
||||
- realip
|
||||
- rustls
|
||||
- rustup
|
||||
- serde
|
||||
- zstd
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: cargo
|
||||
directory: /
|
||||
schedule:
|
||||
interval: weekly
|
||||
- package-ecosystem: github-actions
|
||||
directory: /
|
||||
schedule:
|
||||
interval: weekly
|
||||
- package-ecosystem: cargo
|
||||
directory: /
|
||||
schedule:
|
||||
interval: weekly
|
||||
versioning-strategy: lockfile-only
|
||||
|
|
|
@ -44,12 +44,12 @@ jobs:
|
|||
echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
|
||||
|
||||
- name: Install Rust (${{ matrix.version.name }})
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
with:
|
||||
toolchain: ${{ matrix.version.version }}
|
||||
|
||||
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
|
||||
uses: taiki-e/install-action@v2.49.50
|
||||
uses: taiki-e/install-action@v2.50.10
|
||||
with:
|
||||
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
|
||||
|
||||
|
@ -80,10 +80,10 @@ jobs:
|
|||
uses: rui314/setup-mold@v1
|
||||
|
||||
- name: Install Rust
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
|
||||
- name: Install just, cargo-hack
|
||||
uses: taiki-e/install-action@v2.49.50
|
||||
uses: taiki-e/install-action@v2.50.10
|
||||
with:
|
||||
tool: just,cargo-hack
|
||||
|
||||
|
|
|
@ -59,12 +59,12 @@ jobs:
|
|||
uses: rui314/setup-mold@v1
|
||||
|
||||
- name: Install Rust (${{ matrix.version.name }})
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
with:
|
||||
toolchain: ${{ matrix.version.version }}
|
||||
|
||||
- name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
|
||||
uses: taiki-e/install-action@v2.49.50
|
||||
uses: taiki-e/install-action@v2.50.10
|
||||
with:
|
||||
tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
|
||||
|
||||
|
@ -92,7 +92,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install Rust
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
with:
|
||||
toolchain: nightly
|
||||
|
||||
|
@ -108,12 +108,12 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install Rust (nightly)
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
with:
|
||||
toolchain: nightly
|
||||
|
||||
- name: Install just
|
||||
uses: taiki-e/install-action@v2.49.50
|
||||
uses: taiki-e/install-action@v2.50.10
|
||||
with:
|
||||
tool: just
|
||||
|
||||
|
|
|
@ -18,13 +18,13 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install Rust (nightly)
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
with:
|
||||
toolchain: nightly
|
||||
components: llvm-tools
|
||||
|
||||
- name: Install just, cargo-llvm-cov, cargo-nextest
|
||||
uses: taiki-e/install-action@v2.49.50
|
||||
uses: taiki-e/install-action@v2.50.10
|
||||
with:
|
||||
tool: just,cargo-llvm-cov,cargo-nextest
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install Rust (nightly)
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
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.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
with:
|
||||
components: clippy
|
||||
|
||||
|
@ -55,7 +55,7 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install Rust (nightly)
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
with:
|
||||
toolchain: nightly
|
||||
components: rust-docs
|
||||
|
@ -72,12 +72,12 @@ jobs:
|
|||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install Rust (${{ vars.RUST_VERSION_EXTERNAL_TYPES }})
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1.12.0
|
||||
with:
|
||||
toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
|
||||
|
||||
- name: Install just
|
||||
uses: taiki-e/install-action@v2.49.50
|
||||
uses: taiki-e/install-action@v2.50.10
|
||||
with:
|
||||
tool: just
|
||||
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
exclude = ["target/*"]
|
||||
include = ["**/*.toml"]
|
||||
|
||||
[formatting]
|
||||
column_width = 100
|
||||
align_comments = false
|
||||
|
||||
[[rule]]
|
||||
include = ["**/Cargo.toml"]
|
||||
keys = ["features"]
|
||||
formatting.column_width = 105
|
||||
formatting.reorder_keys = false
|
||||
|
||||
[[rule]]
|
||||
include = ["**/Cargo.toml"]
|
||||
keys = [
|
||||
"dependencies",
|
||||
"*-dependencies",
|
||||
"workspace.dependencies",
|
||||
"workspace.*-dependencies",
|
||||
"target.*.dependencies",
|
||||
"target.*.*-dependencies",
|
||||
]
|
||||
formatting.column_width = 120
|
||||
formatting.reorder_keys = true
|
||||
|
||||
[[rule]]
|
||||
include = ["**/Cargo.toml"]
|
||||
keys = [
|
||||
"dependencies.*",
|
||||
"*-dependencies.*",
|
||||
"workspace.dependencies.*",
|
||||
"workspace.*-dependencies.*",
|
||||
"target.*.dependencies",
|
||||
"target.*.*-dependencies",
|
||||
]
|
||||
formatting.column_width = 120
|
||||
formatting.reorder_keys = false
|
File diff suppressed because it is too large
Load Diff
22
Cargo.toml
22
Cargo.toml
|
@ -1,17 +1,17 @@
|
|||
[workspace]
|
||||
resolver = "2"
|
||||
members = [
|
||||
"actix-files",
|
||||
"actix-http-test",
|
||||
"actix-http",
|
||||
"actix-multipart",
|
||||
"actix-multipart-derive",
|
||||
"actix-router",
|
||||
"actix-test",
|
||||
"actix-web-actors",
|
||||
"actix-web-codegen",
|
||||
"actix-web",
|
||||
"awc",
|
||||
"actix-files",
|
||||
"actix-http-test",
|
||||
"actix-http",
|
||||
"actix-multipart",
|
||||
"actix-multipart-derive",
|
||||
"actix-router",
|
||||
"actix-test",
|
||||
"actix-web-actors",
|
||||
"actix-web-codegen",
|
||||
"actix-web",
|
||||
"awc",
|
||||
]
|
||||
|
||||
[workspace.package]
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
[package]
|
||||
name = "actix-files"
|
||||
version = "0.6.6"
|
||||
authors = [
|
||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||
"Rob Ede <robjtede@icloud.com>",
|
||||
]
|
||||
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
|
||||
description = "Static file serving for Actix Web"
|
||||
keywords = ["actix", "http", "async", "futures"]
|
||||
homepage = "https://actix.rs"
|
||||
|
@ -14,13 +11,7 @@ license = "MIT OR Apache-2.0"
|
|||
edition = "2021"
|
||||
|
||||
[package.metadata.cargo_check_external_types]
|
||||
allowed_external_types = [
|
||||
"actix_http::*",
|
||||
"actix_service::*",
|
||||
"actix_web::*",
|
||||
"http::*",
|
||||
"mime::*",
|
||||
]
|
||||
allowed_external_types = ["actix_http::*", "actix_service::*", "actix_web::*", "http::*", "mime::*"]
|
||||
|
||||
[features]
|
||||
experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
|
||||
|
@ -46,7 +37,7 @@ v_htmlescape = "0.15.5"
|
|||
# experimental-io-uring
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
tokio-uring = { version = "0.5", optional = true, features = ["bytes"] }
|
||||
actix-server = { version = "2.4", optional = true } # ensure matching tokio-uring versions
|
||||
actix-server = { version = "2.4", optional = true } # ensure matching tokio-uring versions
|
||||
|
||||
[dev-dependencies]
|
||||
actix-rt = "2.7"
|
||||
|
|
|
@ -7,10 +7,10 @@ keywords = ["http", "web", "framework", "async", "futures"]
|
|||
homepage = "https://actix.rs"
|
||||
repository = "https://github.com/actix/actix-web"
|
||||
categories = [
|
||||
"network-programming",
|
||||
"asynchronous",
|
||||
"web-programming::http-server",
|
||||
"web-programming::websocket",
|
||||
"network-programming",
|
||||
"asynchronous",
|
||||
"web-programming::http-server",
|
||||
"web-programming::websocket",
|
||||
]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
|
@ -20,14 +20,14 @@ features = []
|
|||
|
||||
[package.metadata.cargo_check_external_types]
|
||||
allowed_external_types = [
|
||||
"actix_codec::*",
|
||||
"actix_http::*",
|
||||
"actix_server::*",
|
||||
"awc::*",
|
||||
"bytes::*",
|
||||
"futures_core::*",
|
||||
"http::*",
|
||||
"tokio::*",
|
||||
"actix_codec::*",
|
||||
"actix_http::*",
|
||||
"actix_server::*",
|
||||
"awc::*",
|
||||
"bytes::*",
|
||||
"futures_core::*",
|
||||
"http::*",
|
||||
"tokio::*",
|
||||
]
|
||||
|
||||
[features]
|
||||
|
@ -37,25 +37,25 @@ default = []
|
|||
openssl = ["tls-openssl", "awc/openssl"]
|
||||
|
||||
[dependencies]
|
||||
actix-service = "2"
|
||||
actix-codec = "0.5"
|
||||
actix-tls = "3"
|
||||
actix-utils = "3"
|
||||
actix-rt = "2.2"
|
||||
actix-server = "2"
|
||||
actix-service = "2"
|
||||
actix-tls = "3"
|
||||
actix-utils = "3"
|
||||
awc = { version = "3", default-features = false }
|
||||
|
||||
bytes = "1"
|
||||
futures-core = { version = "0.3.17", default-features = false }
|
||||
http = "0.2.7"
|
||||
log = "0.4"
|
||||
socket2 = "0.5"
|
||||
serde = "1"
|
||||
serde_json = "1"
|
||||
slab = "0.4"
|
||||
serde_urlencoded = "0.7"
|
||||
slab = "0.4"
|
||||
socket2 = "0.5"
|
||||
tls-openssl = { version = "0.10.55", package = "openssl", optional = true }
|
||||
tokio = { version = "1.24.2", features = ["sync"] }
|
||||
tokio = { version = "1.38.2", features = ["sync"] }
|
||||
|
||||
[dev-dependencies]
|
||||
actix-http = "3"
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
|
||||
## Unreleased
|
||||
|
||||
## 3.11.0
|
||||
|
||||
- Update `brotli` dependency to `8`.
|
||||
|
||||
## 3.10.0
|
||||
|
||||
### Added
|
||||
|
|
|
@ -1,19 +1,16 @@
|
|||
[package]
|
||||
name = "actix-http"
|
||||
version = "3.10.0"
|
||||
authors = [
|
||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||
"Rob Ede <robjtede@icloud.com>",
|
||||
]
|
||||
version = "3.11.0"
|
||||
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
|
||||
description = "HTTP types and services for the Actix ecosystem"
|
||||
keywords = ["actix", "http", "framework", "async", "futures"]
|
||||
homepage = "https://actix.rs"
|
||||
repository = "https://github.com/actix/actix-web"
|
||||
categories = [
|
||||
"network-programming",
|
||||
"asynchronous",
|
||||
"web-programming::http-server",
|
||||
"web-programming::websocket",
|
||||
"network-programming",
|
||||
"asynchronous",
|
||||
"web-programming::http-server",
|
||||
"web-programming::websocket",
|
||||
]
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
|
@ -22,37 +19,37 @@ rust-version.workspace = true
|
|||
[package.metadata.docs.rs]
|
||||
rustdoc-args = ["--cfg", "docsrs"]
|
||||
features = [
|
||||
"http2",
|
||||
"ws",
|
||||
"openssl",
|
||||
"rustls-0_20",
|
||||
"rustls-0_21",
|
||||
"rustls-0_22",
|
||||
"rustls-0_23",
|
||||
"compress-brotli",
|
||||
"compress-gzip",
|
||||
"compress-zstd",
|
||||
"http2",
|
||||
"ws",
|
||||
"openssl",
|
||||
"rustls-0_20",
|
||||
"rustls-0_21",
|
||||
"rustls-0_22",
|
||||
"rustls-0_23",
|
||||
"compress-brotli",
|
||||
"compress-gzip",
|
||||
"compress-zstd",
|
||||
]
|
||||
|
||||
[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::*",
|
||||
"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]
|
||||
|
@ -62,12 +59,7 @@ default = []
|
|||
http2 = ["dep:h2"]
|
||||
|
||||
# WebSocket protocol implementation
|
||||
ws = [
|
||||
"dep:local-channel",
|
||||
"dep:base64",
|
||||
"dep:rand",
|
||||
"dep:sha1",
|
||||
]
|
||||
ws = ["dep:local-channel", "dep:base64", "dep:rand", "dep:sha1"]
|
||||
|
||||
# TLS via OpenSSL
|
||||
openssl = ["__tls", "actix-tls/accept", "actix-tls/openssl"]
|
||||
|
@ -89,8 +81,8 @@ rustls-0_23 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_23"]
|
|||
|
||||
# Compression codecs
|
||||
compress-brotli = ["__compress", "dep:brotli"]
|
||||
compress-gzip = ["__compress", "dep:flate2"]
|
||||
compress-zstd = ["__compress", "dep:zstd"]
|
||||
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.
|
||||
|
@ -101,10 +93,10 @@ __compress = []
|
|||
__tls = []
|
||||
|
||||
[dependencies]
|
||||
actix-service = "2"
|
||||
actix-codec = "0.5"
|
||||
actix-utils = "3"
|
||||
actix-rt = { version = "2.2", default-features = false }
|
||||
actix-service = "2"
|
||||
actix-utils = "3"
|
||||
|
||||
bitflags = "2"
|
||||
bytes = "1"
|
||||
|
@ -122,7 +114,7 @@ mime = "0.3.4"
|
|||
percent-encoding = "2.1"
|
||||
pin-project-lite = "0.2"
|
||||
smallvec = "1.6.1"
|
||||
tokio = { version = "1.24.2", features = [] }
|
||||
tokio = { version = "1.38.2", features = [] }
|
||||
tokio-util = { version = "0.7", features = ["io", "codec"] }
|
||||
tracing = { version = "0.1.30", default-features = false, features = ["log"] }
|
||||
|
||||
|
@ -130,8 +122,8 @@ tracing = { version = "0.1.30", default-features = false, features = ["log"] }
|
|||
h2 = { version = "0.3.26", optional = true }
|
||||
|
||||
# websockets
|
||||
local-channel = { version = "0.1", optional = true }
|
||||
base64 = { version = "0.22", optional = true }
|
||||
local-channel = { version = "0.1", optional = true }
|
||||
rand = { version = "0.9", optional = true }
|
||||
sha1 = { version = "0.10", optional = true }
|
||||
|
||||
|
@ -139,7 +131,7 @@ sha1 = { version = "0.10", optional = true }
|
|||
actix-tls = { version = "3.4", default-features = false, optional = true }
|
||||
|
||||
# compress-*
|
||||
brotli = { version = "7", optional = true }
|
||||
brotli = { version = "8", optional = true }
|
||||
flate2 = { version = "1.0.13", optional = true }
|
||||
zstd = { version = "0.13", optional = true }
|
||||
|
||||
|
@ -158,14 +150,14 @@ memchr = "2.4"
|
|||
once_cell = "1.21"
|
||||
rcgen = "0.13"
|
||||
regex = "1.3"
|
||||
rustversion = "1"
|
||||
rustls-pemfile = "2"
|
||||
rustversion = "1"
|
||||
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"] }
|
||||
tokio = { version = "1.38.2", features = ["net", "rt", "macros"] }
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
<!-- prettier-ignore-start -->
|
||||
|
||||
[](https://crates.io/crates/actix-http)
|
||||
[](https://docs.rs/actix-http/3.10.0)
|
||||
[](https://docs.rs/actix-http/3.11.0)
|
||||

|
||||

|
||||
<br />
|
||||
[](https://deps.rs/crate/actix-http/3.10.0)
|
||||
[](https://deps.rs/crate/actix-http/3.11.0)
|
||||
[](https://crates.io/crates/actix-http)
|
||||
[](https://discord.gg/NWpN5mmg3x)
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ async fn main() -> io::Result<()> {
|
|||
|
||||
actix_rt::time::sleep(Duration::from_secs(1)).await;
|
||||
|
||||
yield Err(io::Error::new(io::ErrorKind::Other, "abc"));
|
||||
yield Err(io::Error::other("abc"));
|
||||
})))
|
||||
})
|
||||
.tcp()
|
||||
|
|
|
@ -190,7 +190,7 @@ mod tests {
|
|||
|
||||
#[actix_rt::test]
|
||||
async fn to_body_limit_error() {
|
||||
let err_stream = stream::once(async { Err(io::Error::new(io::ErrorKind::Other, "")) });
|
||||
let err_stream = stream::once(async { Err(io::Error::other("")) });
|
||||
let body = SizedStream::new(8, err_stream);
|
||||
// not too big, but propagates error from body stream
|
||||
assert!(to_bytes_limited(body, 10).await.unwrap().is_err());
|
||||
|
|
|
@ -100,10 +100,7 @@ where
|
|||
loop {
|
||||
if let Some(ref mut fut) = this.fut {
|
||||
let (chunk, decoder) = ready!(Pin::new(fut).poll(cx)).map_err(|_| {
|
||||
PayloadError::Io(io::Error::new(
|
||||
io::ErrorKind::Other,
|
||||
"Blocking task was cancelled unexpectedly",
|
||||
))
|
||||
PayloadError::Io(io::Error::other("Blocking task was cancelled unexpectedly"))
|
||||
})??;
|
||||
|
||||
*this.decoder = Some(decoder);
|
||||
|
|
|
@ -183,8 +183,7 @@ where
|
|||
if let Some(ref mut fut) = this.fut {
|
||||
let mut encoder = ready!(Pin::new(fut).poll(cx))
|
||||
.map_err(|_| {
|
||||
EncoderError::Io(io::Error::new(
|
||||
io::ErrorKind::Other,
|
||||
EncoderError::Io(io::Error::other(
|
||||
"Blocking task was cancelled unexpectedly",
|
||||
))
|
||||
})?
|
||||
|
|
|
@ -415,7 +415,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_as_response() {
|
||||
let orig = io::Error::new(io::ErrorKind::Other, "other");
|
||||
let orig = io::Error::other("other");
|
||||
let err: Error = ParseError::Io(orig).into();
|
||||
assert_eq!(
|
||||
format!("{}", err),
|
||||
|
@ -425,14 +425,14 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_error_display() {
|
||||
let orig = io::Error::new(io::ErrorKind::Other, "other");
|
||||
let orig = io::Error::other("other");
|
||||
let err = Error::new_io().with_cause(orig);
|
||||
assert_eq!("connection error: other", err.to_string());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_error_http_response() {
|
||||
let orig = io::Error::new(io::ErrorKind::Other, "other");
|
||||
let orig = io::Error::other("other");
|
||||
let err = Error::new_io().with_cause(orig);
|
||||
let resp: Response<BoxBody> = err.into();
|
||||
assert_eq!(resp.status(), StatusCode::INTERNAL_SERVER_ERROR);
|
||||
|
@ -440,7 +440,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_payload_error() {
|
||||
let err: PayloadError = io::Error::new(io::ErrorKind::Other, "ParseError").into();
|
||||
let err: PayloadError = io::Error::other("ParseError").into();
|
||||
assert!(err.to_string().contains("ParseError"));
|
||||
|
||||
let err = PayloadError::Incomplete(None);
|
||||
|
@ -475,7 +475,7 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_from() {
|
||||
from_and_cause!(io::Error::new(io::ErrorKind::Other, "other") => ParseError::Io(..));
|
||||
from_and_cause!(io::Error::other("other") => ParseError::Io(..));
|
||||
from!(httparse::Error::HeaderName => ParseError::Header);
|
||||
from!(httparse::Error::HeaderName => ParseError::Header);
|
||||
from!(httparse::Error::HeaderValue => ParseError::Header);
|
||||
|
|
|
@ -310,10 +310,10 @@ impl MessageType for RequestHeadType {
|
|||
Version::HTTP_11 => "HTTP/1.1",
|
||||
Version::HTTP_2 => "HTTP/2.0",
|
||||
Version::HTTP_3 => "HTTP/3.0",
|
||||
_ => return Err(io::Error::new(io::ErrorKind::Other, "unsupported version")),
|
||||
_ => return Err(io::Error::other("Unsupported version")),
|
||||
}
|
||||
)
|
||||
.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
|
||||
.map_err(io::Error::other)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -433,7 +433,7 @@ impl TransferEncoding {
|
|||
buf.extend_from_slice(b"0\r\n\r\n");
|
||||
} else {
|
||||
writeln!(helpers::MutWriter(buf), "{:X}\r", msg.len())
|
||||
.map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
|
||||
.map_err(io::Error::other)?;
|
||||
|
||||
buf.reserve(msg.len() + 2);
|
||||
buf.extend_from_slice(msg);
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
name = "actix-multipart"
|
||||
version = "0.7.2"
|
||||
authors = [
|
||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||
"Jacob Halsey <jacob@jhalsey.com>",
|
||||
"Rob Ede <robjtede@icloud.com>",
|
||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||
"Jacob Halsey <jacob@jhalsey.com>",
|
||||
"Rob Ede <robjtede@icloud.com>",
|
||||
]
|
||||
description = "Multipart request & form support for Actix Web"
|
||||
keywords = ["http", "actix", "web", "multipart", "form"]
|
||||
|
@ -19,17 +19,17 @@ 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::*",
|
||||
"actix_http::*",
|
||||
"actix_multipart_derive::*",
|
||||
"actix_utils::*",
|
||||
"actix_web::*",
|
||||
"bytes::*",
|
||||
"futures_core::*",
|
||||
"mime::*",
|
||||
"serde_json::*",
|
||||
"serde_plain::*",
|
||||
"serde::*",
|
||||
"tempfile::*",
|
||||
]
|
||||
|
||||
[features]
|
||||
|
@ -55,7 +55,7 @@ serde = "1"
|
|||
serde_json = "1"
|
||||
serde_plain = "1"
|
||||
tempfile = { version = "3.4", optional = true }
|
||||
tokio = { version = "1.24.2", features = ["sync", "io-util"] }
|
||||
tokio = { version = "1.38.2", features = ["sync", "io-util"] }
|
||||
|
||||
[dev-dependencies]
|
||||
actix-http = "3"
|
||||
|
@ -66,10 +66,10 @@ 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"
|
||||
futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
|
||||
multer = "3"
|
||||
tokio = { version = "1.24.2", features = ["sync"] }
|
||||
tokio = { version = "1.38.2", features = ["sync"] }
|
||||
tokio-stream = "0.1"
|
||||
|
||||
[lints]
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
name = "actix-router"
|
||||
version = "0.5.3"
|
||||
authors = [
|
||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||
"Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>",
|
||||
"Rob Ede <robjtede@icloud.com>",
|
||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||
"Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>",
|
||||
"Rob Ede <robjtede@icloud.com>",
|
||||
]
|
||||
description = "Resource path matching and router"
|
||||
keywords = ["actix", "router", "routing"]
|
||||
|
@ -13,10 +13,7 @@ license = "MIT OR Apache-2.0"
|
|||
edition = "2021"
|
||||
|
||||
[package.metadata.cargo_check_external_types]
|
||||
allowed_external_types = [
|
||||
"http::*",
|
||||
"serde::*",
|
||||
]
|
||||
allowed_external_types = ["http::*", "serde::*"]
|
||||
|
||||
[features]
|
||||
default = ["http", "unicode"]
|
||||
|
@ -35,8 +32,8 @@ tracing = { version = "0.1.30", default-features = false, features = ["log"] }
|
|||
[dev-dependencies]
|
||||
criterion = { version = "0.5", features = ["html_reports"] }
|
||||
http = "0.2.7"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
percent-encoding = "2.1"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
@ -1,37 +1,34 @@
|
|||
[package]
|
||||
name = "actix-test"
|
||||
version = "0.1.5"
|
||||
authors = [
|
||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||
"Rob Ede <robjtede@icloud.com>",
|
||||
]
|
||||
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
|
||||
description = "Integration testing tools for Actix Web applications"
|
||||
keywords = ["http", "web", "framework", "async", "futures"]
|
||||
homepage = "https://actix.rs"
|
||||
repository = "https://github.com/actix/actix-web"
|
||||
categories = [
|
||||
"network-programming",
|
||||
"asynchronous",
|
||||
"web-programming::http-server",
|
||||
"web-programming::websocket",
|
||||
"network-programming",
|
||||
"asynchronous",
|
||||
"web-programming::http-server",
|
||||
"web-programming::websocket",
|
||||
]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
|
||||
[package.metadata.cargo_check_external_types]
|
||||
allowed_external_types = [
|
||||
"actix_codec::*",
|
||||
"actix_http_test::*",
|
||||
"actix_http::*",
|
||||
"actix_service::*",
|
||||
"actix_web::*",
|
||||
"awc::*",
|
||||
"bytes::*",
|
||||
"futures_core::*",
|
||||
"http::*",
|
||||
"openssl::*",
|
||||
"rustls::*",
|
||||
"tokio::*",
|
||||
"actix_codec::*",
|
||||
"actix_http_test::*",
|
||||
"actix_http::*",
|
||||
"actix_service::*",
|
||||
"actix_web::*",
|
||||
"awc::*",
|
||||
"bytes::*",
|
||||
"futures_core::*",
|
||||
"http::*",
|
||||
"openssl::*",
|
||||
"rustls::*",
|
||||
"tokio::*",
|
||||
]
|
||||
|
||||
[features]
|
||||
|
@ -72,7 +69,7 @@ tls-rustls-0_20 = { package = "rustls", version = "0.20", optional = true }
|
|||
tls-rustls-0_21 = { package = "rustls", version = "0.21", optional = true }
|
||||
tls-rustls-0_22 = { package = "rustls", version = "0.22", optional = true }
|
||||
tls-rustls-0_23 = { package = "rustls", version = "0.23", default-features = false, optional = true }
|
||||
tokio = { version = "1.24.2", features = ["sync"] }
|
||||
tokio = { version = "1.38.2", features = ["sync"] }
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
@ -12,12 +12,12 @@ rust-version.workspace = true
|
|||
|
||||
[package.metadata.cargo_check_external_types]
|
||||
allowed_external_types = [
|
||||
"actix::*",
|
||||
"actix_http::*",
|
||||
"actix_web::*",
|
||||
"bytes::*",
|
||||
"bytestring::*",
|
||||
"futures_core::*",
|
||||
"actix::*",
|
||||
"actix_http::*",
|
||||
"actix_web::*",
|
||||
"bytes::*",
|
||||
"bytestring::*",
|
||||
"futures_core::*",
|
||||
]
|
||||
|
||||
[dependencies]
|
||||
|
@ -30,14 +30,14 @@ bytes = "1"
|
|||
bytestring = "1"
|
||||
futures-core = { version = "0.3.17", default-features = false }
|
||||
pin-project-lite = "0.2"
|
||||
tokio = { version = "1.24.2", features = ["sync"] }
|
||||
tokio = { version = "1.38.2", features = ["sync"] }
|
||||
tokio-util = { version = "0.7", features = ["codec"] }
|
||||
|
||||
[dev-dependencies]
|
||||
actix-rt = "2.2"
|
||||
actix-test = "0.1"
|
||||
awc = { version = "3", default-features = false }
|
||||
actix-web = { version = "4", features = ["macros"] }
|
||||
awc = { version = "3", default-features = false }
|
||||
|
||||
env_logger = "0.11"
|
||||
futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
|
||||
|
|
|
@ -776,10 +776,7 @@ where
|
|||
}
|
||||
Poll::Pending => break,
|
||||
Poll::Ready(Some(Err(err))) => {
|
||||
return Poll::Ready(Some(Err(ProtocolError::Io(io::Error::new(
|
||||
io::ErrorKind::Other,
|
||||
format!("{err}"),
|
||||
)))));
|
||||
return Poll::Ready(Some(Err(ProtocolError::Io(io::Error::other(err)))));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -795,11 +792,10 @@ where
|
|||
}
|
||||
Some(frm) => {
|
||||
let msg = match frm {
|
||||
Frame::Text(data) => {
|
||||
Message::Text(ByteString::try_from(data).map_err(|err| {
|
||||
ProtocolError::Io(io::Error::new(io::ErrorKind::Other, err))
|
||||
})?)
|
||||
}
|
||||
Frame::Text(data) => Message::Text(
|
||||
ByteString::try_from(data)
|
||||
.map_err(|err| ProtocolError::Io(io::Error::other(err)))?,
|
||||
),
|
||||
Frame::Binary(data) => Message::Binary(data),
|
||||
Frame::Ping(s) => Message::Ping(s),
|
||||
Frame::Pong(s) => Message::Pong(s),
|
||||
|
|
|
@ -2,10 +2,7 @@
|
|||
name = "actix-web-codegen"
|
||||
version = "4.3.0"
|
||||
description = "Routing and runtime macros for Actix Web"
|
||||
authors = [
|
||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||
"Rob Ede <robjtede@icloud.com>",
|
||||
]
|
||||
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
|
||||
homepage.workspace = true
|
||||
repository.workspace = true
|
||||
license.workspace = true
|
||||
|
@ -33,8 +30,8 @@ actix-utils = "3"
|
|||
actix-web = "4"
|
||||
|
||||
futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
|
||||
trybuild = "1"
|
||||
rustversion-msrv = "0.100"
|
||||
trybuild = "1"
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
@ -2,7 +2,18 @@
|
|||
|
||||
## Unreleased
|
||||
|
||||
- Add `resources-introspection` feature for retrieving configured route paths and HTTP methods.
|
||||
- Add `experimental-introspection` feature for retrieving configured route paths and HTTP methods.
|
||||
|
||||
## 4.11.0
|
||||
|
||||
- Add `Logger::log_level()` method.
|
||||
- Improve handling of non-UTF-8 header values in `Logger` middleware.
|
||||
- Add `HttpServer::shutdown_signal()` method.
|
||||
- Mark `HttpServer` as `#[must_use]`.
|
||||
- Allow SVG images to be compressed by the `Compress` middleware.
|
||||
- Ignore `Host` header in `Host` guard when connection protocol is HTTP/2.
|
||||
- Re-export `mime` dependency.
|
||||
- Update `brotli` dependency to `8`.
|
||||
|
||||
## 4.10.2
|
||||
|
||||
|
|
|
@ -1,17 +1,14 @@
|
|||
[package]
|
||||
name = "actix-web"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0"
|
||||
description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
|
||||
authors = [
|
||||
"Nikolay Kim <fafhrd91@gmail.com>",
|
||||
"Rob Ede <robjtede@icloud.com>",
|
||||
]
|
||||
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
|
||||
keywords = ["actix", "http", "web", "framework", "async"]
|
||||
categories = [
|
||||
"network-programming",
|
||||
"asynchronous",
|
||||
"web-programming::http-server",
|
||||
"web-programming::websocket"
|
||||
"network-programming",
|
||||
"asynchronous",
|
||||
"web-programming::http-server",
|
||||
"web-programming::websocket",
|
||||
]
|
||||
homepage = "https://actix.rs"
|
||||
repository = "https://github.com/actix/actix-web"
|
||||
|
@ -22,55 +19,55 @@ rust-version.workspace = true
|
|||
[package.metadata.docs.rs]
|
||||
rustdoc-args = ["--cfg", "docsrs"]
|
||||
features = [
|
||||
"macros",
|
||||
"openssl",
|
||||
"rustls-0_20",
|
||||
"rustls-0_21",
|
||||
"rustls-0_22",
|
||||
"rustls-0_23",
|
||||
"compress-brotli",
|
||||
"compress-gzip",
|
||||
"compress-zstd",
|
||||
"cookies",
|
||||
"secure-cookies",
|
||||
"macros",
|
||||
"openssl",
|
||||
"rustls-0_20",
|
||||
"rustls-0_21",
|
||||
"rustls-0_22",
|
||||
"rustls-0_23",
|
||||
"compress-brotli",
|
||||
"compress-gzip",
|
||||
"compress-zstd",
|
||||
"cookies",
|
||||
"secure-cookies",
|
||||
]
|
||||
|
||||
[package.metadata.cargo_check_external_types]
|
||||
allowed_external_types = [
|
||||
"actix_http::*",
|
||||
"actix_router::*",
|
||||
"actix_rt::*",
|
||||
"actix_server::*",
|
||||
"actix_service::*",
|
||||
"actix_utils::*",
|
||||
"actix_web_codegen::*",
|
||||
"bytes::*",
|
||||
"cookie::*",
|
||||
"cookie",
|
||||
"futures_core::*",
|
||||
"http::*",
|
||||
"language_tags::*",
|
||||
"mime::*",
|
||||
"openssl::*",
|
||||
"rustls::*",
|
||||
"serde_json::*",
|
||||
"serde_urlencoded::*",
|
||||
"serde::*",
|
||||
"serde::*",
|
||||
"tokio::*",
|
||||
"url::*",
|
||||
"actix_http::*",
|
||||
"actix_router::*",
|
||||
"actix_rt::*",
|
||||
"actix_server::*",
|
||||
"actix_service::*",
|
||||
"actix_utils::*",
|
||||
"actix_web_codegen::*",
|
||||
"bytes::*",
|
||||
"cookie::*",
|
||||
"cookie",
|
||||
"futures_core::*",
|
||||
"http::*",
|
||||
"language_tags::*",
|
||||
"mime::*",
|
||||
"openssl::*",
|
||||
"rustls::*",
|
||||
"serde_json::*",
|
||||
"serde_urlencoded::*",
|
||||
"serde::*",
|
||||
"serde::*",
|
||||
"tokio::*",
|
||||
"url::*",
|
||||
]
|
||||
|
||||
[features]
|
||||
default = [
|
||||
"macros",
|
||||
"compress-brotli",
|
||||
"compress-gzip",
|
||||
"compress-zstd",
|
||||
"cookies",
|
||||
"http2",
|
||||
"unicode",
|
||||
"compat",
|
||||
"macros",
|
||||
"compress-brotli",
|
||||
"compress-gzip",
|
||||
"compress-zstd",
|
||||
"cookies",
|
||||
"http2",
|
||||
"unicode",
|
||||
"compat",
|
||||
]
|
||||
|
||||
# Brotli algorithm content-encoding support
|
||||
|
@ -121,26 +118,24 @@ __tls = []
|
|||
experimental-io-uring = ["actix-server/io-uring"]
|
||||
|
||||
# Feature group which, when disabled, helps migrate code to v5.0.
|
||||
compat = [
|
||||
"compat-routing-macros-force-pub",
|
||||
]
|
||||
compat = ["compat-routing-macros-force-pub"]
|
||||
|
||||
# Opt-out forwards-compatibility for handler visibility inheritance fix.
|
||||
compat-routing-macros-force-pub = ["actix-web-codegen?/compat-routing-macros-force-pub"]
|
||||
|
||||
# Enabling the retrieval of metadata for initialized resources, including path and HTTP method.
|
||||
resources-introspection = []
|
||||
experimental-introspection = []
|
||||
|
||||
[dependencies]
|
||||
actix-codec = "0.5"
|
||||
actix-macros = { version = "0.2.3", optional = true }
|
||||
actix-rt = { version = "2.6", default-features = false }
|
||||
actix-server = "2"
|
||||
actix-server = "2.6"
|
||||
actix-service = "2"
|
||||
actix-utils = "3"
|
||||
actix-tls = { version = "3.4", default-features = false, optional = true }
|
||||
actix-utils = "3"
|
||||
|
||||
actix-http = { version = "3.10", features = ["ws"] }
|
||||
actix-http = { version = "3.11", features = ["ws"] }
|
||||
actix-router = { version = "0.5.3", default-features = false, features = ["http"] }
|
||||
actix-web-codegen = { version = "4.3", optional = true, default-features = false }
|
||||
|
||||
|
@ -153,8 +148,8 @@ encoding_rs = "0.8"
|
|||
foldhash = "0.1"
|
||||
futures-core = { version = "0.3.17", default-features = false }
|
||||
futures-util = { version = "0.3.17", default-features = false }
|
||||
itoa = "1"
|
||||
impl-more = "0.1.4"
|
||||
itoa = "1"
|
||||
language-tags = "0.3"
|
||||
log = "0.4"
|
||||
mime = "0.3"
|
||||
|
@ -166,18 +161,18 @@ serde = "1.0"
|
|||
serde_json = "1.0"
|
||||
serde_urlencoded = "0.7"
|
||||
smallvec = "1.6.1"
|
||||
tracing = "0.1.30"
|
||||
socket2 = "0.5"
|
||||
time = { version = "0.3", default-features = false, features = ["formatting"] }
|
||||
url = "2.1"
|
||||
tracing = "0.1.30"
|
||||
url = "2.5.4"
|
||||
|
||||
[dev-dependencies]
|
||||
actix-files = "0.6"
|
||||
actix-test = { version = "0.1", features = ["openssl", "rustls-0_23"] }
|
||||
awc = { version = "3", features = ["openssl"] }
|
||||
|
||||
brotli = "7"
|
||||
const-str = "0.5"
|
||||
brotli = "8"
|
||||
const-str = "0.5" # TODO(MSRV 1.77): update to 0.6
|
||||
core_affinity = "0.8"
|
||||
criterion = { version = "0.5", features = ["html_reports"] }
|
||||
env_logger = "0.11"
|
||||
|
@ -190,7 +185,8 @@ serde = { version = "1", features = ["derive"] }
|
|||
static_assertions = "1"
|
||||
tls-openssl = { package = "openssl", version = "0.10.55" }
|
||||
tls-rustls = { package = "rustls", version = "0.23" }
|
||||
tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros"] }
|
||||
tokio = { version = "1.38.2", features = ["rt-multi-thread", "macros"] }
|
||||
tokio-util = "0.7"
|
||||
zstd = "0.13"
|
||||
|
||||
[lints]
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
<!-- prettier-ignore-start -->
|
||||
|
||||
[](https://crates.io/crates/actix-web)
|
||||
[](https://docs.rs/actix-web/4.10.2)
|
||||
[](https://docs.rs/actix-web/4.11.0)
|
||||

|
||||

|
||||
[](https://deps.rs/crate/actix-web/4.10.2)
|
||||
[](https://deps.rs/crate/actix-web/4.11.0)
|
||||
<br />
|
||||
[](https://github.com/actix/actix-web/actions/workflows/ci.yml)
|
||||
[](https://codecov.io/gh/actix/actix-web)
|
||||
|
|
|
@ -0,0 +1,206 @@
|
|||
// NOTE: This is a work-in-progress example being used to test the new implementation
|
||||
// of the experimental introspection feature.
|
||||
// `cargo run --features experimental-introspection --example introspection`
|
||||
|
||||
use actix_web::{dev::Service, guard, web, App, HttpResponse, HttpServer, Responder};
|
||||
use serde::Deserialize;
|
||||
// Custom guard that checks if the Content-Type header is present.
|
||||
struct ContentTypeGuard;
|
||||
|
||||
impl guard::Guard for ContentTypeGuard {
|
||||
fn check(&self, req: &guard::GuardContext<'_>) -> bool {
|
||||
req.head()
|
||||
.headers()
|
||||
.contains_key(actix_web::http::header::CONTENT_TYPE)
|
||||
}
|
||||
}
|
||||
|
||||
// Data structure for endpoints that receive JSON.
|
||||
#[derive(Deserialize)]
|
||||
struct UserInfo {
|
||||
username: String,
|
||||
age: u8,
|
||||
}
|
||||
|
||||
#[actix_web::main]
|
||||
async fn main() -> std::io::Result<()> {
|
||||
let server = HttpServer::new(|| {
|
||||
let app = App::new()
|
||||
.service(
|
||||
web::scope("/api")
|
||||
.service(
|
||||
web::scope("/v1")
|
||||
// GET /api/v1/item/{id}: returns the item id from the path.
|
||||
.service(get_item)
|
||||
// POST /api/v1/info: accepts JSON and returns user info.
|
||||
.service(post_user_info)
|
||||
// /api/v1/guarded: only accessible if Content-Type header is present.
|
||||
.route(
|
||||
"/guarded",
|
||||
web::route().guard(ContentTypeGuard).to(guarded_handler),
|
||||
),
|
||||
)
|
||||
// API scope /api/v2: additional endpoint.
|
||||
.service(web::scope("/v2").route("/hello", web::get().to(hello_v2))),
|
||||
)
|
||||
// Scope /v1 outside /api: exposes only GET /v1/item/{id}.
|
||||
.service(web::scope("/v1").service(get_item))
|
||||
// Scope /admin: admin endpoints with different HTTP methods.
|
||||
.service(
|
||||
web::scope("/admin")
|
||||
.route("/dashboard", web::get().to(admin_dashboard))
|
||||
// Single route handling multiple methods using separate handlers.
|
||||
.service(
|
||||
web::resource("/settings")
|
||||
.route(web::get().to(get_settings))
|
||||
.route(web::post().to(update_settings)),
|
||||
),
|
||||
)
|
||||
// Root resource: supports GET and POST on "/".
|
||||
.service(
|
||||
web::resource("/")
|
||||
.route(web::get().to(root_index))
|
||||
.route(web::post().to(root_index)),
|
||||
)
|
||||
// Additional endpoints configured in a separate function.
|
||||
.configure(extra_endpoints)
|
||||
// Endpoint that rejects GET on /not_guard (allows other methods).
|
||||
.route(
|
||||
"/not_guard",
|
||||
web::route()
|
||||
.guard(guard::Not(guard::Get()))
|
||||
.to(HttpResponse::MethodNotAllowed),
|
||||
)
|
||||
// Endpoint that requires GET, content-type: plain/text header, and/or POST on /all_guard.
|
||||
.route(
|
||||
"/all_guard",
|
||||
web::route()
|
||||
.guard(
|
||||
guard::All(guard::Get())
|
||||
.and(guard::Header("content-type", "plain/text"))
|
||||
.and(guard::Any(guard::Post())),
|
||||
)
|
||||
.to(HttpResponse::MethodNotAllowed),
|
||||
);
|
||||
|
||||
/*#[cfg(feature = "experimental-introspection")]
|
||||
{
|
||||
actix_web::introspection::introspect();
|
||||
}*/
|
||||
// TODO: Enable introspection without the feature flag.
|
||||
app
|
||||
})
|
||||
.workers(5)
|
||||
.bind("127.0.0.1:8080")?;
|
||||
|
||||
server.run().await
|
||||
}
|
||||
|
||||
// GET /api/v1/item/{id} and GET /v1/item/{id}
|
||||
// Returns a message with the provided id.
|
||||
#[actix_web::get("/item/{id:\\d+}")]
|
||||
async fn get_item(path: web::Path<u32>) -> impl Responder {
|
||||
let id = path.into_inner();
|
||||
HttpResponse::Ok().body(format!("Requested item with id: {}", id))
|
||||
}
|
||||
|
||||
// POST /api/v1/info
|
||||
// Expects JSON and responds with the received user info.
|
||||
#[actix_web::post("/info")]
|
||||
async fn post_user_info(info: web::Json<UserInfo>) -> impl Responder {
|
||||
HttpResponse::Ok().json(format!(
|
||||
"User {} with age {} received",
|
||||
info.username, info.age
|
||||
))
|
||||
}
|
||||
|
||||
// /api/v1/guarded
|
||||
// Uses a custom guard that requires the Content-Type header.
|
||||
async fn guarded_handler() -> impl Responder {
|
||||
HttpResponse::Ok().body("Passed the Content-Type guard!")
|
||||
}
|
||||
|
||||
// GET /api/v2/hello
|
||||
// Simple greeting endpoint.
|
||||
async fn hello_v2() -> impl Responder {
|
||||
HttpResponse::Ok().body("Hello from API v2!")
|
||||
}
|
||||
|
||||
// GET /admin/dashboard
|
||||
// Returns a message for the admin dashboard.
|
||||
async fn admin_dashboard() -> impl Responder {
|
||||
HttpResponse::Ok().body("Welcome to the Admin Dashboard!")
|
||||
}
|
||||
|
||||
// GET /admin/settings
|
||||
// Returns the current admin settings.
|
||||
async fn get_settings() -> impl Responder {
|
||||
HttpResponse::Ok().body("Current settings: ...")
|
||||
}
|
||||
|
||||
// POST /admin/settings
|
||||
// Updates the admin settings.
|
||||
async fn update_settings() -> impl Responder {
|
||||
HttpResponse::Ok().body("Settings have been updated!")
|
||||
}
|
||||
|
||||
// GET and POST on /
|
||||
// Generic root endpoint.
|
||||
async fn root_index() -> impl Responder {
|
||||
HttpResponse::Ok().body("Welcome to the Root Endpoint!")
|
||||
}
|
||||
|
||||
// Additional endpoints configured in a separate function.
|
||||
fn extra_endpoints(cfg: &mut web::ServiceConfig) {
|
||||
cfg.service(
|
||||
web::scope("/extra")
|
||||
// GET /extra/ping: simple ping endpoint.
|
||||
.route(
|
||||
"/ping",
|
||||
web::get().to(|| async { HttpResponse::Ok().body("pong") }),
|
||||
)
|
||||
// /extra/multi: resource that supports GET and POST.
|
||||
.service(
|
||||
web::resource("/multi")
|
||||
.route(
|
||||
web::get().to(|| async {
|
||||
HttpResponse::Ok().body("GET response from /extra/multi")
|
||||
}),
|
||||
)
|
||||
.route(web::post().to(|| async {
|
||||
HttpResponse::Ok().body("POST response from /extra/multi")
|
||||
})),
|
||||
)
|
||||
// /extra/{entities_id}/secure: nested scope with GET and POST, prints the received id.
|
||||
.service(
|
||||
web::scope("{entities_id:\\d+}")
|
||||
.service(
|
||||
web::scope("/secure")
|
||||
.route(
|
||||
"",
|
||||
web::get().to(|| async {
|
||||
HttpResponse::Ok().body("GET response from /extra/secure")
|
||||
}),
|
||||
)
|
||||
.route(
|
||||
"",
|
||||
web::post().to(|| async {
|
||||
HttpResponse::Ok().body("POST response from /extra/secure")
|
||||
}),
|
||||
),
|
||||
)
|
||||
// Middleware that prints the id received in the route.
|
||||
.wrap_fn(|req, srv| {
|
||||
println!(
|
||||
"Request to /extra/secure with id: {}",
|
||||
req.match_info().get("entities_id").unwrap()
|
||||
);
|
||||
let fut = srv.call(req);
|
||||
async move {
|
||||
let res = fut.await?;
|
||||
Ok(res)
|
||||
}
|
||||
}),
|
||||
),
|
||||
);
|
||||
}
|
|
@ -82,9 +82,6 @@ where
|
|||
|
||||
let (config, services) = config.into_services();
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
let mut rdef_methods: Vec<(String, Vec<String>)> = Vec::new();
|
||||
|
||||
// complete pipeline creation.
|
||||
*self.factory_ref.borrow_mut() = Some(AppRoutingFactory {
|
||||
default,
|
||||
|
@ -92,24 +89,35 @@ where
|
|||
.into_iter()
|
||||
.map(|(mut rdef, srv, guards, nested)| {
|
||||
rmap.add(&mut rdef, nested);
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
#[cfg(feature = "experimental-introspection")]
|
||||
{
|
||||
let http_methods: Vec<String> =
|
||||
guards.as_ref().map_or_else(Vec::new, |g| {
|
||||
g.iter()
|
||||
.flat_map(|g| {
|
||||
crate::guard::HttpMethodsExtractor::extract_http_methods(
|
||||
&**g,
|
||||
)
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
});
|
||||
|
||||
rdef_methods
|
||||
.push((rdef.pattern().unwrap_or_default().to_string(), http_methods));
|
||||
use std::borrow::Borrow;
|
||||
let pat = rdef.pattern().unwrap_or("").to_string();
|
||||
let mut methods = Vec::new();
|
||||
let mut guard_names = Vec::new();
|
||||
if let Some(gs) = guards.borrow().as_ref() {
|
||||
for g in gs.iter() {
|
||||
let name = g.name().to_string();
|
||||
if !guard_names.contains(&name) {
|
||||
guard_names.push(name.clone());
|
||||
}
|
||||
if let Some(details) = g.details() {
|
||||
for d in details {
|
||||
if let crate::guard::GuardDetail::HttpMethods(v) = d {
|
||||
for s in v {
|
||||
if let Ok(m) = s.parse() {
|
||||
if !methods.contains(&m) {
|
||||
methods.push(m);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
crate::introspection::register_pattern_detail(pat, methods, guard_names);
|
||||
}
|
||||
|
||||
(rdef, srv, RefCell::new(guards))
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
|
@ -126,11 +134,6 @@ where
|
|||
let rmap = Rc::new(rmap);
|
||||
ResourceMap::finish(&rmap);
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
{
|
||||
crate::introspection::process_introspection(Rc::clone(&rmap), rdef_methods);
|
||||
}
|
||||
|
||||
// construct all async data factory futures
|
||||
let factory_futs = join_all(self.async_data_factories.iter().map(|f| f()));
|
||||
|
||||
|
@ -156,6 +159,11 @@ where
|
|||
factory.create(&mut app_data);
|
||||
}
|
||||
|
||||
#[cfg(feature = "experimental-introspection")]
|
||||
{
|
||||
crate::introspection::register_rmap(&rmap);
|
||||
}
|
||||
|
||||
Ok(AppInitService {
|
||||
service,
|
||||
app_data: Rc::new(app_data),
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use actix_http::{header, uri::Uri, RequestHead};
|
||||
use actix_http::{header, uri::Uri, RequestHead, Version};
|
||||
|
||||
use super::{Guard, GuardContext};
|
||||
|
||||
|
@ -66,6 +66,7 @@ fn get_host_uri(req: &RequestHead) -> Option<Uri> {
|
|||
req.headers
|
||||
.get(header::HOST)
|
||||
.and_then(|host_value| host_value.to_str().ok())
|
||||
.filter(|_| req.version < Version::HTTP_2)
|
||||
.or_else(|| req.uri.host())
|
||||
.and_then(|host| host.parse().ok())
|
||||
}
|
||||
|
@ -123,6 +124,38 @@ mod tests {
|
|||
use super::*;
|
||||
use crate::test::TestRequest;
|
||||
|
||||
#[test]
|
||||
fn host_not_from_header_if_http2() {
|
||||
let req = TestRequest::default()
|
||||
.uri("www.rust-lang.org")
|
||||
.insert_header((
|
||||
header::HOST,
|
||||
header::HeaderValue::from_static("www.example.com"),
|
||||
))
|
||||
.to_srv_request();
|
||||
|
||||
let host = Host("www.example.com");
|
||||
assert!(host.check(&req.guard_ctx()));
|
||||
|
||||
let host = Host("www.rust-lang.org");
|
||||
assert!(!host.check(&req.guard_ctx()));
|
||||
|
||||
let req = TestRequest::default()
|
||||
.version(actix_http::Version::HTTP_2)
|
||||
.uri("www.rust-lang.org")
|
||||
.insert_header((
|
||||
header::HOST,
|
||||
header::HeaderValue::from_static("www.example.com"),
|
||||
))
|
||||
.to_srv_request();
|
||||
|
||||
let host = Host("www.example.com");
|
||||
assert!(!host.check(&req.guard_ctx()));
|
||||
|
||||
let host = Host("www.rust-lang.org");
|
||||
assert!(host.check(&req.guard_ctx()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn host_from_header() {
|
||||
let req = TestRequest::default()
|
||||
|
|
|
@ -397,35 +397,6 @@ impl Guard for MethodGuard {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
pub trait HttpMethodsExtractor {
|
||||
fn extract_http_methods(&self) -> Vec<String>;
|
||||
}
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
impl HttpMethodsExtractor for dyn Guard {
|
||||
fn extract_http_methods(&self) -> Vec<String> {
|
||||
let methods: Vec<String> = self
|
||||
.details()
|
||||
.unwrap_or_default()
|
||||
.iter()
|
||||
.flat_map(|detail| {
|
||||
if let GuardDetail::HttpMethods(methods) = detail {
|
||||
methods.clone()
|
||||
} else {
|
||||
vec!["UNKNOWN".to_string()]
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
|
||||
if methods.is_empty() {
|
||||
vec!["UNKNOWN".to_string()]
|
||||
} else {
|
||||
methods
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! method_guard {
|
||||
($method_fn:ident, $method_const:ident) => {
|
||||
#[doc = concat!("Creates a guard that matches the `", stringify!($method_const), "` request method.")]
|
||||
|
|
|
@ -70,7 +70,7 @@ use crate::{
|
|||
/// This is the source code for the 2-parameter implementation of `Handler` to help illustrate the
|
||||
/// bounds of the handler call after argument extraction:
|
||||
/// ```ignore
|
||||
/// impl<Func, Arg1, Arg2, Fut> Handler<(Arg1, Arg2)> for Func
|
||||
/// impl<Func, Fut, Arg1, Arg2> Handler<(Arg1, Arg2)> for Func
|
||||
/// where
|
||||
/// Func: Fn(Arg1, Arg2) -> Fut + Clone + 'static,
|
||||
/// Fut: Future,
|
||||
|
|
|
@ -158,7 +158,7 @@ impl ConnectionInfo {
|
|||
/// The address is resolved through the following, in order:
|
||||
/// - `Forwarded` header
|
||||
/// - `X-Forwarded-For` header
|
||||
/// - peer address of opened socket (same as [`remote_addr`](Self::remote_addr))
|
||||
/// - peer address of opened socket (same as [`peer_addr`](Self::peer_addr))
|
||||
///
|
||||
/// # Security
|
||||
/// Do not use this function for security purposes unless you can be sure that the `Forwarded`
|
||||
|
|
|
@ -1,494 +1,172 @@
|
|||
use std::{
|
||||
rc::Rc,
|
||||
sync::{OnceLock, RwLock},
|
||||
collections::HashMap,
|
||||
sync::{
|
||||
atomic::{AtomicBool, Ordering},
|
||||
Mutex, OnceLock,
|
||||
},
|
||||
thread,
|
||||
};
|
||||
|
||||
use crate::rmap::ResourceMap;
|
||||
use crate::{http::Method, rmap::ResourceMap};
|
||||
|
||||
/// Represents an HTTP resource registered for introspection.
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub struct ResourceIntrospection {
|
||||
/// HTTP method (e.g., "GET").
|
||||
pub method: String,
|
||||
/// Route path (e.g., "/api/v1/test").
|
||||
pub path: String,
|
||||
}
|
||||
|
||||
/// A global registry of listed resources for introspection.
|
||||
/// Only the designated thread can modify it.
|
||||
static RESOURCE_REGISTRY: RwLock<Vec<ResourceIntrospection>> = RwLock::new(Vec::new());
|
||||
|
||||
/// Stores the thread ID of the designated thread (the first to call `process_introspection`).
|
||||
/// Any other thread will immediately return without updating the global registry.
|
||||
static REGISTRY: OnceLock<Mutex<IntrospectionNode>> = OnceLock::new();
|
||||
static DETAIL_REGISTRY: OnceLock<Mutex<HashMap<String, RouteDetail>>> = OnceLock::new();
|
||||
static DESIGNATED_THREAD: OnceLock<thread::ThreadId> = OnceLock::new();
|
||||
static IS_INITIALIZED: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
/// Inserts a resource into the global registry, avoiding duplicates.
|
||||
pub fn register_resource(resource: ResourceIntrospection) {
|
||||
let mut global = RESOURCE_REGISTRY.write().unwrap();
|
||||
if !global.iter().any(|r| r == &resource) {
|
||||
global.push(resource);
|
||||
}
|
||||
pub fn initialize_registry() {
|
||||
REGISTRY.get_or_init(|| Mutex::new(IntrospectionNode::new(ResourceType::App, "".into())));
|
||||
}
|
||||
|
||||
/// Completes (updates) partial routes in the global registry whose path contains `marker`,
|
||||
/// by applying the specified `prefix`.
|
||||
pub fn complete_partial_routes_with_marker(marker: &str, prefix: &str) {
|
||||
let mut global = RESOURCE_REGISTRY.write().unwrap();
|
||||
pub fn get_registry() -> &'static Mutex<IntrospectionNode> {
|
||||
REGISTRY.get().expect("Registry not initialized")
|
||||
}
|
||||
|
||||
let mut updated = Vec::new();
|
||||
let mut remaining = Vec::new();
|
||||
pub fn initialize_detail_registry() {
|
||||
DETAIL_REGISTRY.get_or_init(|| Mutex::new(HashMap::new()));
|
||||
}
|
||||
|
||||
// Move all items out of the current registry.
|
||||
for resource in global.drain(..) {
|
||||
if resource.path.contains(marker) {
|
||||
// Build the full path by applying the prefix if needed.
|
||||
let full_path = if prefix.is_empty() {
|
||||
resource.path.clone()
|
||||
} else if prefix.ends_with('/') || resource.path.starts_with('/') {
|
||||
format!("{}{}", prefix, resource.path)
|
||||
} else {
|
||||
format!("{}/{}", prefix, resource.path)
|
||||
};
|
||||
pub fn get_detail_registry() -> &'static Mutex<HashMap<String, RouteDetail>> {
|
||||
DETAIL_REGISTRY
|
||||
.get()
|
||||
.expect("Detail registry not initialized")
|
||||
}
|
||||
|
||||
let completed = ResourceIntrospection {
|
||||
method: resource.method,
|
||||
path: full_path,
|
||||
};
|
||||
#[derive(Clone)]
|
||||
pub struct RouteDetail {
|
||||
methods: Vec<Method>,
|
||||
guards: Vec<String>,
|
||||
}
|
||||
|
||||
// Add to `updated` if it's not already in there.
|
||||
if !updated.iter().any(|r| r == &completed) {
|
||||
updated.push(completed);
|
||||
}
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum ResourceType {
|
||||
App,
|
||||
Scope,
|
||||
Resource,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct IntrospectionNode {
|
||||
pub kind: ResourceType,
|
||||
pub pattern: String,
|
||||
pub methods: Vec<Method>,
|
||||
pub guards: Vec<String>,
|
||||
pub children: Vec<IntrospectionNode>,
|
||||
}
|
||||
|
||||
impl IntrospectionNode {
|
||||
pub fn new(kind: ResourceType, pattern: String) -> Self {
|
||||
IntrospectionNode {
|
||||
kind,
|
||||
pattern,
|
||||
methods: Vec::new(),
|
||||
guards: Vec::new(),
|
||||
children: Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn display(&self, indent: usize, parent_path: &str) {
|
||||
let full_path = if parent_path.is_empty() {
|
||||
self.pattern.clone()
|
||||
} else {
|
||||
// Keep this resource as-is.
|
||||
remaining.push(resource);
|
||||
}
|
||||
}
|
||||
format!(
|
||||
"{}/{}",
|
||||
parent_path.trim_end_matches('/'),
|
||||
self.pattern.trim_start_matches('/')
|
||||
)
|
||||
};
|
||||
|
||||
// Merge updated items back with the remaining ones.
|
||||
remaining.extend(updated);
|
||||
*global = remaining;
|
||||
}
|
||||
|
||||
/// Returns a **copy** of the global registry (safe to call from any thread).
|
||||
pub fn get_registered_resources() -> Vec<ResourceIntrospection> {
|
||||
RESOURCE_REGISTRY.read().unwrap().clone()
|
||||
}
|
||||
|
||||
/// Processes introspection data for routes and methods.
|
||||
/// Only the **first thread** that calls this function (the "designated" one) may update
|
||||
/// the global resource registry. Any other thread will immediately return without updating it.
|
||||
///
|
||||
/// # Parameters
|
||||
/// - `rmap`: A resource map convertible to a vector of route strings.
|
||||
/// - `rdef_methods`: A vector of `(sub_path, [methods])`.
|
||||
/// - A tuple with an **empty** methods vector is treated as a "marker" (a partial route)
|
||||
/// for which we try to deduce a prefix by finding `sub_path` in a route, then calling
|
||||
/// `complete_partial_routes_with_marker`.
|
||||
/// - A tuple with one or more methods registers a resource with `register_resource`.
|
||||
pub fn process_introspection(rmap: Rc<ResourceMap>, rdef_methods: Vec<(String, Vec<String>)>) {
|
||||
// Determine the designated thread: if none is set yet, assign the current thread's ID.
|
||||
// This ensures that the first thread to call this function becomes the designated thread.
|
||||
let current_id = thread::current().id();
|
||||
DESIGNATED_THREAD.get_or_init(|| current_id);
|
||||
|
||||
// If the current thread is not the designated one, return immediately.
|
||||
// This ensures that only the designated thread updates the global registry,
|
||||
// avoiding any interleaving or inconsistent updates from other threads.
|
||||
if *DESIGNATED_THREAD.get().unwrap() != current_id {
|
||||
return;
|
||||
}
|
||||
|
||||
let rmap_vec = rmap.to_vec();
|
||||
|
||||
// If there is no data, nothing to process.
|
||||
// Avoid unnecessary work.
|
||||
if rmap_vec.is_empty() && rdef_methods.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
// Keep track of the deduced prefix for partial routes.
|
||||
let mut deduced_prefix: Option<String> = None;
|
||||
|
||||
// 1. Handle "marker" entries (where methods is empty).
|
||||
for (sub_path, http_methods) in &rdef_methods {
|
||||
if http_methods.is_empty() {
|
||||
// Find any route that contains sub_path and use it to deduce a prefix.
|
||||
if let Some(route) = rmap_vec.iter().find(|r| r.contains(sub_path)) {
|
||||
if let Some(pos) = route.find(sub_path) {
|
||||
let prefix = &route[..pos];
|
||||
deduced_prefix = Some(prefix.to_string());
|
||||
// Complete partial routes in the global registry using this prefix.
|
||||
complete_partial_routes_with_marker(sub_path, prefix);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Handle endpoint entries (where methods is non-empty).
|
||||
for (sub_path, http_methods) in &rdef_methods {
|
||||
if !http_methods.is_empty() {
|
||||
// Identify candidate routes that end with sub_path (or exactly match "/" if sub_path == "/").
|
||||
let candidates: Vec<&String> = if sub_path == "/" {
|
||||
rmap_vec.iter().filter(|r| r.as_str() == "/").collect()
|
||||
if !self.methods.is_empty() || !self.guards.is_empty() {
|
||||
let methods = if self.methods.is_empty() {
|
||||
"".to_string()
|
||||
} else {
|
||||
rmap_vec.iter().filter(|r| r.ends_with(sub_path)).collect()
|
||||
format!(" Methods: {:?}", self.methods)
|
||||
};
|
||||
let guards = if self.guards.is_empty() {
|
||||
"".to_string()
|
||||
} else {
|
||||
format!(" Guards: {:?}", self.guards)
|
||||
};
|
||||
|
||||
// If we found any candidates, pick the best match.
|
||||
if !candidates.is_empty() {
|
||||
let chosen = if let Some(prefix) = &deduced_prefix {
|
||||
if !prefix.is_empty() {
|
||||
candidates
|
||||
.iter()
|
||||
.find(|&&r| r.starts_with(prefix))
|
||||
.cloned()
|
||||
.or_else(|| candidates.iter().min_by_key(|&&r| r.len()).cloned())
|
||||
} else {
|
||||
candidates.iter().min_by_key(|&&r| r.len()).cloned()
|
||||
}
|
||||
} else {
|
||||
candidates.iter().min_by_key(|&&r| r.len()).cloned()
|
||||
};
|
||||
println!("{}{}{}{}", " ".repeat(indent), full_path, methods, guards);
|
||||
}
|
||||
|
||||
if let Some(full_route) = chosen {
|
||||
// Register the endpoint in the global resource registry.
|
||||
register_resource(ResourceIntrospection {
|
||||
method: http_methods.join(","),
|
||||
path: full_route.clone(),
|
||||
});
|
||||
for child in &self.children {
|
||||
child.display(indent, &full_path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn build_tree(node: &mut IntrospectionNode, rmap: &ResourceMap) {
|
||||
initialize_detail_registry();
|
||||
let detail_registry = get_detail_registry();
|
||||
if let Some(ref children) = rmap.nodes {
|
||||
for child_rc in children {
|
||||
let child = child_rc;
|
||||
let pat = child.pattern.pattern().unwrap_or("").to_string();
|
||||
let kind = if child.nodes.is_some() {
|
||||
ResourceType::Scope
|
||||
} else {
|
||||
ResourceType::Resource
|
||||
};
|
||||
let mut new_node = IntrospectionNode::new(kind, pat.clone());
|
||||
|
||||
if let ResourceType::Resource = new_node.kind {
|
||||
if let Some(d) = detail_registry.lock().unwrap().get(&pat) {
|
||||
new_node.methods = d.methods.clone();
|
||||
new_node.guards = d.guards.clone();
|
||||
}
|
||||
}
|
||||
|
||||
build_tree(&mut new_node, child);
|
||||
node.children.push(new_node);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::{num::NonZeroUsize, rc::Rc};
|
||||
fn is_designated_thread() -> bool {
|
||||
let current_id = thread::current().id();
|
||||
DESIGNATED_THREAD.get_or_init(|| {
|
||||
IS_INITIALIZED.store(true, Ordering::SeqCst);
|
||||
current_id // Assign the first thread that calls this function
|
||||
});
|
||||
|
||||
use actix_router::ResourceDef;
|
||||
use tokio::sync::oneshot;
|
||||
*DESIGNATED_THREAD.get().unwrap() == current_id
|
||||
}
|
||||
|
||||
use super::*;
|
||||
use crate::rmap::ResourceMap;
|
||||
|
||||
/// Helper function to create a ResourceMap from a list of route strings.
|
||||
/// It creates a root ResourceMap with an empty prefix and adds each route as a leaf.
|
||||
fn create_resource_map(routes: Vec<&str>) -> Rc<ResourceMap> {
|
||||
// Create a root node with an empty prefix.
|
||||
let mut root = ResourceMap::new(ResourceDef::root_prefix(""));
|
||||
// For each route, create a ResourceDef and add it as a leaf (nested = None).
|
||||
for route in routes {
|
||||
let mut def = ResourceDef::new(route);
|
||||
root.add(&mut def, None);
|
||||
}
|
||||
Rc::new(root)
|
||||
pub fn register_rmap(rmap: &ResourceMap) {
|
||||
if !is_designated_thread() {
|
||||
return;
|
||||
}
|
||||
|
||||
// Helper function to run the full introspection flow.
|
||||
// It processes introspection data for multiple blocks, each with a different set of routes and methods.
|
||||
fn run_full_introspection_flow() {
|
||||
// Block 1:
|
||||
// rmap_vec: ["/item/{id}"]
|
||||
// rdef_methods: []
|
||||
process_introspection(create_resource_map(vec!["/item/{id}"]), vec![]);
|
||||
initialize_registry();
|
||||
let mut root = IntrospectionNode::new(ResourceType::App, "".into());
|
||||
build_tree(&mut root, rmap);
|
||||
*get_registry().lock().unwrap() = root;
|
||||
|
||||
// Block 2:
|
||||
// rmap_vec: ["/info"]
|
||||
// rdef_methods: []
|
||||
process_introspection(create_resource_map(vec!["/info"]), vec![]);
|
||||
// WIP. Display the introspection tree
|
||||
let reg = get_registry().lock().unwrap();
|
||||
reg.display(0, "");
|
||||
}
|
||||
|
||||
// Block 3:
|
||||
// rmap_vec: ["/guarded"]
|
||||
// rdef_methods: []
|
||||
process_introspection(create_resource_map(vec!["/guarded"]), vec![]);
|
||||
|
||||
// Block 4:
|
||||
// rmap_vec: ["/v1/item/{id}", "/v1/info", "/v1/guarded"]
|
||||
// rdef_methods: [("/item/{id}", ["GET"]), ("/info", ["POST"]), ("/guarded", ["UNKNOWN"])]
|
||||
process_introspection(
|
||||
create_resource_map(vec!["/v1/item/{id}", "/v1/info", "/v1/guarded"]),
|
||||
vec![
|
||||
("/item/{id}".to_string(), vec!["GET".to_string()]),
|
||||
("/info".to_string(), vec!["POST".to_string()]),
|
||||
("/guarded".to_string(), vec!["UNKNOWN".to_string()]),
|
||||
],
|
||||
);
|
||||
|
||||
// Block 5:
|
||||
// rmap_vec: ["/hello"]
|
||||
// rdef_methods: []
|
||||
process_introspection(create_resource_map(vec!["/hello"]), vec![]);
|
||||
|
||||
// Block 6:
|
||||
// rmap_vec: ["/v2/hello"]
|
||||
// rdef_methods: [("/hello", ["GET"])]
|
||||
process_introspection(
|
||||
create_resource_map(vec!["/v2/hello"]),
|
||||
vec![("/hello".to_string(), vec!["GET".to_string()])],
|
||||
);
|
||||
|
||||
// Block 7:
|
||||
// rmap_vec: ["/api/v1/item/{id}", "/api/v1/info", "/api/v1/guarded", "/api/v2/hello"]
|
||||
// rdef_methods: [("/v1", []), ("/v2", [])]
|
||||
process_introspection(
|
||||
create_resource_map(vec![
|
||||
"/api/v1/item/{id}",
|
||||
"/api/v1/info",
|
||||
"/api/v1/guarded",
|
||||
"/api/v2/hello",
|
||||
]),
|
||||
vec![("/v1".to_string(), vec![]), ("/v2".to_string(), vec![])],
|
||||
);
|
||||
|
||||
// Block 8:
|
||||
// rmap_vec: ["/dashboard"]
|
||||
// rdef_methods: []
|
||||
process_introspection(create_resource_map(vec!["/dashboard"]), vec![]);
|
||||
|
||||
// Block 9:
|
||||
// rmap_vec: ["/settings"]
|
||||
// rdef_methods: [("/settings", ["GET"]), ("/settings", ["POST"])]
|
||||
process_introspection(
|
||||
create_resource_map(vec!["/settings"]),
|
||||
vec![
|
||||
("/settings".to_string(), vec!["GET".to_string()]),
|
||||
("/settings".to_string(), vec!["POST".to_string()]),
|
||||
],
|
||||
);
|
||||
|
||||
// Block 10:
|
||||
// rmap_vec: ["/admin/dashboard", "/admin/settings"]
|
||||
// rdef_methods: [("/dashboard", ["GET"]), ("/settings", [])]
|
||||
process_introspection(
|
||||
create_resource_map(vec!["/admin/dashboard", "/admin/settings"]),
|
||||
vec![
|
||||
("/dashboard".to_string(), vec!["GET".to_string()]),
|
||||
("/settings".to_string(), vec![]),
|
||||
],
|
||||
);
|
||||
|
||||
// Block 11:
|
||||
// rmap_vec: ["/"]
|
||||
// rdef_methods: [("/", ["GET"]), ("/", ["POST"])]
|
||||
process_introspection(
|
||||
create_resource_map(vec!["/"]),
|
||||
vec![
|
||||
("/".to_string(), vec!["GET".to_string()]),
|
||||
("/".to_string(), vec!["POST".to_string()]),
|
||||
],
|
||||
);
|
||||
|
||||
// Block 12:
|
||||
// rmap_vec: ["/ping"]
|
||||
// rdef_methods: []
|
||||
process_introspection(create_resource_map(vec!["/ping"]), vec![]);
|
||||
|
||||
// Block 13:
|
||||
// rmap_vec: ["/multi"]
|
||||
// rdef_methods: [("/multi", ["GET"]), ("/multi", ["POST"])]
|
||||
process_introspection(
|
||||
create_resource_map(vec!["/multi"]),
|
||||
vec![
|
||||
("/multi".to_string(), vec!["GET".to_string()]),
|
||||
("/multi".to_string(), vec!["POST".to_string()]),
|
||||
],
|
||||
);
|
||||
|
||||
// Block 14:
|
||||
// rmap_vec: ["/extra/ping", "/extra/multi"]
|
||||
// rdef_methods: [("/ping", ["GET"]), ("/multi", [])]
|
||||
process_introspection(
|
||||
create_resource_map(vec!["/extra/ping", "/extra/multi"]),
|
||||
vec![
|
||||
("/ping".to_string(), vec!["GET".to_string()]),
|
||||
("/multi".to_string(), vec![]),
|
||||
],
|
||||
);
|
||||
|
||||
// Block 15:
|
||||
// rmap_vec: ["/other_guard"]
|
||||
// rdef_methods: []
|
||||
process_introspection(create_resource_map(vec!["/other_guard"]), vec![]);
|
||||
|
||||
// Block 16:
|
||||
// rmap_vec: ["/all_guard"]
|
||||
// rdef_methods: []
|
||||
process_introspection(create_resource_map(vec!["/all_guard"]), vec![]);
|
||||
|
||||
// Block 17:
|
||||
// rmap_vec: ["/api/v1/item/{id}", "/api/v1/info", "/api/v1/guarded", "/api/v2/hello",
|
||||
// "/admin/dashboard", "/admin/settings", "/", "/extra/ping", "/extra/multi",
|
||||
// "/other_guard", "/all_guard"]
|
||||
// rdef_methods: [("/api", []), ("/admin", []), ("/", []), ("/extra", []),
|
||||
// ("/other_guard", ["UNKNOWN"]), ("/all_guard", ["GET", "UNKNOWN", "POST"])]
|
||||
process_introspection(
|
||||
create_resource_map(vec![
|
||||
"/api/v1/item/{id}",
|
||||
"/api/v1/info",
|
||||
"/api/v1/guarded",
|
||||
"/api/v2/hello",
|
||||
"/admin/dashboard",
|
||||
"/admin/settings",
|
||||
"/",
|
||||
"/extra/ping",
|
||||
"/extra/multi",
|
||||
"/other_guard",
|
||||
"/all_guard",
|
||||
]),
|
||||
vec![
|
||||
("/api".to_string(), vec![]),
|
||||
("/admin".to_string(), vec![]),
|
||||
("/".to_string(), vec![]),
|
||||
("/extra".to_string(), vec![]),
|
||||
("/other_guard".to_string(), vec!["UNKNOWN".to_string()]),
|
||||
(
|
||||
"/all_guard".to_string(),
|
||||
vec!["GET".to_string(), "UNKNOWN".to_string(), "POST".to_string()],
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
/// This test spawns multiple tasks that run the full introspection flow concurrently.
|
||||
/// Only the designated task (the first one to call process_introspection) updates the global registry,
|
||||
/// ensuring that the internal order remains consistent. Finally, we verify that get_registered_resources()
|
||||
/// returns the expected set of listed resources.
|
||||
/// Using a dedicated arbiter for each task ensures that the global registry is thread-safe.
|
||||
#[actix_rt::test]
|
||||
async fn test_introspection() {
|
||||
// Number of tasks to spawn.
|
||||
const NUM_TASKS: usize = 4;
|
||||
let mut completion_receivers = Vec::with_capacity(NUM_TASKS);
|
||||
|
||||
// Check that the registry is initially empty.
|
||||
let registered_resources = get_registered_resources();
|
||||
|
||||
assert_eq!(
|
||||
registered_resources.len(),
|
||||
0,
|
||||
"Expected 0 registered resources, found: {:?}",
|
||||
registered_resources
|
||||
);
|
||||
|
||||
// Determine parallelism and max blocking threads.
|
||||
let parallelism = std::thread::available_parallelism().map_or(2, NonZeroUsize::get);
|
||||
let max_blocking_threads = std::cmp::max(512 / parallelism, 1);
|
||||
|
||||
// Spawn tasks on the arbiter. Each task runs the full introspection flow and then signals completion.
|
||||
for _ in 0..NUM_TASKS {
|
||||
let (tx, rx) = oneshot::channel();
|
||||
|
||||
#[cfg(all(target_os = "linux", feature = "experimental-io-uring"))]
|
||||
let arbiter = {
|
||||
// TODO: pass max blocking thread config when tokio-uring enable configuration
|
||||
// on building runtime.
|
||||
let _ = max_blocking_threads;
|
||||
actix_rt::Arbiter::new()
|
||||
};
|
||||
|
||||
#[cfg(not(all(target_os = "linux", feature = "experimental-io-uring")))]
|
||||
let arbiter = actix_rt::Arbiter::with_tokio_rt(move || {
|
||||
// Create an Arbiter with a dedicated Tokio runtime.
|
||||
tokio::runtime::Builder::new_current_thread()
|
||||
.enable_all()
|
||||
.max_blocking_threads(max_blocking_threads)
|
||||
.build()
|
||||
.unwrap()
|
||||
});
|
||||
|
||||
// Spawn the task on the arbiter.
|
||||
arbiter.spawn(async move {
|
||||
run_full_introspection_flow();
|
||||
// Signal that this task has finished.
|
||||
let _ = tx.send(());
|
||||
});
|
||||
completion_receivers.push(rx);
|
||||
}
|
||||
|
||||
// Wait for all spawned tasks to complete.
|
||||
for rx in completion_receivers {
|
||||
let _ = rx.await;
|
||||
}
|
||||
|
||||
// After all blocks, we expect the final registry to contain 14 entries.
|
||||
let registered_resources = get_registered_resources();
|
||||
|
||||
assert_eq!(
|
||||
registered_resources.len(),
|
||||
14,
|
||||
"Expected 14 registered resources, found: {:?}",
|
||||
registered_resources
|
||||
);
|
||||
|
||||
// List of expected resources
|
||||
let expected_resources = vec![
|
||||
ResourceIntrospection {
|
||||
method: "GET".to_string(),
|
||||
path: "/api/v1/item/{id}".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "POST".to_string(),
|
||||
path: "/api/v1/info".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "UNKNOWN".to_string(),
|
||||
path: "/api/v1/guarded".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "GET".to_string(),
|
||||
path: "/api/v2/hello".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "GET".to_string(),
|
||||
path: "/admin/settings".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "POST".to_string(),
|
||||
path: "/admin/settings".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "GET".to_string(),
|
||||
path: "/admin/dashboard".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "GET".to_string(),
|
||||
path: "/extra/multi".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "POST".to_string(),
|
||||
path: "/extra/multi".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "GET".to_string(),
|
||||
path: "/extra/ping".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "GET".to_string(),
|
||||
path: "/".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "POST".to_string(),
|
||||
path: "/".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "UNKNOWN".to_string(),
|
||||
path: "/other_guard".to_string(),
|
||||
},
|
||||
ResourceIntrospection {
|
||||
method: "GET,UNKNOWN,POST".to_string(),
|
||||
path: "/all_guard".to_string(),
|
||||
},
|
||||
];
|
||||
|
||||
for exp in expected_resources {
|
||||
assert!(
|
||||
registered_resources.contains(&exp),
|
||||
"Expected resource not found: {:?}",
|
||||
exp
|
||||
);
|
||||
fn update_unique<T: Clone + PartialEq>(existing: &mut Vec<T>, new_items: &[T]) {
|
||||
for item in new_items {
|
||||
if !existing.contains(item) {
|
||||
existing.push(item.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn register_pattern_detail(pattern: String, methods: Vec<Method>, guards: Vec<String>) {
|
||||
if !is_designated_thread() {
|
||||
return;
|
||||
}
|
||||
initialize_detail_registry();
|
||||
let mut reg = get_detail_registry().lock().unwrap();
|
||||
reg.entry(pattern)
|
||||
.and_modify(|d| {
|
||||
update_unique(&mut d.methods, &methods);
|
||||
update_unique(&mut d.guards, &guards);
|
||||
})
|
||||
.or_insert(RouteDetail { methods, guards });
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@ pub use actix_http::{body, HttpMessage};
|
|||
#[cfg(feature = "cookies")]
|
||||
#[doc(inline)]
|
||||
pub use cookie;
|
||||
|
||||
pub use mime;
|
||||
mod app;
|
||||
mod app_service;
|
||||
mod config;
|
||||
|
@ -108,7 +108,7 @@ mod thin_data;
|
|||
pub(crate) mod types;
|
||||
pub mod web;
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
#[cfg(feature = "experimental-introspection")]
|
||||
pub mod introspection;
|
||||
|
||||
#[doc(inline)]
|
||||
|
|
|
@ -191,8 +191,10 @@ where
|
|||
None => true,
|
||||
Some(hdr) => {
|
||||
match hdr.to_str().ok().and_then(|hdr| hdr.parse::<Mime>().ok()) {
|
||||
Some(mime) if mime.type_().as_str() == "image" => false,
|
||||
Some(mime) if mime.type_().as_str() == "video" => false,
|
||||
Some(mime) if mime.type_() == mime::IMAGE => {
|
||||
matches!(mime.subtype(), mime::SVG)
|
||||
}
|
||||
Some(mime) if mime.type_() == mime::VIDEO => false,
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@ use actix_service::{Service, Transform};
|
|||
use actix_utils::future::{ready, Ready};
|
||||
use bytes::Bytes;
|
||||
use futures_core::ready;
|
||||
use log::{debug, warn};
|
||||
use log::{debug, warn, Level};
|
||||
use pin_project_lite::pin_project;
|
||||
#[cfg(feature = "unicode")]
|
||||
use regex::Regex;
|
||||
|
@ -92,6 +92,7 @@ struct Inner {
|
|||
exclude: HashSet<String>,
|
||||
exclude_regex: Vec<Regex>,
|
||||
log_target: Cow<'static, str>,
|
||||
log_level: Level,
|
||||
}
|
||||
|
||||
impl Logger {
|
||||
|
@ -102,6 +103,7 @@ impl Logger {
|
|||
exclude: HashSet::new(),
|
||||
exclude_regex: Vec::new(),
|
||||
log_target: Cow::Borrowed(module_path!()),
|
||||
log_level: Level::Info,
|
||||
}))
|
||||
}
|
||||
|
||||
|
@ -139,6 +141,23 @@ impl Logger {
|
|||
self
|
||||
}
|
||||
|
||||
/// Sets the log level to `level`.
|
||||
///
|
||||
/// By default, the log level is `Level::Info`.
|
||||
///
|
||||
/// # Examples
|
||||
/// Using `.log_level(Level::Debug)` would have this effect on request logs:
|
||||
/// ```diff
|
||||
/// - [2015-10-21T07:28:00Z INFO actix_web::middleware::logger] 127.0.0.1 "GET / HTTP/1.1" 200 88 "-" "dmc/1.0" 0.001985
|
||||
/// + [2015-10-21T07:28:00Z DEBUG actix_web::middleware::logger] 127.0.0.1 "GET / HTTP/1.1" 200 88 "-" "dmc/1.0" 0.001985
|
||||
/// ^^^^^^
|
||||
/// ```
|
||||
pub fn log_level(mut self, level: log::Level) -> Self {
|
||||
let inner = Rc::get_mut(&mut self.0).unwrap();
|
||||
inner.log_level = level;
|
||||
self
|
||||
}
|
||||
|
||||
/// Register a function that receives a ServiceRequest and returns a String for use in the
|
||||
/// log line. The label passed as the first argument should match a replacement substring in
|
||||
/// the logger format like `%{label}xi`.
|
||||
|
@ -242,6 +261,7 @@ impl Default for Logger {
|
|||
exclude: HashSet::new(),
|
||||
exclude_regex: Vec::new(),
|
||||
log_target: Cow::Borrowed(module_path!()),
|
||||
log_level: Level::Info,
|
||||
}))
|
||||
}
|
||||
}
|
||||
|
@ -312,6 +332,7 @@ where
|
|||
format: None,
|
||||
time: OffsetDateTime::now_utc(),
|
||||
log_target: Cow::Borrowed(""),
|
||||
log_level: self.inner.log_level,
|
||||
_phantom: PhantomData,
|
||||
}
|
||||
} else {
|
||||
|
@ -327,6 +348,7 @@ where
|
|||
format: Some(format),
|
||||
time: now,
|
||||
log_target: self.inner.log_target.clone(),
|
||||
log_level: self.inner.log_level,
|
||||
_phantom: PhantomData,
|
||||
}
|
||||
}
|
||||
|
@ -344,6 +366,7 @@ pin_project! {
|
|||
time: OffsetDateTime,
|
||||
format: Option<Format>,
|
||||
log_target: Cow<'static, str>,
|
||||
log_level: Level,
|
||||
_phantom: PhantomData<B>,
|
||||
}
|
||||
}
|
||||
|
@ -390,6 +413,7 @@ where
|
|||
let time = *this.time;
|
||||
let format = this.format.take();
|
||||
let log_target = this.log_target.clone();
|
||||
let log_level = *this.log_level;
|
||||
|
||||
Poll::Ready(Ok(res.map_body(move |_, body| StreamLog {
|
||||
body,
|
||||
|
@ -397,6 +421,7 @@ where
|
|||
format,
|
||||
size: 0,
|
||||
log_target,
|
||||
log_level,
|
||||
})))
|
||||
}
|
||||
}
|
||||
|
@ -409,6 +434,7 @@ pin_project! {
|
|||
size: usize,
|
||||
time: OffsetDateTime,
|
||||
log_target: Cow<'static, str>,
|
||||
log_level: Level
|
||||
}
|
||||
|
||||
impl<B> PinnedDrop for StreamLog<B> {
|
||||
|
@ -421,8 +447,9 @@ pin_project! {
|
|||
Ok(())
|
||||
};
|
||||
|
||||
log::info!(
|
||||
log::log!(
|
||||
target: this.log_target.as_ref(),
|
||||
this.log_level,
|
||||
"{}", FormatDisplay(&render)
|
||||
);
|
||||
}
|
||||
|
@ -622,9 +649,9 @@ impl FormatText {
|
|||
|
||||
FormatText::ResponseHeader(ref name) => {
|
||||
let s = if let Some(val) = res.headers().get(name) {
|
||||
val.to_str().unwrap_or("-")
|
||||
String::from_utf8_lossy(val.as_bytes()).into_owned()
|
||||
} else {
|
||||
"-"
|
||||
"-".to_owned()
|
||||
};
|
||||
*self = FormatText::Str(s.to_string())
|
||||
}
|
||||
|
@ -666,11 +693,11 @@ impl FormatText {
|
|||
FormatText::RequestTime => *self = FormatText::Str(now.format(&Rfc3339).unwrap()),
|
||||
FormatText::RequestHeader(ref name) => {
|
||||
let s = if let Some(val) = req.headers().get(name) {
|
||||
val.to_str().unwrap_or("-")
|
||||
String::from_utf8_lossy(val.as_bytes()).into_owned()
|
||||
} else {
|
||||
"-"
|
||||
"-".to_owned()
|
||||
};
|
||||
*self = FormatText::Str(s.to_string());
|
||||
*self = FormatText::Str(s);
|
||||
}
|
||||
FormatText::RemoteAddr => {
|
||||
let s = if let Some(peer) = req.connection_info().peer_addr() {
|
||||
|
|
|
@ -264,8 +264,10 @@ impl HttpRequest {
|
|||
///
|
||||
/// For expanded client connection information, use [`connection_info`] instead.
|
||||
///
|
||||
/// Will only return None when called in unit tests unless [`TestRequest::peer_addr`] is used.
|
||||
/// Will only return `None` when server is listening on [UDS socket] or when called in unit
|
||||
/// tests unless [`TestRequest::peer_addr`] is used.
|
||||
///
|
||||
/// [UDS socket]: crate::HttpServer::bind_uds
|
||||
/// [`TestRequest::peer_addr`]: crate::test::TestRequest::peer_addr
|
||||
/// [`connection_info`]: Self::connection_info
|
||||
#[inline]
|
||||
|
|
|
@ -417,6 +417,8 @@ where
|
|||
B: MessageBody + 'static,
|
||||
{
|
||||
fn register(mut self, config: &mut AppService) {
|
||||
let routes = std::mem::take(&mut self.routes);
|
||||
|
||||
let guards = if self.guards.is_empty() {
|
||||
None
|
||||
} else {
|
||||
|
@ -433,27 +435,28 @@ where
|
|||
rdef.set_name(name);
|
||||
}
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
let mut rdef_methods: Vec<(String, Vec<String>)> = Vec::new();
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
let mut rmap = crate::rmap::ResourceMap::new(ResourceDef::prefix(""));
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
#[cfg(feature = "experimental-introspection")]
|
||||
{
|
||||
rmap.add(&mut rdef, None);
|
||||
|
||||
self.routes.iter().for_each(|r| {
|
||||
r.get_guards().iter().for_each(|g| {
|
||||
let http_methods: Vec<String> =
|
||||
crate::guard::HttpMethodsExtractor::extract_http_methods(&**g);
|
||||
rdef_methods
|
||||
.push((rdef.pattern().unwrap_or_default().to_string(), http_methods));
|
||||
});
|
||||
});
|
||||
let pat = rdef.pattern().unwrap_or("").to_string();
|
||||
let mut methods = Vec::new();
|
||||
let mut guard_names = Vec::new();
|
||||
for route in &routes {
|
||||
if let Some(m) = route.get_method() {
|
||||
if !methods.contains(&m) {
|
||||
methods.push(m);
|
||||
}
|
||||
}
|
||||
for name in route.guard_names() {
|
||||
if !guard_names.contains(&name) {
|
||||
guard_names.push(name.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
crate::introspection::register_pattern_detail(pat, methods, guard_names);
|
||||
}
|
||||
|
||||
*self.factory_ref.borrow_mut() = Some(ResourceFactory {
|
||||
routes: self.routes,
|
||||
routes,
|
||||
default: self.default,
|
||||
});
|
||||
|
||||
|
@ -470,14 +473,6 @@ where
|
|||
async { Ok(fut.await?.map_into_boxed_body()) }
|
||||
});
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
{
|
||||
crate::introspection::process_introspection(
|
||||
Rc::clone(&Rc::new(rmap.clone())),
|
||||
rdef_methods,
|
||||
);
|
||||
}
|
||||
|
||||
config.register_service(rdef, guards, endpoint, None)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,16 +15,13 @@ const AVG_PATH_LEN: usize = 24;
|
|||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct ResourceMap {
|
||||
pattern: ResourceDef,
|
||||
|
||||
pub(crate) pattern: ResourceDef,
|
||||
/// Named resources within the tree or, for external resources, it points to isolated nodes
|
||||
/// outside the tree.
|
||||
named: FoldHashMap<String, Rc<ResourceMap>>,
|
||||
|
||||
parent: RefCell<Weak<ResourceMap>>,
|
||||
|
||||
/// Must be `None` for "edge" nodes.
|
||||
nodes: Option<Vec<Rc<ResourceMap>>>,
|
||||
pub(crate) nodes: Option<Vec<Rc<ResourceMap>>>,
|
||||
}
|
||||
|
||||
impl ResourceMap {
|
||||
|
@ -38,42 +35,6 @@ impl ResourceMap {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
/// Returns a list of all paths in the resource map.
|
||||
pub fn to_vec(&self) -> Vec<String> {
|
||||
let mut paths = Vec::new();
|
||||
self.collect_full_paths(String::new(), &mut paths);
|
||||
paths
|
||||
}
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
/// Recursive function that accumulates the full path and adds it only if the node is an endpoint (leaf).
|
||||
fn collect_full_paths(&self, current_path: String, paths: &mut Vec<String>) {
|
||||
// Get the current segment of the pattern
|
||||
if let Some(segment) = self.pattern.pattern() {
|
||||
let mut new_path = current_path;
|
||||
// Add the '/' separator if necessary
|
||||
if !segment.is_empty() {
|
||||
if !new_path.ends_with('/') && !new_path.is_empty() && !segment.starts_with('/') {
|
||||
new_path.push('/');
|
||||
}
|
||||
new_path.push_str(segment);
|
||||
}
|
||||
|
||||
// If this node is an endpoint (has no children), add the full path
|
||||
if self.nodes.is_none() {
|
||||
paths.push(new_path.clone());
|
||||
}
|
||||
|
||||
// If it has children, iterate over each one
|
||||
if let Some(children) = &self.nodes {
|
||||
for child in children {
|
||||
child.collect_full_paths(new_path.clone(), paths);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Format resource map as tree structure (unfinished).
|
||||
#[allow(dead_code)]
|
||||
pub(crate) fn tree(&self) -> String {
|
||||
|
|
|
@ -65,10 +65,10 @@ impl Route {
|
|||
pub(crate) fn take_guards(&mut self) -> Vec<Box<dyn Guard>> {
|
||||
mem::take(Rc::get_mut(&mut self.guards).unwrap())
|
||||
}
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
pub(crate) fn get_guards(&self) -> &Vec<Box<dyn Guard>> {
|
||||
&self.guards
|
||||
/// Get the names of all guards applied to this route.
|
||||
#[cfg(feature = "experimental-introspection")]
|
||||
pub fn guard_names(&self) -> Vec<String> {
|
||||
self.guards.iter().map(|g| g.name()).collect()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -145,6 +145,23 @@ impl Route {
|
|||
self
|
||||
}
|
||||
|
||||
#[cfg(feature = "experimental-introspection")]
|
||||
/// Get the first HTTP method guard applied to this route (if any).
|
||||
/// WIP.
|
||||
pub(crate) fn get_method(&self) -> Option<Method> {
|
||||
self.guards.iter().find_map(|g| {
|
||||
g.details().and_then(|details| {
|
||||
details.into_iter().find_map(|d| {
|
||||
if let crate::guard::GuardDetail::HttpMethods(mut m) = d {
|
||||
m.pop().and_then(|s| s.parse().ok())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
/// Add guard to the route.
|
||||
///
|
||||
/// # Examples
|
||||
|
@ -164,6 +181,10 @@ impl Route {
|
|||
self
|
||||
}
|
||||
|
||||
pub fn guards(&self) -> &Vec<Box<dyn Guard>> {
|
||||
&self.guards
|
||||
}
|
||||
|
||||
/// Set handler function, use request extractors for parameters.
|
||||
///
|
||||
/// # Examples
|
||||
|
|
|
@ -395,9 +395,6 @@ where
|
|||
rmap.add(&mut rdef, None);
|
||||
}
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
let mut rdef_methods: Vec<(String, Vec<String>)> = Vec::new();
|
||||
|
||||
// complete scope pipeline creation
|
||||
*self.factory_ref.borrow_mut() = Some(ScopeFactory {
|
||||
default,
|
||||
|
@ -408,21 +405,38 @@ where
|
|||
.map(|(mut rdef, srv, guards, nested)| {
|
||||
rmap.add(&mut rdef, nested);
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
#[cfg(feature = "experimental-introspection")]
|
||||
{
|
||||
let http_methods: Vec<String> =
|
||||
guards.as_ref().map_or_else(Vec::new, |g| {
|
||||
g.iter()
|
||||
.flat_map(|g| {
|
||||
crate::guard::HttpMethodsExtractor::extract_http_methods(
|
||||
&**g,
|
||||
)
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
});
|
||||
use std::borrow::Borrow;
|
||||
|
||||
rdef_methods
|
||||
.push((rdef.pattern().unwrap_or_default().to_string(), http_methods));
|
||||
// Get the pattern stored in ResourceMap
|
||||
let pat = rdef.pattern().unwrap_or("").to_string();
|
||||
let guard_list: &[Box<dyn Guard>] =
|
||||
guards.borrow().as_ref().map_or(&[], |v| &v[..]);
|
||||
|
||||
// Extract HTTP methods from guards
|
||||
let methods = guard_list
|
||||
.iter()
|
||||
.flat_map(|g| g.details().unwrap_or_default())
|
||||
.flat_map(|d| {
|
||||
if let crate::guard::GuardDetail::HttpMethods(v) = d {
|
||||
v.into_iter()
|
||||
.filter_map(|s| s.parse().ok())
|
||||
.collect::<Vec<_>>()
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
// Extract guard names
|
||||
let guard_names = guard_list
|
||||
.iter()
|
||||
.map(|g| g.name().to_string())
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
// Register route details for introspection
|
||||
crate::introspection::register_pattern_detail(pat, methods, guard_names);
|
||||
}
|
||||
|
||||
(rdef, srv, RefCell::new(guards))
|
||||
|
@ -452,14 +466,6 @@ where
|
|||
async { Ok(fut.await?.map_into_boxed_body()) }
|
||||
});
|
||||
|
||||
#[cfg(feature = "resources-introspection")]
|
||||
{
|
||||
crate::introspection::process_introspection(
|
||||
Rc::clone(&Rc::new(rmap.clone())),
|
||||
rdef_methods,
|
||||
);
|
||||
}
|
||||
|
||||
// register final service
|
||||
config.register_service(
|
||||
ResourceDef::root_prefix(&self.rdef),
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
use std::{
|
||||
any::Any,
|
||||
cmp, fmt, io,
|
||||
cmp, fmt,
|
||||
future::Future,
|
||||
io,
|
||||
marker::PhantomData,
|
||||
net,
|
||||
sync::{Arc, Mutex},
|
||||
|
@ -64,6 +66,7 @@ struct Config {
|
|||
/// .await
|
||||
/// }
|
||||
/// ```
|
||||
#[must_use]
|
||||
pub struct HttpServer<F, I, S, B>
|
||||
where
|
||||
F: Fn() -> I + Send + Clone + 'static,
|
||||
|
@ -272,19 +275,12 @@ where
|
|||
/// - `actix_web::rt::net::TcpStream` when no encryption is used.
|
||||
///
|
||||
/// See the `on_connect` example for additional details.
|
||||
pub fn on_connect<CB>(self, f: CB) -> HttpServer<F, I, S, B>
|
||||
pub fn on_connect<CB>(mut self, f: CB) -> HttpServer<F, I, S, B>
|
||||
where
|
||||
CB: Fn(&dyn Any, &mut Extensions) + Send + Sync + 'static,
|
||||
{
|
||||
HttpServer {
|
||||
factory: self.factory,
|
||||
config: self.config,
|
||||
backlog: self.backlog,
|
||||
sockets: self.sockets,
|
||||
builder: self.builder,
|
||||
on_connect_fn: Some(Arc::new(f)),
|
||||
_phantom: PhantomData,
|
||||
}
|
||||
self.on_connect_fn = Some(Arc::new(f));
|
||||
self
|
||||
}
|
||||
|
||||
/// Sets server host name.
|
||||
|
@ -312,6 +308,37 @@ where
|
|||
self
|
||||
}
|
||||
|
||||
/// Specify shutdown signal from a future.
|
||||
///
|
||||
/// Using this method will prevent OS signal handlers being set up.
|
||||
///
|
||||
/// Typically, a `CancellationToken` will be used, but any future _can_ be.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```no_run
|
||||
/// use actix_web::{App, HttpServer};
|
||||
/// use tokio_util::sync::CancellationToken;
|
||||
///
|
||||
/// # #[actix_web::main]
|
||||
/// # async fn main() -> std::io::Result<()> {
|
||||
/// let stop_signal = CancellationToken::new();
|
||||
///
|
||||
/// HttpServer::new(move || App::new())
|
||||
/// .shutdown_signal(stop_signal.cancelled_owned())
|
||||
/// .bind(("127.0.0.1", 8080))?
|
||||
/// .run()
|
||||
/// .await
|
||||
/// # }
|
||||
/// ```
|
||||
pub fn shutdown_signal<Fut>(mut self, shutdown_signal: Fut) -> Self
|
||||
where
|
||||
Fut: Future<Output = ()> + Send + 'static,
|
||||
{
|
||||
self.builder = self.builder.shutdown_signal(shutdown_signal);
|
||||
self
|
||||
}
|
||||
|
||||
/// Sets timeout for graceful worker shutdown of workers.
|
||||
///
|
||||
/// After receiving a stop signal, workers have this much time to finish serving requests.
|
||||
|
@ -882,6 +909,7 @@ where
|
|||
let factory = self.factory.clone();
|
||||
let cfg = Arc::clone(&self.config);
|
||||
let addr = lst.local_addr().unwrap();
|
||||
|
||||
self.sockets.push(Socket {
|
||||
addr,
|
||||
scheme: "https",
|
||||
|
@ -986,6 +1014,7 @@ where
|
|||
let factory = self.factory.clone();
|
||||
let socket_addr =
|
||||
net::SocketAddr::new(net::IpAddr::V4(net::Ipv4Addr::new(127, 0, 0, 1)), 8080);
|
||||
|
||||
self.sockets.push(Socket {
|
||||
scheme: "http",
|
||||
addr: socket_addr,
|
||||
|
@ -1073,10 +1102,7 @@ fn bind_addrs(addrs: impl net::ToSocketAddrs, backlog: u32) -> io::Result<Vec<ne
|
|||
} else if let Some(err) = err.take() {
|
||||
Err(err)
|
||||
} else {
|
||||
Err(io::Error::new(
|
||||
io::ErrorKind::Other,
|
||||
"Can not bind to address.",
|
||||
))
|
||||
Err(io::Error::other("Could not bind to address"))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
|
||||
## Unreleased
|
||||
|
||||
## 3.7.0
|
||||
|
||||
- Update `brotli` dependency to `8`.
|
||||
|
||||
## 3.6.0
|
||||
|
||||
- Prevent panics on connection pool drop when Tokio runtime is shutdown early.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "awc"
|
||||
version = "3.6.0"
|
||||
version = "3.7.0"
|
||||
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
|
||||
description = "Async HTTP and WebSocket client library"
|
||||
keywords = ["actix", "http", "framework", "async", "web"]
|
||||
|
@ -97,9 +97,9 @@ dangerous-h2c = []
|
|||
|
||||
[dependencies]
|
||||
actix-codec = "0.5"
|
||||
actix-service = "2"
|
||||
actix-http = { version = "3.10", features = ["http2", "ws"] }
|
||||
actix-rt = { version = "2.1", default-features = false }
|
||||
actix-service = "2"
|
||||
actix-tls = { version = "3.4", features = ["connect", "uri"] }
|
||||
actix-utils = "3"
|
||||
|
||||
|
@ -112,7 +112,7 @@ futures-util = { version = "0.3.17", default-features = false, features = ["allo
|
|||
h2 = "0.3.26"
|
||||
http = "0.2.7"
|
||||
itoa = "1"
|
||||
log ="0.4"
|
||||
log = "0.4"
|
||||
mime = "0.3"
|
||||
percent-encoding = "2.1"
|
||||
pin-project-lite = "0.2"
|
||||
|
@ -120,7 +120,7 @@ rand = "0.9"
|
|||
serde = "1.0"
|
||||
serde_json = "1.0"
|
||||
serde_urlencoded = "0.7"
|
||||
tokio = { version = "1.24.2", features = ["sync"] }
|
||||
tokio = { version = "1.38.2", features = ["sync"] }
|
||||
|
||||
cookie = { version = "0.16", features = ["percent-encode"], optional = true }
|
||||
|
||||
|
@ -141,15 +141,15 @@ actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23"] }
|
|||
actix-utils = "3"
|
||||
actix-web = { version = "4", features = ["openssl"] }
|
||||
|
||||
brotli = "7"
|
||||
const-str = "0.5"
|
||||
brotli = "8"
|
||||
const-str = "0.5" # TODO(MSRV 1.77): update to 0.6
|
||||
env_logger = "0.11"
|
||||
flate2 = "1.0.13"
|
||||
futures-util = { version = "0.3.17", default-features = false }
|
||||
static_assertions = "1.1"
|
||||
rcgen = "0.13"
|
||||
rustls-pemfile = "2"
|
||||
tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros"] }
|
||||
tokio = { version = "1.38.2", features = ["rt-multi-thread", "macros"] }
|
||||
zstd = "0.13"
|
||||
tls-rustls-0_23 = { package = "rustls", version = "0.23" } # add rustls 0.23 with default features to make aws_lc_rs work in tests
|
||||
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
<!-- prettier-ignore-start -->
|
||||
|
||||
[](https://crates.io/crates/awc)
|
||||
[](https://docs.rs/awc/3.6.0)
|
||||
[](https://docs.rs/awc/3.7.0)
|
||||

|
||||
[](https://deps.rs/crate/awc/3.6.0)
|
||||
[](https://deps.rs/crate/awc/3.7.0)
|
||||
[](https://discord.gg/NWpN5mmg3x)
|
||||
|
||||
<!-- prettier-ignore-end -->
|
||||
|
|
|
@ -179,9 +179,8 @@ where
|
|||
.acquire_owned()
|
||||
.await
|
||||
.map_err(|_| {
|
||||
ConnectError::Io(io::Error::new(
|
||||
io::ErrorKind::Other,
|
||||
"failed to acquire semaphore on client connection pool",
|
||||
ConnectError::Io(io::Error::other(
|
||||
"Failed to acquire semaphore on client connection pool",
|
||||
))
|
||||
})?;
|
||||
|
||||
|
|
42
justfile
42
justfile
|
@ -1,6 +1,8 @@
|
|||
_list:
|
||||
@just --list
|
||||
|
||||
toolchain := ""
|
||||
|
||||
# Format workspace.
|
||||
fmt:
|
||||
just --unstable --fmt
|
||||
|
@ -10,11 +12,11 @@ fmt:
|
|||
# Downgrade dependencies necessary to run MSRV checks/tests.
|
||||
[private]
|
||||
downgrade-for-msrv:
|
||||
cargo update -p=clap --precise=4.4.18 # next ver: 1.74.0
|
||||
cargo update -p=divan --precise=0.1.15 # next ver: 1.80.0
|
||||
cargo update -p=litemap --precise=0.7.4 # next ver: 1.81.0
|
||||
cargo update -p=zerofrom --precise=0.1.5 # next ver: 1.81.0
|
||||
cargo update -p=half --precise=2.4.1 # next ver: 1.81.0
|
||||
cargo {{ toolchain }} update -p=divan --precise=0.1.15 # next ver: 1.80.0
|
||||
cargo {{ toolchain }} update -p=half --precise=2.4.1 # next ver: 1.81.0
|
||||
cargo {{ toolchain }} update -p=idna_adapter --precise=1.2.0 # next ver: 1.82.0
|
||||
cargo {{ toolchain }} update -p=litemap --precise=0.7.4 # next ver: 1.81.0
|
||||
cargo {{ toolchain }} update -p=zerofrom --precise=0.1.5 # next ver: 1.81.0
|
||||
|
||||
msrv := ```
|
||||
cargo metadata --format-version=1 \
|
||||
|
@ -39,42 +41,50 @@ check-min:
|
|||
check-default:
|
||||
cargo hack --workspace check
|
||||
|
||||
# Run Clippy over workspace.
|
||||
check toolchain="": && (clippy toolchain)
|
||||
# Check workspace.
|
||||
check: && clippy
|
||||
fd --hidden --type=file --extension=md --extension=yml --exec-batch npx -y prettier --check
|
||||
|
||||
# Run Clippy over workspace.
|
||||
clippy toolchain="":
|
||||
clippy:
|
||||
cargo {{ toolchain }} clippy --workspace --all-targets {{ all_crate_features }}
|
||||
|
||||
# Test workspace using MSRV.
|
||||
test-msrv: downgrade-for-msrv (test msrv_rustup)
|
||||
# Run Clippy over workspace using MSRV.
|
||||
clippy-msrv:
|
||||
@just toolchain={{ msrv_rustup }} downgrade-for-msrv
|
||||
@just toolchain={{ msrv_rustup }} clippy
|
||||
|
||||
# Test workspace code.
|
||||
test toolchain="":
|
||||
test:
|
||||
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 --no-tests=warn -p=actix-router --no-default-features
|
||||
cargo {{ toolchain }} nextest run --no-tests=warn --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 using MSRV.
|
||||
test-msrv:
|
||||
@just toolchain={{ msrv_rustup }} downgrade-for-msrv
|
||||
@just toolchain={{ msrv_rustup }} test
|
||||
|
||||
# Test workspace docs.
|
||||
test-docs toolchain="": && doc
|
||||
test-docs: && doc
|
||||
cargo {{ toolchain }} test --doc --workspace {{ all_crate_features }} --no-fail-fast -- --nocapture
|
||||
|
||||
# Test workspace.
|
||||
test-all toolchain="": (test toolchain) (test-docs toolchain)
|
||||
test-all: test test-docs
|
||||
|
||||
# Test workspace and collect coverage info.
|
||||
[private]
|
||||
test-coverage toolchain="":
|
||||
test-coverage:
|
||||
cargo {{ toolchain }} llvm-cov nextest --no-tests=warn --no-report {{ all_crate_features }}
|
||||
cargo {{ toolchain }} llvm-cov --doc --no-report {{ all_crate_features }}
|
||||
|
||||
# Test workspace and generate Codecov report.
|
||||
test-coverage-codecov toolchain="": (test-coverage toolchain)
|
||||
test-coverage-codecov: test-coverage
|
||||
cargo {{ toolchain }} llvm-cov report --doctests --codecov --output-path=codecov.json
|
||||
|
||||
# Test workspace and generate LCOV report.
|
||||
test-coverage-lcov toolchain="": (test-coverage toolchain)
|
||||
test-coverage-lcov: test-coverage
|
||||
cargo {{ toolchain }} llvm-cov report --doctests --lcov --output-path=lcov.info
|
||||
|
||||
# Document crates in workspace.
|
||||
|
|
Loading…
Reference in New Issue