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

Bump Rust dependencies

Browse Source
This commit is contained in:
Quentin Gliech
2023-05-25 17:46:44 +02:00
parent d2d68e9a27
commit 1993f4cfca
28 changed files with 664 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1179
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

5
Cargo.toml
View File

@ -22,8 +22,3 @@ opt-level = 3
[patch.crates-io.ulid] [patch.crates-io.ulid]
git = "https://github.com/dylanhart/ulid-rs.git" git = "https://github.com/dylanhart/ulid-rs.git"
rev = "0b9295c2db2114cd87aa19abcc1fc00c16b272db" rev = "0b9295c2db2114cd87aa19abcc1fc00c16b272db"
# Until https://github.com/tokio-rs/tracing-opentelemetry/pull/12 gets merged and released
[patch.crates-io.tracing-opentelemetry]
git = "https://github.com/jaysonsantos/tracing-opentelemetry.git"
rev = "76b0a0fe45fd53c352e8bfdcdfad775aed727e4c"

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

@ -7,23 +7,23 @@ license = "Apache-2.0"
[dependencies] [dependencies]
async-trait = "0.1.68" async-trait = "0.1.68"
axum = { version = "0.6.17", features = ["headers"] } axum = { version = "0.6.18", features = ["headers"] }
axum-extra = { version = "0.7.4", features = ["cookie-private"] } axum-extra = { version = "0.7.4", features = ["cookie-private"] }
chrono = "0.4.24" chrono = "0.4.24"
data-encoding = "2.3.3" data-encoding = "2.4.0"
futures-util = "0.3.28" futures-util = "0.3.28"
headers = "0.3.8" headers = "0.3.8"
http = "0.2.9" http = "0.2.9"
http-body = "0.4.5" http-body = "0.4.5"
mime = "0.3.17" mime = "0.3.17"
rand = "0.8.5" rand = "0.8.5"
sentry = { version = "0.30.0", default-features = false } sentry = { version = "0.31.2", default-features = false }
serde = "1.0.160" serde = "1.0.163"
serde_with = "2.3.2" serde_with = "3.0.0"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
serde_json = "1.0.96" serde_json = "1.0.96"
thiserror = "1.0.40" thiserror = "1.0.40"
tokio = "1.28.0" tokio = "1.28.1"
tower = { version = "0.4.13", features = ["util"] } tower = { version = "0.4.13", features = ["util"] }
tracing = "0.1.37" tracing = "0.1.37"
url = "2.3.1" url = "2.3.1"

18
crates/cli/Cargo.toml
View File

@ -6,23 +6,23 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
apalis-core = "=0.4.0-alpha.5" apalis-core = "=0.4.0"
anyhow = "1.0.70" anyhow = "1.0.71"
atty = "0.2.14" atty = "0.2.14"
axum = "0.6.17" axum = "0.6.18"
camino = "1.1.4" camino = "1.1.4"
clap = { version = "4.2.4", features = ["derive"] } clap = { version = "4.3.0", features = ["derive"] }
dotenv = "0.15.0" dotenv = "0.15.0"
hyper = { version = "0.14.26", features = ["full"] } hyper = { version = "0.14.26", features = ["full"] }
itertools = "0.10.5" itertools = "0.10.5"
listenfd = "1.0.1" listenfd = "1.0.1"
rand = "0.8.5" rand = "0.8.5"
rand_chacha = "0.3.1" rand_chacha = "0.3.1"
rustls = "0.21.0" rustls = "0.21.1"
serde_json = "1.0.96" serde_json = "1.0.96"
serde_yaml = "0.9.21" serde_yaml = "0.9.21"
sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] } sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] }
tokio = { version = "1.28.0", features = ["full"] } tokio = { version = "1.28.1", features = ["full"] }
tower = { version = "0.4.13", features = ["full"] } tower = { version = "0.4.13", features = ["full"] }
tower-http = { version = "0.4.0", features = ["fs", "compression-full"] } tower-http = { version = "0.4.0", features = ["fs", "compression-full"] }
url = "2.3.1" url = "2.3.1"
@ -41,9 +41,9 @@ opentelemetry-zipkin = { version = "0.17.0", features = ["opentelemetry-http"],
opentelemetry-http = { version = "0.8.0", features = ["tokio", "hyper"], optional = true } opentelemetry-http = { version = "0.8.0", features = ["tokio", "hyper"], optional = true }
opentelemetry-prometheus = { version = "0.12.0", optional = true } opentelemetry-prometheus = { version = "0.12.0", optional = true }
prometheus = { version = "0.13.3", optional = true } prometheus = { version = "0.13.3", optional = true }
sentry = { version = "0.30.0", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] } sentry = { version = "0.31.2", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] }
sentry-tracing = "0.30.0" sentry-tracing = "0.31.2"
sentry-tower = { version = "0.30.0", features = ["http"] } sentry-tower = { version = "0.31.2", features = ["http"] }
mas-config = { path = "../config" } mas-config = { path = "../config" }
mas-email = { path = "../email" } mas-email = { path = "../email" }

8
crates/config/Cargo.toml
View File

@ -6,12 +6,12 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
tokio = { version = "1.28.0", features = ["fs", "rt"] } tokio = { version = "1.28.1", features = ["fs", "rt"] }
tracing = "0.1.37" tracing = "0.1.37"
async-trait = "0.1.68" async-trait = "0.1.68"
thiserror = "1.0.40" thiserror = "1.0.40"
anyhow = "1.0.70" anyhow = "1.0.71"
camino = { version = "1.1.4", features = ["serde1"] } camino = { version = "1.1.4", features = ["serde1"] }
chrono = { version = "0.4.24", features = ["serde"] } chrono = { version = "0.4.24", features = ["serde"] }
@ -20,8 +20,8 @@ schemars = { version = "0.8.12", features = ["url", "chrono"] }
ulid = { version = "1.0.0", features = ["serde"] } ulid = { version = "1.0.0", features = ["serde"] }
url = { version = "2.3.1", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] }
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
serde_with = { version = "2.3.2", features = ["hex", "chrono"] } serde_with = { version = "3.0.0", features = ["hex", "chrono"] }
serde_json = "1.0.96" serde_json = "1.0.96"
pem-rfc7468 = "0.7.0" pem-rfc7468 = "0.7.0"

2
crates/data-model/Cargo.toml
View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
[dependencies] [dependencies]
chrono = "0.4.24" chrono = "0.4.24"
thiserror = "1.0.40" thiserror = "1.0.40"
serde = "1.0.160" serde = "1.0.163"
url = { version = "2.3.1", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] }
crc = "3.0.1" crc = "3.0.1"
ulid = { version = "1.0.0", features = ["serde"] } ulid = { version = "1.0.0", features = ["serde"] }

14
crates/email/Cargo.toml
View File

@ -11,13 +11,13 @@ tracing = "0.1.37"
thiserror = "1.0.40" thiserror = "1.0.40"
headers = "0.3.8" headers = "0.3.8"
aws-sdk-sesv2 = { version = "0.26.0", default-features = false } aws-sdk-sesv2 = { version = "0.27.0", default-features = false }
aws-config = { version = "0.55.1", default-features = false } aws-config = { version = "0.55.2", default-features = false }
aws-smithy-client = { version = "0.55.1", default-features = false, features = ["client-hyper"] } aws-smithy-client = { version = "0.55.3", default-features = false, features = ["client-hyper"] }
aws-smithy-async = { version = "0.55.1", default-features = false, features = ["rt-tokio"] } aws-smithy-async = { version = "0.55.3", default-features = false, features = ["rt-tokio"] }
aws-smithy-http = { version = "0.55.1", default-features = false } aws-smithy-http = { version = "0.55.3", default-features = false }
aws-smithy-http-tower = { version = "0.55.1", default-features = false } aws-smithy-http-tower = { version = "0.55.3", default-features = false }
aws-types = "0.55.1" aws-types = "0.55.2"
mas-templates = { path = "../templates" } mas-templates = { path = "../templates" }
mas-http = { path = "../http", features = ["aws-sdk", "client"] } mas-http = { path = "../http", features = ["aws-sdk", "client"] }

10
crates/graphql/Cargo.toml
View File

@ -6,13 +6,13 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
anyhow = "1.0.70" anyhow = "1.0.71"
async-graphql = { version = "5.0.7", features = ["chrono", "url"] } async-graphql = { version = "5.0.8", features = ["chrono", "url"] }
async-trait = "0.1.51" async-trait = "0.1.68"
chrono = "0.4.24" chrono = "0.4.24"
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
thiserror = "1.0.40" thiserror = "1.0.40"
tokio = { version = "1.28.0", features = ["sync"] } tokio = { version = "1.28.1", features = ["sync"] }
tracing = "0.1.37" tracing = "0.1.37"
ulid = "1.0.0" ulid = "1.0.0"
url = "2.3.1" url = "2.3.1"

16
crates/handlers/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "Apache-2.0"
[dependencies] [dependencies]
# Async runtime # Async runtime
tokio = { version = "1.28.0", features = ["macros"] } tokio = { version = "1.28.1", features = ["macros"] }
futures-util = "0.3.28" futures-util = "0.3.28"
# Logging and tracing # Logging and tracing
@ -15,18 +15,18 @@ tracing = "0.1.37"
# Error management # Error management
thiserror = "1.0.40" thiserror = "1.0.40"
anyhow = "1.0.70" anyhow = "1.0.71"
sentry = { version = "0.30.0", default-features = false } sentry = { version = "0.31.2", default-features = false }
# Web server # Web server
hyper = { version = "0.14.26", features = ["full"] } hyper = { version = "0.14.26", features = ["full"] }
tower = "0.4.13" tower = "0.4.13"
tower-http = { version = "0.4.0", features = ["cors"] } tower-http = { version = "0.4.0", features = ["cors"] }
axum = "0.6.17" axum = "0.6.18"
axum-macros = "0.3.7" axum-macros = "0.3.7"
axum-extra = { version = "0.7.4", features = ["cookie-private"] } axum-extra = { version = "0.7.4", features = ["cookie-private"] }
async-graphql = { version = "5.0.7", features = ["tracing", "apollo_tracing"] } async-graphql = { version = "5.0.8", features = ["tracing", "apollo_tracing"] }
# Emails # Emails
lettre = { version = "0.10.4", default-features = false, features = ["builder"] } lettre = { version = "0.10.4", default-features = false, features = ["builder"] }
@ -35,8 +35,8 @@ lettre = { version = "0.10.4", default-features = false, features = ["builder"]
sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] } sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] }
# Various structure (de)serialization # Various structure (de)serialization
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
serde_with = { version = "2.3.2", features = ["hex", "chrono"] } serde_with = { version = "3.0.0", features = ["hex", "chrono"] }
serde_json = "1.0.96" serde_json = "1.0.96"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
@ -49,7 +49,7 @@ zeroize = "1.6.0"
# Various data types and utilities # Various data types and utilities
camino = "1.1.4" camino = "1.1.4"
chrono = { version = "0.4.24", features = ["serde"] } chrono = { version = "0.4.24", features = ["serde"] }
time = "0.3.20" time = "0.3.21"
url = { version = "2.3.1", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] }
mime = "0.3.17" mime = "0.3.17"
rand = "0.8.5" rand = "0.8.5"

18
crates/http/Cargo.toml
View File

@ -6,9 +6,9 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
aws-smithy-http = { version = "0.55.1", optional = true } aws-smithy-http = { version = "0.55.3", optional = true }
aws-types = { version = "0.55.1", optional = true } aws-types = { version = "0.55.2", optional = true }
axum = { version = "0.6.17", optional = true } axum = { version = "0.6.18", optional = true }
bytes = "1.4.0" bytes = "1.4.0"
futures-util = "0.3.28" futures-util = "0.3.28"
headers = "0.3.8" headers = "0.3.8"
@ -18,13 +18,13 @@ hyper = "0.14.26"
hyper-rustls = { version = "0.24.0", features = ["http1", "http2"], default-features = false, optional = true } hyper-rustls = { version = "0.24.0", features = ["http1", "http2"], default-features = false, optional = true }
once_cell = "1.17.1" once_cell = "1.17.1"
opentelemetry = "0.19.0" opentelemetry = "0.19.0"
rustls = { version = "0.21.0", optional = true } rustls = { version = "0.21.1", optional = true }
rustls-native-certs = { version = "0.6.2", optional = true } rustls-native-certs = { version = "0.6.2", optional = true }
serde = "1.0.160" serde = "1.0.163"
serde_json = "1.0.96" serde_json = "1.0.96"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
thiserror = "1.0.40" thiserror = "1.0.40"
tokio = { version = "1.28.0", features = ["sync", "parking_lot"], optional = true } tokio = { version = "1.28.1", features = ["sync", "parking_lot"], optional = true }
tower = { version = "0.4.13", features = [] } tower = { version = "0.4.13", features = [] }
tower-http = { version = "0.4.0", features = ["cors"] } tower-http = { version = "0.4.0", features = ["cors"] }
tracing = "0.1.37" tracing = "0.1.37"
@ -35,9 +35,9 @@ webpki-roots = { version = "0.23.0", optional = true }
mas-tower = { path = "../tower" } mas-tower = { path = "../tower" }
[dev-dependencies] [dev-dependencies]
anyhow = "1.0.70" anyhow = "1.0.71"
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
tokio = { version = "1.28.0", features = ["macros", "rt"] } tokio = { version = "1.28.1", features = ["macros", "rt"] }
tower = { version = "0.4.13", features = ["util"] } tower = { version = "0.4.13", features = ["util"] }
[features] [features]

8
crates/iana-codegen/Cargo.toml
View File

@ -6,14 +6,14 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
anyhow = "1.0.70" anyhow = "1.0.71"
async-trait = "0.1.68" async-trait = "0.1.68"
camino = "1.1.4" camino = "1.1.4"
convert_case = "0.6.0" convert_case = "0.6.0"
csv = "1.2.1" csv = "1.2.1"
futures-util = "0.3.28" futures-util = "0.3.28"
hyper = { version = "0.14.16", features = ["tcp", "client", "http1"] } hyper = { version = "0.14.26", features = ["tcp", "client", "http1"] }
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
tokio = { version = "1.28.0", features = ["macros", "rt-multi-thread", "fs", "io-util"] } tokio = { version = "1.28.1", features = ["macros", "rt-multi-thread", "fs", "io-util"] }
tracing = "0.1.37" tracing = "0.1.37"
tracing-subscriber = "0.3.17" tracing-subscriber = "0.3.17"

2
crates/iana/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
serde = { version = "1.0.160", optional = true } serde = { version = "1.0.163", optional = true }
schemars = { version = "0.8.12", default-features = false, optional = true } schemars = { version = "0.8.12", default-features = false, optional = true }
[features] [features]

12
crates/jose/Cargo.toml
View File

@ -8,21 +8,21 @@ license = "Apache-2.0"
[dependencies] [dependencies]
base64ct = { version = "1.6.0", features = ["std"] } base64ct = { version = "1.6.0", features = ["std"] }
chrono = { version = "0.4.24", features = ["serde"] } chrono = { version = "0.4.24", features = ["serde"] }
digest = "0.10.6" digest = "0.10.7"
ecdsa = { version = "0.16.6", features = ["signing", "verifying"] } ecdsa = { version = "0.16.7", features = ["signing", "verifying"] }
elliptic-curve = "0.13.4" elliptic-curve = "0.13.5"
generic-array = "0.14.7" generic-array = "0.14.7"
hmac = "0.12.1" hmac = "0.12.1"
k256 = { version = "0.13.1", features = ["ecdsa"] } k256 = { version = "0.13.1", features = ["ecdsa"] }
p256 = { version = "0.13.2", features = ["ecdsa"] } p256 = { version = "0.13.2", features = ["ecdsa"] }
p384 = { version = "0.13.0", features = ["ecdsa"] } p384 = { version = "0.13.0", features = ["ecdsa"] }
rand = "0.8.5" rand = "0.8.5"
rsa = "0.9.0-pre.1" rsa = "0.9.2"
schemars = "0.8.12" schemars = "0.8.12"
sec1 = "0.7.2" sec1 = "0.7.2"
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96" serde_json = "1.0.96"
serde_with = { version = "2.3.2", features = ["base64"] } serde_with = { version = "3.0.0", features = ["base64"] }
sha2 = { version = "0.10.6", features = ["oid"] } sha2 = { version = "0.10.6", features = ["oid"] }
signature = "2.1.0" signature = "2.1.0"
thiserror = "1.0.40" thiserror = "1.0.40"

12
crates/jose/src/jwa/asymmetric.rs
View File

@ -59,17 +59,17 @@ pub enum AsymmetricSigningKey {
impl AsymmetricSigningKey { impl AsymmetricSigningKey {
#[must_use] #[must_use]
pub fn rs256(key: rsa::RsaPrivateKey) -> Self { pub fn rs256(key: rsa::RsaPrivateKey) -> Self {
Self::Rs256(rsa::pkcs1v15::SigningKey::new_with_prefix(key)) Self::Rs256(rsa::pkcs1v15::SigningKey::new(key))
} }
#[must_use] #[must_use]
pub fn rs384(key: rsa::RsaPrivateKey) -> Self { pub fn rs384(key: rsa::RsaPrivateKey) -> Self {
Self::Rs384(rsa::pkcs1v15::SigningKey::new_with_prefix(key)) Self::Rs384(rsa::pkcs1v15::SigningKey::new(key))
} }
#[must_use] #[must_use]
pub fn rs512(key: rsa::RsaPrivateKey) -> Self { pub fn rs512(key: rsa::RsaPrivateKey) -> Self {
Self::Rs512(rsa::pkcs1v15::SigningKey::new_with_prefix(key)) Self::Rs512(rsa::pkcs1v15::SigningKey::new(key))
} }
#[must_use] #[must_use]
@ -277,17 +277,17 @@ pub enum AsymmetricVerifyingKey {
impl AsymmetricVerifyingKey { impl AsymmetricVerifyingKey {
#[must_use] #[must_use]
pub fn rs256(key: rsa::RsaPublicKey) -> Self { pub fn rs256(key: rsa::RsaPublicKey) -> Self {
Self::Rs256(rsa::pkcs1v15::VerifyingKey::new_with_prefix(key)) Self::Rs256(rsa::pkcs1v15::VerifyingKey::new(key))
} }
#[must_use] #[must_use]
pub fn rs384(key: rsa::RsaPublicKey) -> Self { pub fn rs384(key: rsa::RsaPublicKey) -> Self {
Self::Rs384(rsa::pkcs1v15::VerifyingKey::new_with_prefix(key)) Self::Rs384(rsa::pkcs1v15::VerifyingKey::new(key))
} }
#[must_use] #[must_use]
pub fn rs512(key: rsa::RsaPublicKey) -> Self { pub fn rs512(key: rsa::RsaPublicKey) -> Self {
Self::Rs512(rsa::pkcs1v15::VerifyingKey::new_with_prefix(key)) Self::Rs512(rsa::pkcs1v15::VerifyingKey::new(key))
} }
#[must_use] #[must_use]

2
crates/jose/src/jwk/public_parameters.rs
View File

@ -181,7 +181,7 @@ impl OkpPublicParameters {
} }
mod rsa_impls { mod rsa_impls {
use rsa::{BigUint, PublicKeyParts, RsaPublicKey}; use rsa::{traits::PublicKeyParts, BigUint, RsaPublicKey};
use super::{JsonWebKeyPublicParameters, RsaPublicParameters}; use super::{JsonWebKeyPublicParameters, RsaPublicParameters};

10
crates/keystore/Cargo.toml
View File

@ -9,9 +9,9 @@ license = "Apache-2.0"
aead = { version = "0.5.2", features = ["std"] } aead = { version = "0.5.2", features = ["std"] }
const-oid = { version = "0.9.2", features = ["std"] } const-oid = { version = "0.9.2", features = ["std"] }
cookie = { version = "0.17.0", features = ["key-expansion", "private"] } cookie = { version = "0.17.0", features = ["key-expansion", "private"] }
der = { version = "0.7.5", features = ["std"] } der = { version = "0.7.6", features = ["std"] }
ecdsa = { version = "0.16.6", features = ["std"] } ecdsa = { version = "0.16.7", features = ["std"] }
elliptic-curve = { version = "0.13.4", features = ["std", "pem", "sec1"] } elliptic-curve = { version = "0.13.5", features = ["std", "pem", "sec1"] }
k256 = { version = "0.13.1", features = ["std"] } k256 = { version = "0.13.1", features = ["std"] }
p256 = { version = "0.13.2", features = ["std"] } p256 = { version = "0.13.2", features = ["std"] }
p384 = { version = "0.13.0", features = ["std"] } p384 = { version = "0.13.0", features = ["std"] }
@ -19,9 +19,9 @@ pem-rfc7468 = { version = "0.7.0", features = ["std"] }
pkcs1 = { version = "0.7.5", features = ["std"] } pkcs1 = { version = "0.7.5", features = ["std"] }
pkcs8 = { version = "0.10.2", features = ["std", "pkcs5", "encryption"] } pkcs8 = { version = "0.10.2", features = ["std", "pkcs5", "encryption"] }
rand = "0.8.5" rand = "0.8.5"
rsa = { version = "0.9.0-pre.1", features = ["std", "pem"] } rsa = { version = "0.9.2", features = ["std", "pem"] }
sec1 = { version = "0.7.2", features = ["std"] } sec1 = { version = "0.7.2", features = ["std"] }
spki = { version = "0.7.1", features = ["std"] } spki = { version = "0.7.2", features = ["std"] }
thiserror = "1.0.40" thiserror = "1.0.40"
generic-array = "0.14.7" generic-array = "0.14.7"
chacha20poly1305 = { version = "0.10.1", features = ["std"] } chacha20poly1305 = { version = "0.10.1", features = ["std"] }

8
crates/listener/Cargo.toml
View File

@ -12,17 +12,17 @@ http-body = "0.4.5"
hyper = { version = "0.14.26", features = ["server", "http1", "http2", "tcp"] } hyper = { version = "0.14.26", features = ["server", "http1", "http2", "tcp"] }
pin-project-lite = "0.2.9" pin-project-lite = "0.2.9"
thiserror = "1.0.40" thiserror = "1.0.40"
tokio = { version = "1.28.0", features = ["net", "rt", "macros", "signal", "time"] } tokio = { version = "1.28.1", features = ["net", "rt", "macros", "signal", "time"] }
tokio-rustls = "0.24.0" tokio-rustls = "0.24.0"
tower-http = { version = "0.4.0", features = ["add-extension"] } tower-http = { version = "0.4.0", features = ["add-extension"] }
tower-service = "0.3.2" tower-service = "0.3.2"
tracing = "0.1.37" tracing = "0.1.37"
libc = "0.2.142" libc = "0.2.144"
[dev-dependencies] [dev-dependencies]
anyhow = "1.0.70" anyhow = "1.0.71"
rustls-pemfile = "1.0.2" rustls-pemfile = "1.0.2"
tokio = { version = "1.28.0", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] } tokio = { version = "1.28.1", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] }
tokio-test = "0.4.2" tokio-test = "0.4.2"
tracing-subscriber = "0.3.17" tracing-subscriber = "0.3.17"

6
crates/oauth2-types/Cargo.toml
View File

@ -7,16 +7,16 @@ license = "Apache-2.0"
[dependencies] [dependencies]
http = "0.2.9" http = "0.2.9"
serde = "1.0.160" serde = "1.0.163"
serde_json = "1.0.96" serde_json = "1.0.96"
language-tags = { version = "0.3.2", features = ["serde"] } language-tags = { version = "0.3.2", features = ["serde"] }
url = { version = "2.3.1", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] }
parse-display = "0.8.0" parse-display = "0.8.0"
indoc = "2.0.1" indoc = "2.0.1"
serde_with = { version = "2.3.2", features = ["chrono"] } serde_with = { version = "3.0.0", features = ["chrono"] }
chrono = "0.4.24" chrono = "0.4.24"
sha2 = "0.10.6" sha2 = "0.10.6"
data-encoding = "2.3.3" data-encoding = "2.4.0"
thiserror = "1.0.40" thiserror = "1.0.40"
mas-iana = { path = "../iana" } mas-iana = { path = "../iana" }

10
crates/oidc-client/Cargo.toml
View File

@ -30,12 +30,12 @@ http = "0.2.9"
once_cell = "1.17.1" once_cell = "1.17.1"
mime = "0.3.17" mime = "0.3.17"
rand = "0.8.5" rand = "0.8.5"
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96" serde_json = "1.0.96"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
serde_with = "2.3.2" serde_with = "3.0.0"
thiserror = "1.0.40" thiserror = "1.0.40"
tokio = { version = "1.28.0", features = ["rt", "macros", "rt-multi-thread"] } tokio = { version = "1.28.1", features = ["rt", "macros", "rt-multi-thread"] }
tower = { version = "0.4.13", features = ["full"] } tower = { version = "0.4.13", features = ["full"] }
tracing = "0.1.37" tracing = "0.1.37"
url = { version = "2.3.1", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] }
@ -48,7 +48,7 @@ oauth2-types = { path = "../oauth2-types" }
# Default http service # Default http service
http-body = { version = "0.4.5", optional = true } http-body = { version = "0.4.5", optional = true }
rustls = {version = "0.21.0", optional = true } rustls = {version = "0.21.1", optional = true }
[dependencies.hyper-rustls] [dependencies.hyper-rustls]
version = "0.24.0" version = "0.24.0"
features = ["http1", "http2", "rustls-native-certs"] features = ["http1", "http2", "rustls-native-certs"]
@ -65,7 +65,7 @@ optional = true
[dev-dependencies] [dev-dependencies]
assert_matches = "1.5.0" assert_matches = "1.5.0"
bitflags = "2.2.1" bitflags = "2.3.1"
mas-keystore = { path = "../keystore" } mas-keystore = { path = "../keystore" }
rand_chacha = "0.3.1" rand_chacha = "0.3.1"
wiremock = "0.5.18" wiremock = "0.5.18"

10
crates/policy/Cargo.toml
View File

@ -6,20 +6,20 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
anyhow = "1.0.70" anyhow = "1.0.71"
opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" } opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" }
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96" serde_json = "1.0.96"
thiserror = "1.0.40" thiserror = "1.0.40"
tokio = { version = "1.28.0", features = ["io-util"] } tokio = { version = "1.28.1", features = ["io-util"] }
tracing = "0.1.37" tracing = "0.1.37"
wasmtime = { version = "7.0.0", default-features = false, features = ["async", "cranelift"] } wasmtime = { version = "9.0.1", default-features = false, features = ["async", "cranelift"] }
mas-data-model = { path = "../data-model" } mas-data-model = { path = "../data-model" }
oauth2-types = { path = "../oauth2-types" } oauth2-types = { path = "../oauth2-types" }
[dev-dependencies] [dev-dependencies]
tokio = { version = "1.28.0", features = ["fs", "rt", "macros"] } tokio = { version = "1.28.1", features = ["fs", "rt", "macros"] }
[features] [features]
cache = ["wasmtime/cache"] cache = ["wasmtime/cache"]

4
crates/router/Cargo.toml
View File

@ -6,8 +6,8 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
axum = { version = "0.6.17", default-features = false } axum = { version = "0.6.18", default-features = false }
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
url = "2.3.1" url = "2.3.1"
ulid = "1.0.0" ulid = "1.0.0"

4
crates/spa/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96" serde_json = "1.0.96"
thiserror = "1.0.40" thiserror = "1.0.40"
camino = { version = "1.1.4", features = ["serde1"] } camino = { version = "1.1.4", features = ["serde1"] }
@ -14,7 +14,7 @@ headers = "0.3.8"
http = "0.2.9" http = "0.2.9"
tower-service = "0.3.2" tower-service = "0.3.2"
tower-http = { version = "0.4.0", features = ["fs"] } tower-http = { version = "0.4.0", features = ["fs"] }
tokio = { version = "1.28.0", features = ["fs"] } tokio = { version = "1.28.1", features = ["fs"] }
[[bin]] [[bin]]
name = "render" name = "render"

4
crates/storage-pg/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "Apache-2.0"
async-trait = "0.1.68" async-trait = "0.1.68"
sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json", "uuid"] } sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json", "uuid"] }
chrono = { version = "0.4.24", features = ["serde"] } chrono = { version = "0.4.24", features = ["serde"] }
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96" serde_json = "1.0.96"
thiserror = "1.0.40" thiserror = "1.0.40"
tracing = "0.1.37" tracing = "0.1.37"
@ -18,7 +18,7 @@ futures-util = "0.3.28"
rand = "0.8.5" rand = "0.8.5"
rand_chacha = "0.3.1" rand_chacha = "0.3.1"
url = { version = "2.3.1", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] }
uuid = "1.3.1" uuid = "1.3.3"
ulid = { version = "1.0.0", features = ["uuid", "serde"] } ulid = { version = "1.0.0", features = ["uuid", "serde"] }
oauth2-types = { path = "../oauth2-types" } oauth2-types = { path = "../oauth2-types" }

4
crates/storage/Cargo.toml
View File

@ -11,10 +11,10 @@ chrono = "0.4.24"
thiserror = "1.0.40" thiserror = "1.0.40"
futures-util = "0.3.28" futures-util = "0.3.28"
apalis-core = { version = "=0.4.0-alpha.5", features = ["tokio-comp"] } apalis-core = { version = "=0.4.0", features = ["tokio-comp"] }
opentelemetry = "0.19.0" opentelemetry = "0.19.0"
rand_core = "0.6.4" rand_core = "0.6.4"
serde = "1.0.160" serde = "1.0.163"
serde_json = "1.0.96" serde_json = "1.0.96"
tracing = "0.1.37" tracing = "0.1.37"
tracing-opentelemetry = "0.19.0" tracing-opentelemetry = "0.19.0"

10
crates/tasks/Cargo.toml
View File

@ -6,10 +6,10 @@ edition = "2021"
license = "apache-2.0" license = "apache-2.0"
[dependencies] [dependencies]
anyhow = "1.0.70" anyhow = "1.0.71"
apalis-core = { version = "=0.4.0-alpha.5", features = ["extensions", "tokio-comp"] } apalis-core = { version = "=0.4.0", features = ["extensions", "tokio-comp"] }
apalis-cron = "=0.4.0-alpha.5" apalis-cron = "=0.4.0"
apalis-sql = { version = "=0.4.0-alpha.5", features = ["postgres", "tokio-comp"] } apalis-sql = { version = "=0.4.0", features = ["postgres", "tokio-comp"] }
async-trait = "0.1.68" async-trait = "0.1.68"
chrono = "0.4.24" chrono = "0.4.24"
rand = "0.8.5" rand = "0.8.5"
@ -22,7 +22,7 @@ tracing-opentelemetry = "0.19.0"
opentelemetry = "0.19.0" opentelemetry = "0.19.0"
ulid = "1.0.0" ulid = "1.0.0"
url = "2.3.1" url = "2.3.1"
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
mas-axum-utils = { path = "../axum-utils" } mas-axum-utils = { path = "../axum-utils" }
mas-data-model = { path = "../data-model" } mas-data-model = { path = "../data-model" }

3
crates/tasks/src/database.rs
View File

@ -22,6 +22,7 @@ use apalis_core::{
executor::TokioExecutor, executor::TokioExecutor,
job::Job, job::Job,
monitor::Monitor, monitor::Monitor,
utils::timer::TokioTimer,
}; };
use apalis_cron::CronStream; use apalis_cron::CronStream;
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
@ -75,7 +76,7 @@ pub(crate) fn register(
let schedule = apalis_cron::Schedule::from_str("*/15 * * * * *").unwrap(); let schedule = apalis_cron::Schedule::from_str("*/15 * * * * *").unwrap();
let worker_name = format!("{job}-{suffix}", job = CleanupExpiredTokensJob::NAME); let worker_name = format!("{job}-{suffix}", job = CleanupExpiredTokensJob::NAME);
let worker = WorkerBuilder::new(worker_name) let worker = WorkerBuilder::new(worker_name)
.stream(CronStream::new(schedule).to_stream()) .stream(CronStream::new(schedule).timer(TokioTimer).to_stream())
.layer(state.inject()) .layer(state.inject())
.layer(metrics_layer::<CleanupExpiredTokensJob>()) .layer(metrics_layer::<CleanupExpiredTokensJob>())
.build_fn(cleanup_expired_tokens); .build_fn(cleanup_expired_tokens);

6
crates/templates/Cargo.toml
View File

@ -7,13 +7,13 @@ license = "Apache-2.0"
[dependencies] [dependencies]
tracing = "0.1.37" tracing = "0.1.37"
tokio = { version = "1.28.0", features = ["macros", "rt"] } tokio = { version = "1.28.1", features = ["macros", "rt"] }
anyhow = "1.0.70" anyhow = "1.0.71"
thiserror = "1.0.40" thiserror = "1.0.40"
tera = "1.18.1" tera = "1.18.1"
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96" serde_json = "1.0.96"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"

4
crates/tower/Cargo.toml
View File

@ -6,12 +6,12 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
aws-smithy-http = { version = "0.55.1", optional = true } aws-smithy-http = { version = "0.55.3", optional = true }
http = "0.2.9" http = "0.2.9"
tracing = "0.1.37" tracing = "0.1.37"
tracing-opentelemetry = "0.19.0" tracing-opentelemetry = "0.19.0"
tower = "0.4.13" tower = "0.4.13"
tokio = { version = "1.28.0", features = ["time"] } tokio = { version = "1.28.1", features = ["time"] }
opentelemetry = { version = "0.19.0", features = ["metrics"] } opentelemetry = { version = "0.19.0", features = ["metrics"] }
opentelemetry-http = "0.8.0" opentelemetry-http = "0.8.0"
pin-project-lite = "0.2.9" pin-project-lite = "0.2.9"