matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-07 17:03:01 +03:00
Code Activity

Upgrade most HTTP/Hyper crates and make mas-listener work

Browse Source
This commit is contained in:
Quentin Gliech
2024-07-01 18:21:05 +02:00
parent ba58195414
commit a7a9369469
10 changed files with 232 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
Cargo.lock generated
View File

@@ -571,19 +571,19 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]] [[package]]
name = "axum" name = "axum"
version = "0.6.20" version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum-core", "axum-core",
"bitflags 1.3.2",
"bytes", "bytes",
"futures-util", "futures-util",
"headers", "http 1.1.0",
"http 0.2.12", "http-body 1.0.0",
"http-body 0.4.6", "http-body-util",
"hyper 0.14.29", "hyper 1.4.0",
"hyper-util",
"itoa", "itoa",
"matchit", "matchit",
"memchr", "memchr",
@@ -595,57 +595,64 @@ dependencies = [
"serde_json", "serde_json",
"serde_path_to_error", "serde_path_to_error",
"serde_urlencoded", "serde_urlencoded",
"sync_wrapper", "sync_wrapper 1.0.1",
"tokio", "tokio",
"tower", "tower",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing",
] ]
[[package]] [[package]]
name = "axum-core" name = "axum-core"
version = "0.3.4" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
"futures-util", "futures-util",
"http 0.2.12", "http 1.1.0",
"http-body 0.4.6", "http-body 1.0.0",
"http-body-util",
"mime", "mime",
"pin-project-lite",
"rustversion", "rustversion",
"sync_wrapper 0.1.2",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing",
] ]
[[package]] [[package]]
name = "axum-extra" name = "axum-extra"
version = "0.8.0" version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ab90e7b70bea63a153137162affb6a0bce26b584c24a4c7885509783e2cf30b" checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733"
dependencies = [ dependencies = [
"axum", "axum",
"axum-core", "axum-core",
"bytes", "bytes",
"cookie 0.17.0", "cookie",
"futures-util", "futures-util",
"http 0.2.12", "headers 0.4.0",
"http-body 0.4.6", "http 1.1.0",
"http-body 1.0.0",
"http-body-util",
"mime", "mime",
"pin-project-lite", "pin-project-lite",
"serde", "serde",
"tokio",
"tower", "tower",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing",
] ]
[[package]] [[package]]
name = "axum-macros" name = "axum-macros"
version = "0.3.8" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" checksum = "00c055ee2d014ae5981ce1016374e8213682aa14d9bf40e48ab48b5f3ef20eaa"
dependencies = [ dependencies = [
"heck 0.4.1", "heck 0.4.1",
"proc-macro2", "proc-macro2",
@@ -1039,12 +1046,12 @@ dependencies = [
[[package]] [[package]]
name = "cookie" name = "cookie"
version = "0.17.0" version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
dependencies = [ dependencies = [
"aes-gcm", "aes-gcm",
"base64 0.21.7", "base64 0.22.1",
"hkdf", "hkdf",
"percent-encoding", "percent-encoding",
"rand", "rand",
@@ -1054,24 +1061,13 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "cookie"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
dependencies = [
"percent-encoding",
"time",
"version_check",
]
[[package]] [[package]]
name = "cookie_store" name = "cookie_store"
version = "0.21.0" version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
dependencies = [ dependencies = [
"cookie 0.18.1", "cookie",
"idna 0.5.0", "idna 0.5.0",
"log", "log",
"publicsuffix", "publicsuffix",
@@ -2112,13 +2108,28 @@ checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"bytes", "bytes",
"headers-core", "headers-core 0.2.0",
"http 0.2.12", "http 0.2.12",
"httpdate", "httpdate",
"mime", "mime",
"sha1", "sha1",
] ]
[[package]]
name = "headers"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
dependencies = [
"base64 0.21.7",
"bytes",
"headers-core 0.3.0",
"http 1.1.0",
"httpdate",
"mime",
"sha1",
]
[[package]] [[package]]
name = "headers-core" name = "headers-core"
version = "0.2.0" version = "0.2.0"
@@ -2128,6 +2139,15 @@ dependencies = [
"http 0.2.12", "http 0.2.12",
] ]
[[package]]
name = "headers-core"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
dependencies = [
"http 1.1.0",
]
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.4.1" version = "0.4.1"
@@ -2320,17 +2340,19 @@ dependencies = [
[[package]] [[package]]
name = "hyper-rustls" name = "hyper-rustls"
version = "0.25.0" version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"http 0.2.12", "http 1.1.0",
"hyper 0.14.29", "hyper 1.4.0",
"rustls 0.22.4", "hyper-util",
"rustls 0.23.10",
"rustls-pki-types", "rustls-pki-types",
"tokio", "tokio",
"tokio-rustls", "tokio-rustls 0.26.0",
"tower-service",
] ]
[[package]] [[package]]
@@ -2340,12 +2362,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel",
"futures-util", "futures-util",
"http 1.1.0", "http 1.1.0",
"http-body 1.0.0", "http-body 1.0.0",
"hyper 1.4.0", "hyper 1.4.0",
"pin-project-lite", "pin-project-lite",
"socket2 0.5.7",
"tokio", "tokio",
"tower",
"tower-service",
"tracing",
] ]
[[package]] [[package]]
@@ -2899,7 +2926,7 @@ dependencies = [
"rustls-pemfile 2.1.2", "rustls-pemfile 2.1.2",
"socket2 0.5.7", "socket2 0.5.7",
"tokio", "tokio",
"tokio-rustls", "tokio-rustls 0.25.0",
"tracing", "tracing",
"url", "url",
"webpki-roots 0.26.3", "webpki-roots 0.26.3",
@@ -3001,9 +3028,9 @@ dependencies = [
"chrono", "chrono",
"data-encoding", "data-encoding",
"futures-util", "futures-util",
"headers", "headers 0.3.9",
"http 0.2.12", "http 1.1.0",
"http-body 0.4.6", "http-body 1.0.0",
"icu_locid", "icu_locid",
"mas-data-model", "mas-data-model",
"mas-http", "mas-http",
@@ -3041,7 +3068,7 @@ dependencies = [
"dotenvy", "dotenvy",
"figment", "figment",
"httpdate", "httpdate",
"hyper 0.14.29", "hyper 1.4.0",
"ipnetwork", "ipnetwork",
"itertools 0.13.0", "itertools 0.13.0",
"listenfd", "listenfd",
@@ -3086,7 +3113,7 @@ dependencies = [
"sqlx", "sqlx",
"tokio", "tokio",
"tower", "tower",
"tower-http", "tower-http 0.4.4",
"tracing", "tracing",
"tracing-appender", "tracing-appender",
"tracing-opentelemetry", "tracing-opentelemetry",
@@ -3148,7 +3175,7 @@ name = "mas-email"
version = "0.9.0" version = "0.9.0"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"headers", "headers 0.3.9",
"lettre", "lettre",
"mas-templates", "mas-templates",
"thiserror", "thiserror",
@@ -3172,8 +3199,8 @@ dependencies = [
"chrono", "chrono",
"cookie_store", "cookie_store",
"futures-util", "futures-util",
"headers", "headers 0.3.9",
"hyper 0.14.29", "hyper 1.4.0",
"insta", "insta",
"lettre", "lettre",
"mas-axum-utils", "mas-axum-utils",
@@ -3210,7 +3237,7 @@ dependencies = [
"time", "time",
"tokio", "tokio",
"tower", "tower",
"tower-http", "tower-http 0.4.4",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"ulid", "ulid",
@@ -3225,10 +3252,10 @@ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
"futures-util", "futures-util",
"headers", "headers 0.3.9",
"http 0.2.12", "http 1.1.0",
"http-body 0.4.6", "http-body 1.0.0",
"hyper 0.14.29", "hyper 1.4.0",
"hyper-rustls", "hyper-rustls",
"mas-tower", "mas-tower",
"opentelemetry", "opentelemetry",
@@ -3241,7 +3268,7 @@ dependencies = [
"thiserror", "thiserror",
"tokio", "tokio",
"tower", "tower",
"tower-http", "tower-http 0.4.4",
"tracing", "tracing",
"tracing-opentelemetry", "tracing-opentelemetry",
] ]
@@ -3301,7 +3328,7 @@ dependencies = [
"convert_case", "convert_case",
"csv", "csv",
"futures-util", "futures-util",
"hyper 0.14.29", "hyper 1.4.0",
"serde", "serde",
"tokio", "tokio",
"tracing", "tracing",
@@ -3376,18 +3403,19 @@ dependencies = [
"bytes", "bytes",
"event-listener 5.3.1", "event-listener 5.3.1",
"futures-util", "futures-util",
"http-body 0.4.6", "http-body 1.0.0",
"hyper 0.14.29", "hyper 1.4.0",
"hyper-util",
"libc", "libc",
"pin-project-lite", "pin-project-lite",
"rustls-pemfile 2.1.2", "rustls-pemfile 2.1.2",
"socket2 0.5.7", "socket2 0.5.7",
"thiserror", "thiserror",
"tokio", "tokio",
"tokio-rustls", "tokio-rustls 0.25.0",
"tokio-test", "tokio-test",
"tower-http", "tower",
"tower-service", "tower-http 0.5.2",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
] ]
@@ -3398,7 +3426,7 @@ version = "0.9.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
"http 0.2.12", "http 1.1.0",
"serde", "serde",
"tokio", "tokio",
"url", "url",
@@ -3410,7 +3438,7 @@ version = "0.9.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
"http 0.2.12", "http 1.1.0",
"mas-axum-utils", "mas-axum-utils",
"mas-http", "mas-http",
"mas-matrix", "mas-matrix",
@@ -3433,10 +3461,10 @@ dependencies = [
"chrono", "chrono",
"form_urlencoded", "form_urlencoded",
"futures-util", "futures-util",
"headers", "headers 0.3.9",
"http 0.2.12", "http 1.1.0",
"http-body 0.4.6", "http-body 1.0.0",
"hyper 0.14.29", "hyper 1.4.0",
"hyper-rustls", "hyper-rustls",
"language-tags", "language-tags",
"mas-http", "mas-http",
@@ -3456,7 +3484,7 @@ dependencies = [
"thiserror", "thiserror",
"tokio", "tokio",
"tower", "tower",
"tower-http", "tower-http 0.4.4",
"tracing", "tracing",
"url", "url",
"wiremock", "wiremock",
@@ -3592,7 +3620,7 @@ dependencies = [
"arc-swap", "arc-swap",
"camino", "camino",
"chrono", "chrono",
"http 0.2.12", "http 1.1.0",
"mas-data-model", "mas-data-model",
"mas-i18n", "mas-i18n",
"mas-router", "mas-router",
@@ -3616,7 +3644,7 @@ dependencies = [
name = "mas-tower" name = "mas-tower"
version = "0.9.0" version = "0.9.0"
dependencies = [ dependencies = [
"http 0.2.12", "http 1.1.0",
"opentelemetry", "opentelemetry",
"opentelemetry-http", "opentelemetry-http",
"opentelemetry-semantic-conventions", "opentelemetry-semantic-conventions",
@@ -3860,7 +3888,7 @@ dependencies = [
"assert_matches", "assert_matches",
"chrono", "chrono",
"data-encoding", "data-encoding",
"http 0.2.12", "http 1.1.0",
"language-tags", "language-tags",
"mas-iana", "mas-iana",
"mas-jose", "mas-jose",
@@ -4887,6 +4915,19 @@ dependencies = [
"zeroize", "zeroize",
] ]
[[package]]
name = "rustls"
version = "0.23.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
dependencies = [
"once_cell",
"rustls-pki-types",
"rustls-webpki 0.102.4",
"subtle",
"zeroize",
]
[[package]] [[package]]
name = "rustls-native-certs" name = "rustls-native-certs"
version = "0.7.0" version = "0.7.0"
@@ -5841,6 +5882,12 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
[[package]]
name = "sync_wrapper"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
[[package]] [[package]]
name = "synstructure" name = "synstructure"
version = "0.13.1" version = "0.13.1"
@@ -5997,6 +6044,17 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "tokio-rustls"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
"rustls 0.23.10",
"rustls-pki-types",
"tokio",
]
[[package]] [[package]]
name = "tokio-stream" name = "tokio-stream"
version = "0.1.15" version = "0.1.15"
@@ -6116,6 +6174,22 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "tower-http"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
dependencies = [
"bitflags 2.6.0",
"bytes",
"http 1.1.0",
"http-body 1.0.0",
"http-body-util",
"pin-project-lite",
"tower-layer",
"tower-service",
]
[[package]] [[package]]
name = "tower-layer" name = "tower-layer"
version = "0.3.2" version = "0.3.2"

26
Cargo.toml
View File

@@ -68,6 +68,15 @@ version = "0.1.80"
[workspace.dependencies.anyhow] [workspace.dependencies.anyhow]
version = "1.0.86" version = "1.0.86"
# HTTP router
[workspace.dependencies.axum]
version = "0.7.5"
# Extra utilities for Axum
[workspace.dependencies.axum-extra]
version = "0.9.3"
features = ["cookie-private", "cookie-key-expansion", "typed-header"]
# UTF-8 paths # UTF-8 paths
[workspace.dependencies.camino] [workspace.dependencies.camino]
version = "1.1.7" version = "1.1.7"
@@ -94,20 +103,25 @@ version = "0.3.9"
# HTTP request/response # HTTP request/response
[workspace.dependencies.http] [workspace.dependencies.http]
version = "0.2.12" version = "1.1.0"
# HTTP body trait # HTTP body trait
[workspace.dependencies.http-body] [workspace.dependencies.http-body]
version = "0.4.6" version = "1.0.0"
# HTTP client # HTTP client and server
[workspace.dependencies.hyper] [workspace.dependencies.hyper]
version = "0.14.29" version = "1.4.0"
features = ["client", "http1", "http2", "stream", "runtime"] features = ["client", "http1", "http2"]
# Additional Hyper utilties
[workspace.dependencies.hyper-util]
version = "0.1.6"
features = ["server", "server-auto", "service", "http1", "http2", "tokio"]
# Hyper Rustls support # Hyper Rustls support
[workspace.dependencies.hyper-rustls] [workspace.dependencies.hyper-rustls]
version = "0.25.0" version = "0.27.2"
features = ["http1", "http2"] features = ["http1", "http2"]
default-features = false default-features = false

4
crates/axum-utils/Cargo.toml
View File

@@ -13,8 +13,8 @@ workspace = true
[dependencies] [dependencies]
async-trait.workspace = true async-trait.workspace = true
axum = { version = "0.6.20", features = ["headers"] } axum.workspace = true
axum-extra = { version = "0.8.0", features = ["cookie-private", "cookie-key-expansion"] } axum-extra.workspace = true
chrono.workspace = true chrono.workspace = true
data-encoding = "2.6.0" data-encoding = "2.6.0"
futures-util = "0.3.30" futures-util = "0.3.30"

2
crates/cli/Cargo.toml
View File

@@ -13,7 +13,7 @@ workspace = true
[dependencies] [dependencies]
anyhow.workspace = true anyhow.workspace = true
axum = "0.6.20" axum.workspace = true
camino.workspace = true camino.workspace = true
clap.workspace = true clap.workspace = true
console = "0.15.8" console = "0.15.8"

13
crates/handlers/Cargo.toml
View File

@@ -31,9 +31,9 @@ sentry = { version = "0.31.8", default-features = false }
hyper.workspace = true hyper.workspace = true
tower.workspace = true tower.workspace = true
tower-http = { version = "0.4.4", features = ["cors"] } tower-http = { version = "0.4.4", features = ["cors"] }
axum = "0.6.20" axum.workspace = true
axum-macros = "0.3.8" axum-macros = "0.4.1"
axum-extra = { version = "0.8.0", features = ["cookie-private"] } axum-extra.workspace = true
async-graphql.workspace = true async-graphql.workspace = true
@@ -52,7 +52,12 @@ serde_urlencoded = "0.7.1"
# Password hashing # Password hashing
argon2 = { version = "0.5.3", features = ["password-hash", "std"] } argon2 = { version = "0.5.3", features = ["password-hash", "std"] }
bcrypt = "0.15.1" bcrypt = "0.15.1"
pbkdf2 = { version = "0.12.2", features = ["password-hash", "std", "simple", "parallel"] } pbkdf2 = { version = "0.12.2", features = [
"password-hash",
"std",
"simple",
"parallel",
] }
zeroize = "1.8.1" zeroize = "1.8.1"
# Various data types and utilities # Various data types and utilities

17
crates/http/Cargo.toml
View File

@@ -40,13 +40,12 @@ tokio.workspace = true
[features] [features]
client = [ client = [
"dep:mas-tower", "dep:mas-tower",
"dep:rustls", "dep:rustls",
"hyper/tcp", "dep:hyper-rustls",
"dep:hyper-rustls", "dep:rustls-platform-verifier",
"dep:rustls-platform-verifier", "tower/limit",
"tower/limit", "tower-http/timeout",
"tower-http/timeout", "tower-http/follow-redirect",
"tower-http/follow-redirect", "tower-http/set-header",
"tower-http/set-header",
] ]

5
crates/listener/Cargo.toml
View File

@@ -17,14 +17,15 @@ event-listener = "5.3.1"
futures-util = "0.3.30" futures-util = "0.3.30"
http-body.workspace = true http-body.workspace = true
hyper = { workspace = true, features = ["server"] } hyper = { workspace = true, features = ["server"] }
hyper-util.workspace = true
libc = "0.2.155" libc = "0.2.155"
pin-project-lite = "0.2.14" pin-project-lite = "0.2.14"
socket2 = "0.5.7" socket2 = "0.5.7"
thiserror.workspace = true thiserror.workspace = true
tokio.workspace = true tokio.workspace = true
tokio-rustls = "0.25.0" tokio-rustls = "0.25.0"
tower-http = { version = "0.4.4", features = ["add-extension"] } tower.workspace = true
tower-service = "0.3.2" tower-http = { version = "0.5.2", features = ["add-extension"] }
tracing.workspace = true tracing.workspace = true
[dev-dependencies] [dev-dependencies]

5
crates/listener/examples/demo/main.rs
View File

@@ -21,16 +21,17 @@ use std::{
}; };
use anyhow::Context; use anyhow::Context;
use hyper::{service::service_fn, Request, Response}; use hyper::{Request, Response};
use mas_listener::{server::Server, shutdown::ShutdownStream, ConnectionInfo}; use mas_listener::{server::Server, shutdown::ShutdownStream, ConnectionInfo};
use tokio::signal::unix::SignalKind; use tokio::signal::unix::SignalKind;
use tokio_rustls::rustls::{server::WebPkiClientVerifier, RootCertStore, ServerConfig}; use tokio_rustls::rustls::{server::WebPkiClientVerifier, RootCertStore, ServerConfig};
use tower::service_fn;
static CA_CERT_PEM: &[u8] = include_bytes!("./certs/ca.pem"); static CA_CERT_PEM: &[u8] = include_bytes!("./certs/ca.pem");
static SERVER_CERT_PEM: &[u8] = include_bytes!("./certs/server.pem"); static SERVER_CERT_PEM: &[u8] = include_bytes!("./certs/server.pem");
static SERVER_KEY_PEM: &[u8] = include_bytes!("./certs/server-key.pem"); static SERVER_KEY_PEM: &[u8] = include_bytes!("./certs/server-key.pem");
async fn handler(req: Request<hyper::Body>) -> Result<Response<String>, Infallible> { async fn handler(req: Request<hyper::body::Incoming>) -> Result<Response<String>, Infallible> {
tracing::info!("Handling request"); tracing::info!("Handling request");
tokio::time::sleep(Duration::from_secs(3)).await; tokio::time::sleep(Duration::from_secs(3)).await;
let info = req.extensions().get::<ConnectionInfo>().unwrap(); let info = req.extensions().get::<ConnectionInfo>().unwrap();

68
crates/listener/src/server.rs
View File

@@ -22,14 +22,17 @@ use std::{
use event_listener::{Event, EventListener}; use event_listener::{Event, EventListener};
use futures_util::{stream::SelectAll, Stream, StreamExt}; use futures_util::{stream::SelectAll, Stream, StreamExt};
use http_body::Body; use hyper::{Request, Response};
use hyper::{body::HttpBody, server::conn::Connection, Request, Response}; use hyper_util::{
rt::{TokioExecutor, TokioIo},
server::conn::auto::Connection,
service::TowerToHyperService,
};
use pin_project_lite::pin_project; use pin_project_lite::pin_project;
use thiserror::Error; use thiserror::Error;
use tokio::io::{AsyncRead, AsyncWrite};
use tokio_rustls::rustls::ServerConfig; use tokio_rustls::rustls::ServerConfig;
use tower::Service;
use tower_http::add_extension::AddExtension; use tower_http::add_extension::AddExtension;
use tower_service::Service;
use tracing::Instrument; use tracing::Instrument;
use crate::{ use crate::{
@@ -91,10 +94,10 @@ impl<S> Server<S> {
/// Run a single server /// Run a single server
pub async fn run<B, SD>(self, shutdown: SD) pub async fn run<B, SD>(self, shutdown: SD)
where where
S: Service<Request<hyper::Body>, Response = Response<B>> + Clone + Send + 'static, S: Service<Request<hyper::body::Incoming>, Response = Response<B>> + Clone + Send + 'static,
S::Future: Send + 'static, S::Future: Send + 'static,
S::Error: std::error::Error + Send + Sync + 'static, S::Error: std::error::Error + Send + Sync + 'static,
B: Body + Send + 'static, B: http_body::Body + Send + 'static,
B::Data: Send, B::Data: Send,
B::Error: std::error::Error + Send + Sync + 'static, B::Error: std::error::Error + Send + Sync + 'static,
SD: Stream + Unpin, SD: Stream + Unpin,
@@ -173,15 +176,20 @@ async fn accept<S, B>(
stream: UnixOrTcpConnection, stream: UnixOrTcpConnection,
service: S, service: S,
) -> Result< ) -> Result<
Connection<MaybeTlsStream<Rewind<UnixOrTcpConnection>>, AddExtension<S, ConnectionInfo>>, Connection<
'static,
TokioIo<MaybeTlsStream<Rewind<UnixOrTcpConnection>>>,
TowerToHyperService<AddExtension<S, ConnectionInfo>>,
TokioExecutor,
>,
AcceptError, AcceptError,
> >
where where
S: Service<Request<hyper::Body>, Response = Response<B>>, S: Service<Request<hyper::body::Incoming>, Response = Response<B>> + Send + Clone + 'static,
S::Error: std::error::Error + Send + Sync + 'static, S::Error: std::error::Error + Send + Sync + 'static,
S::Future: Send + 'static, S::Future: Send + 'static,
B: HttpBody + Send + 'static, B: http_body::Body + Send + 'static,
B::Data: Send + 'static, B::Data: Send,
B::Error: std::error::Error + Send + Sync + 'static, B::Error: std::error::Error + Send + Sync + 'static,
{ {
let span = tracing::Span::current(); let span = tracing::Span::current();
@@ -219,18 +227,17 @@ where
net_peer_addr: peer_addr.into_net(), net_peer_addr: peer_addr.into_net(),
}; };
let service = AddExtension::new(service, info); let mut builder = hyper_util::server::conn::auto::Builder::new(TokioExecutor::new());
if is_h2 {
builder = builder.http2_only();
}
builder.http1().keep_alive(true);
let conn = if is_h2 { let service = TowerToHyperService::new(AddExtension::new(service, info));
hyper::server::conn::Http::new()
.http2_only(true) let conn = builder
.serve_connection(stream, service) .serve_connection(TokioIo::new(stream), service)
} else { .into_owned();
hyper::server::conn::Http::new()
.http1_only(true)
.http1_keep_alive(true)
.serve_connection(stream, service)
};
Ok(conn) Ok(conn)
}) })
@@ -270,18 +277,19 @@ impl<C> AbortableConnection<C> {
} }
} }
impl<T, S, B> Future for AbortableConnection<Connection<T, S>> impl<T, S, B> Future
for AbortableConnection<Connection<'static, T, TowerToHyperService<S>, TokioExecutor>>
where where
Connection<T, S>: Future, Connection<'static, T, TowerToHyperService<S>, TokioExecutor>: Future,
S: Service<Request<hyper::Body>, Response = Response<B>> + Send + 'static, S: Service<Request<hyper::body::Incoming>, Response = Response<B>> + Send + Clone + 'static,
S::Future: Send + 'static, S::Future: Send + 'static,
S::Error: std::error::Error + Send + Sync, S::Error: std::error::Error + Send + Sync,
B: HttpBody + Send + 'static, T: hyper::rt::Read + hyper::rt::Write + Unpin,
B: http_body::Body + Send + 'static,
B::Data: Send, B::Data: Send,
B::Error: std::error::Error + Send + Sync, B::Error: std::error::Error + Send + Sync + 'static,
T: AsyncRead + AsyncWrite + Unpin,
{ {
type Output = <Connection<T, S> as Future>::Output; type Output = <Connection<'static, T, TowerToHyperService<S>, TokioExecutor> as Future>::Output;
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> { fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.project(); let mut this = self.project();
@@ -308,10 +316,10 @@ where
#[allow(clippy::too_many_lines)] #[allow(clippy::too_many_lines)]
pub async fn run_servers<S, B, SD>(listeners: impl IntoIterator<Item = Server<S>>, mut shutdown: SD) pub async fn run_servers<S, B, SD>(listeners: impl IntoIterator<Item = Server<S>>, mut shutdown: SD)
where where
S: Service<Request<hyper::Body>, Response = Response<B>> + Clone + Send + 'static, S: Service<Request<hyper::body::Incoming>, Response = Response<B>> + Clone + Send + 'static,
S::Future: Send + 'static, S::Future: Send + 'static,
S::Error: std::error::Error + Send + Sync + 'static, S::Error: std::error::Error + Send + Sync + 'static,
B: Body + Send + 'static, B: http_body::Body + Send + 'static,
B::Data: Send, B::Data: Send,
B::Error: std::error::Error + Send + Sync + 'static, B::Error: std::error::Error + Send + Sync + 'static,
SD: Stream + Unpin, SD: Stream + Unpin,

2
crates/router/Cargo.toml
View File

@@ -12,7 +12,7 @@ publish = false
workspace = true workspace = true
[dependencies] [dependencies]
axum = { version = "0.6.20", default-features = false } axum.workspace = true
serde.workspace = true serde.workspace = true
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
url.workspace = true url.workspace = true