Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
726 changes: 372 additions & 354 deletions Cargo.lock

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ features = ["axum", "axum-extra", "axum-json", "axum-query", "macros"]
# GraphQL server
[workspace.dependencies.async-graphql]
version = "7.0.15"
features = ["chrono", "url", "tracing"]
default-features = false
features = ["chrono", "url", "tracing", "playground"]

[workspace.dependencies.async-stream]
version = "0.3.6"
Expand Down Expand Up @@ -115,7 +116,7 @@ features = ["derive"]

# Cron expressions
[workspace.dependencies.cron]
version = "0.13.0"
version = "0.15.0"

# Elliptic curve cryptography
[workspace.dependencies.elliptic-curve]
Expand All @@ -133,7 +134,7 @@ version = "0.3.31"

# Rate-limiting
[workspace.dependencies.governor]
version = "0.7.0"
version = "0.8.0"

# HTTP headers
[workspace.dependencies.headers]
Expand Down Expand Up @@ -258,7 +259,7 @@ version = "0.23.22"

# Use platform-specific verifier for TLS
[workspace.dependencies.rustls-platform-verifier]
version = "0.3.4"
version = "0.5.0"

# JSON Schema generation
[workspace.dependencies.schemars]
Expand Down
1 change: 0 additions & 1 deletion crates/axum-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ publish = false
workspace = true

[dependencies]
async-trait.workspace = true
axum.workspace = true
axum-extra.workspace = true
chrono.workspace = true
Expand Down
4 changes: 1 addition & 3 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bytes.workspace = true
camino.workspace = true
clap.workspace = true
console = "0.15.10"
dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
dialoguer = { version = "0.11.0", default-features = false, features = ["fuzzy-select", "password"] }
dotenvy = "0.15.7"
figment.workspace = true
futures-util.workspace = true
Expand All @@ -39,7 +39,6 @@ serde_yaml = "0.9.34"
sqlx.workspace = true
tokio.workspace = true
tokio-util.workspace = true
tokio-stream.workspace = true
tower.workspace = true
tower-http.workspace = true
url.workspace = true
Expand Down Expand Up @@ -81,7 +80,6 @@ mas-tasks.workspace = true
mas-templates.workspace = true
mas-tower.workspace = true

oauth2-types.workspace = true
syn2mas.workspace = true

[build-dependencies]
Expand Down
1 change: 0 additions & 1 deletion crates/data-model/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ url.workspace = true
crc = "3.2.1"
ulid.workspace = true
rand.workspace = true
rand_chacha = "0.3.1"
regex = "1.11.1"
woothee = "0.13.0"
ruma-common.workspace = true
Expand Down
6 changes: 4 additions & 2 deletions crates/handlers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ serde_urlencoded = "0.7.1"

# Password hashing
argon2 = { version = "0.5.3", features = ["password-hash", "std"] }
bcrypt = "0.16.0"
bcrypt = { version = "0.16.0", default-features = true }
pbkdf2 = { version = "0.12.2", features = [
"password-hash",
"std",
Expand Down Expand Up @@ -107,6 +107,8 @@ zxcvbn = "3.1.0"
[dev-dependencies]
insta.workspace = true
tracing-subscriber.workspace = true
cookie_store = { version = "0.21.1", default-features = false, features = ["serde_json"] }
cookie_store = { version = "0.21.1", default-features = false, features = [
"serde_json",
] }
sqlx.workspace = true
wiremock.workspace = true
1 change: 1 addition & 0 deletions crates/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ opentelemetry-http.workspace = true
opentelemetry-semantic-conventions.workspace = true
opentelemetry.workspace = true
reqwest.workspace = true
rustls.workspace = true
rustls-platform-verifier.workspace = true
tokio.workspace = true
tower.workspace = true
Expand Down
4 changes: 3 additions & 1 deletion crates/http/src/reqwest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use opentelemetry_semantic_conventions::{
NETWORK_TYPE, SERVER_ADDRESS, SERVER_PORT, URL_FULL, URL_SCHEME, USER_AGENT_ORIGINAL,
},
};
use rustls_platform_verifier::ConfigVerifierExt;
use tokio::time::Instant;
use tower::{BoxError, Service as _};
use tracing::Instrument;
Expand Down Expand Up @@ -91,9 +92,10 @@ impl reqwest::dns::Resolve for TracingResolver {
#[must_use]
pub fn client() -> reqwest::Client {
// TODO: can/should we limit in-flight requests?
let tls_config = rustls::ClientConfig::with_platform_verifier();
reqwest::Client::builder()
.dns_resolver(Arc::new(TracingResolver::new()))
.use_preconfigured_tls(rustls_platform_verifier::tls_config())
.use_preconfigured_tls(tls_config)
.user_agent(USER_AGENT)
.timeout(Duration::from_secs(60))
.connect_timeout(Duration::from_secs(30))
Expand Down
Loading