Merge pull request #307 from sebadob/update-all-deps

Update dependencies and bump minor versions

Cargo.toml

@@ -26,47 +26,70 @@ strip = true
 panic = "abort"
 
 [workspace.dependencies]
+accept-language = "3"
 actix = "0.13"
 actix-multipart = "0.6"
 actix-service = "2"
-actix-web = { version = "4.4", features = ["rustls-0_21"] }
+actix-web = { version = "4.4", features = ["rustls-0_22"] }
 actix-web-actors = "4"
 actix-web-lab = "0.20"
+actix-web-prom = "0.8.0"
+actix-web-validator = "5"
+anyhow = "1"
 argon2 = { version = "0.5", features = ["std", "zeroize"] }
 askama = { version = "0.12", features = ["with-actix-web"] }
 askama_actix = "0.14"
 async-trait = "0.1.74"
+base64 = "0.22.0"
 bincode = "1"
 cached = "0.49.2"
 chacha20poly1305 = { version = "0.10", features = ["std"] }
 chrono = { version = "0.4", default-features = false, features = ["clock", "serde", "std"] }
-cryptr = { version = "0.2", features = ["s3", "streaming"] }
+cron = "0.12"
+cryptr = { version = "0.3", features = ["s3", "streaming"] }
 css-color = "0.2"
 derive_more = "0.99"
 dotenvy = "0.15"
 ed25519-compact = { version = "2.0.4", features = ["ed25519"] }
 flume = "0.11"
+futures = "0.3"
+futures-util = "0.3"
 gethostname = "0.4"
-http-serde = "1.1.3"
+hex = { version = "0.4", features = ["serde"] }
+hmac-sha256 = { version = "1.1.7", features = ["traits010"] }
+hmac-sha512 = { version = "1.1.5", features = ["traits010", "sha384"] }
 image = "0.25.1"
 itertools = "0.12"
 jwt-simple = { version = "0.12.6", default-features = false, features = ["pure-rust"] }
 lazy_static = "1"
+lettre = { version = "0.11", default-features = false, features = [
+    "builder", "smtp-transport", "tokio1-rustls-tls", "tracing"
+] }
+matrix-sdk = { version = "0.7.1", default-features = false, features = [
+    "e2e-encryption", "markdown", "rustls-tls"
+] }
 mime = "0.3.17"
 mime_guess = "2"
 num_cpus = "1"
 ## Add openssl-sys as a direct dependency, so it can be cross compiled to
 ## x86_64-unknown-linux-musl using the "vendored" feature below
 openssl-sys = { version = "0.9", features = ["vendored"] }
+oxiri = "0.2.2"
+prometheus = "0.13.3"
 rand = "0.8"
 rand_core = { version = "0.6", features = ["std"] }
-redhac = "0.9.0"
+redhac = "0.10.0"
 regex = "1"
-# bump to 0.21. requires an update for the matrix sdk beforehand
-reqwest = { version = "0.11.27", default-features = false, features = ["json", "rustls-tls"] }
+reqwest = { version = "0.12.3", default-features = false, features = ["json", "rustls-tls"] }
 ring = "0.17"
 rio_api = "0.8.4"
 rio_turtle = "0.8.4"
+rsa = { version = "0.9.3", features = ["serde", "sha2"] }
+# actix_web does not have 0.23 support yet
+rustls = "0.22"
+rustls-pki-types = "1.4.1"
+#rustls-pemfile = "1"
+rustls-pemfile = "2.1.2"
 rusty-s3 = "0.5.0"
 semver = { version = "1.0.19", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
@@ -79,7 +102,9 @@ tracing = { version = "0.1", features = ["attributes"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter", "tracing"] }
 tokio = { version = "1", features = ["full"] }
 utoipa = { version = "4", features = ["actix_extras", "chrono", "openapi_extensions"] }
-utoipa-swagger-ui = { version = "5", features = ["actix-web"] }
+utoipa-swagger-ui = { version = "6.0.0", features = ["actix-web"] }
+uuid = { version = "1", features = ["serde", "v4"] }
+# v0.18 breaks quite a few things - sticking to 0.16 for now
 validator = { version = "0.16", features = ["derive"] }
 webauthn-rs = { version = "0.4", features = [
     "danger-allow-state-serialisation", "danger-credential-internals", "resident-key-support"

dev_notes.md

@@ -4,13 +4,8 @@
 
 ## TODO before v0.22
 
-- update matrix SDK dependencies to be able to update all deps to the latest versions
-  -> maybe drop matrix-sdk in favor of ruma-client because of huge dependencies and the full sdk is
-  not needed at all? we actually only need the client to post events
-- BUG: wrong path in the default Dockerfile which points to the DEV TLS certificates
-  -> Fix has been pushed - test and validate with next nightly or beta image build
-- create and test a "Login with Github" flow and add documentation about it in the book
-- after matrix-sdk has been fixed / updated, update all deps
+- maybe migrate the old client logos handling to the new optimized webp flow?
+- document "Login with Github" guide
 
 ## Stage 1 - essentials
 

rauthy-common/Cargo.toml

@@ -9,7 +9,7 @@ license.workspace = true
 actix-multipart = { workspace = true }
 actix-web = { workspace = true }
 argon2 = { workspace = true }
-base64 = "0.21"
+base64 = { workspace = true }
 bincode = { workspace = true }
 chacha20poly1305 = { workspace = true }
 chrono = { workspace = true }
@@ -18,7 +18,7 @@ cryptr = { workspace = true }
 derive_more = { workspace = true }
 flume = { workspace = true }
 gethostname = { workspace = true }
-image = { workspcae = true }
+image = { workspace = true }
 lazy_static = { workspace = true }
 once_cell = "1"
 rand = { workspace = true }
@@ -38,7 +38,7 @@ tracing = { workspace = true }
 tokio = { workspace = true }
 utoipa = { workspace = true }
 validator = { workspace = true }
-oxiri = "0.2.2"
+oxiri = { workspace = true }
 
 [dev-dependencies]
 pretty_assertions = "1"

rauthy-common/src/error_response.rs

@@ -410,3 +410,15 @@ impl From<ImageError> for ErrorResponse {
         )
     }
 }
+
+impl From<actix_web::http::header::ToStrError> for ErrorResponse {
+    fn from(value: actix_web::http::header::ToStrError) -> Self {
+        ErrorResponse::new(
+            ErrorResponseType::BadRequest,
+            format!(
+                "Request headers contained non ASCII characters: {:?}",
+                value
+            ),
+        )
+    }
+}

rauthy-handlers/Cargo.toml

@@ -11,10 +11,10 @@ actix-multipart = { workspace = true }
 actix-web = { workspace = true }
 actix-web-actors = { workspace = true }
 actix-web-lab = { workspace = true }
-actix-web-validator = "5"
+actix-web-validator = { workspace = true }
 chrono = { workspace = true }
 cryptr = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
 image = { workspace = true }
 lazy_static = { workspace = true }
 mime_guess = { workspace = true }

rauthy-main/Cargo.toml

@@ -10,22 +10,23 @@ sqlite = []
 
 [dependencies]
 actix-web = { workspace = true }
-actix-web-prom = "0.7.0"
+actix-web-prom = { workspace = true }
 actix-service = { workspace = true }
 chrono = { workspace = true }
-cron = "0.12"
+cron = { workspace = true }
 cryptr = { workspace = true }
 dotenvy = { workspace = true }
 flume = { workspace = true }
 num_cpus = { workspace = true }
-prometheus = "0.13.3"
+prometheus = { workspace = true }
 rauthy-common = { path = "../rauthy-common" }
 rauthy-handlers = { path = "../rauthy-handlers" }
 rauthy-models = { path = "../rauthy-models" }
 rauthy-service = { path = "../rauthy-service" }
 redhac = { workspace = true }
-rustls = "0.21"
-rustls-pemfile = "1"
+rustls = { workspace = true }
+rustls-pki-types = { workspace = true }
+rustls-pemfile = { workspace = true }
 semver = { workspace = true }
 serde_json = { workspace = true }
 spow = { workspace = true }

rauthy-main/src/main.rs

@@ -602,7 +602,7 @@ async fn actix_main(app_state: web::Data<AppState>) -> std::io::Result<()> {
 
         ListenScheme::Https => {
             server
-                .bind_rustls_021(
+                .bind_rustls_0_22(
                     format!("{}:{}", &listen_addr, get_https_port()),
                     tls::load_tls().await,
                 )?
@@ -613,7 +613,7 @@ async fn actix_main(app_state: web::Data<AppState>) -> std::io::Result<()> {
         ListenScheme::HttpHttps => {
             server
                 .bind(format!("{}:{}", &listen_addr, get_http_port()))?
-                .bind_rustls_021(
+                .bind_rustls_0_22(
                     format!("{}:{}", &listen_addr, get_https_port()),
                     tls::load_tls().await,
                 )?