chore: updated dependencies

fix: test on windows

Author: Nicolas Pernoud

backend/Cargo.toml

@@ -16,7 +16,7 @@ argon2 = { features = ["alloc", "password-hash"], default-features = false, vers
 async_zip = { features = ["deflate", "tokio"], default-features = false, version = "0.0.18" }
 async-stream = "0.3.6"
 async-walkdir = "2.1.0"
-aws-lc-rs = { version = "1.15.0", default-features = false, features = ["bindgen"] }
+aws-lc-rs = { version = "1.15.1", default-features = false, features = ["bindgen"] }
 axum = { version = "0.8.7", features = ["http2", "json", "query", "tokio"], default-features = false }
 axum-extra = { version = "0.12.2", features = ["cookie-private", "typed-header"], default-features = false }
 axum-server = { version = "0.7.3", default-features = false, features = ["tls-rustls"] }
@@ -27,14 +27,14 @@ filetime = "0.2.26"
 futures = { default-features = false, version = "0.3.31" }
 futures-util = { default-features = false, version = "0.3.31" }
 headers = "0.4.1"
-http = "1.3.1"
+http = "1.4.0"
 http-body-util = "0.1.3"
 hyper = { version = "1.8.1", default-features = false }
 hyper-hickory = { version = "0.8.0", default-features = false, features = ["system-config", "tokio"] }
 hyper-rustls = { version = "0.27.7", features = ["aws-lc-rs", "http1", "http2", "tls12", "webpki-tokio"], default-features = false }
-hyper-util = { version = "0.1.18", features = ["client-legacy", "http1", "tokio"], default-features = false }
+hyper-util = { version = "0.1.19", features = ["client-legacy", "http1", "tokio"], default-features = false }
 jsonwebtoken = { version = "10.2.0", features = ["aws_lc_rs"], default-features = false }
-maxminddb = "0.26.0"
+maxminddb = "0.27.0"
 mime_guess = { default-features = false, version = "2.0.5" }
 oauth2 = { version = "5.0.0", default-features = false }
 percent-encoding = { default-features = false, version = "2.3.2" }
@@ -43,7 +43,7 @@ rand = { default-features = false, version = "0.9.2", features = ["os_rng"] }
 rcgen = { version = "0.14.5", default-features = false, optional = true, features = ["aws_lc_rs", "crypto", "pem"] }
 rustls = { default-features = false, version = "0.23.35", features = ["aws_lc_rs"] }
 rustls-acme = { version = "0.14.1", features = ["aws-lc-rs", "axum", "webpki-roots"], default-features = false }
-rustls-pki-types = { version = "1.13.0" }
+rustls-pki-types = { version = "1.13.1" }
 serde = { version = "1.0.228", default-features = false }
 serde_json = { default-features = false, version = "1.0.145" }
 serde_yaml_ng = "0.10.0"
@@ -54,14 +54,14 @@ tokio = { version = "1.48.0", features = ["full"], default-features = false }
 tokio-stream = { version = "0.1.17", default-features = false }
 tokio-util = { version = "0.7.17", default-features = false }
 tower = { default-features = false, version = "0.5.2", features = ["util"] }
-tower-http = { version = "0.6.6", features = ["fs"], default-features = false }
+tower-http = { version = "0.6.7", features = ["fs"], default-features = false }
 tower-service = "0.3.3"
-tracing = { default-features = false, version = "0.1.41", features = ["attributes"] }
-tracing-appender = "0.2.3"
-tracing-subscriber = { version = "0.3.20", features = ["ansi", "env-filter", "local-time"], default-features = false }
+tracing = { default-features = false, version = "0.1.43", features = ["attributes"] }
+tracing-appender = "0.2.4"
+tracing-subscriber = { version = "0.3.22", features = ["ansi", "env-filter", "local-time"], default-features = false }
 trim-in-place = "0.1.7"
 urlencoding = "2.1.3"
-uuid = { version = "1.18.1", features = ["fast-rng", "v4"], default-features = false }
+uuid = { version = "1.19.0", features = ["fast-rng", "v4"], default-features = false }
 
 [features]
 default = ["self_signed"]
@@ -145,7 +145,6 @@ single_match_else = "warn"
 string_add = "warn"
 string_add_assign = "warn"
 string_lit_as_bytes = "warn"
-string_to_string = "warn"
 todo = "warn"
 trait_duplication_in_bounds = "warn"
 undocumented_unsafe_blocks = "warn"

backend/src/logger.rs

@@ -28,17 +28,16 @@ pub fn city_from_ip(addr: SocketAddr, reader: OptionalMaxMindReader) -> String {
         V6(ip) if ip.to_ipv4_mapped().is_some_and(|ip| ip.is_loopback()) => LOCALHOST.to_owned(),
         _ => {
             if let Some(reader) = reader {
-                match reader.lookup::<geoip2::City<'_>>(ip) {
-                    Ok(Some(city)) => format!(
+                if let Ok(result) = reader.lookup(ip)
+                    && let Ok(Some(city)) = result.decode::<geoip2::City<'_>>()
+                {
+                    format!(
                         "{}, {}",
-                        city.city.map_or(UNKNOWN_CITY, |c| c
-                            .names
-                            .map_or(UNKNOWN_CITY, |n| n.get("en").unwrap_or(&UNKNOWN_CITY))),
-                        city.country.map_or(UNKNOWN_COUNTRY, |c| c
-                            .names
-                            .map_or(UNKNOWN_COUNTRY, |n| n.get("en").unwrap_or(&UNKNOWN_COUNTRY)))
-                    ),
-                    Ok(None) | Err(_) => "unknown location".to_owned(),
+                        city.city.names.english.unwrap_or(UNKNOWN_CITY),
+                        city.country.names.english.unwrap_or(UNKNOWN_COUNTRY),
+                    )
+                } else {
+                    "unknown location".to_owned()
                 }
             } else {
                 "unknown location (no geo ip database)".to_owned()

backend/tests/backend/davs.rs

@@ -6,6 +6,7 @@ use hyper::{Method, header::RANGE};
 use quick_xml::escape::escape;
 use sha2::{Digest, Sha512};
 use std::{
+    fs,
     io::{self, BufWriter, Write},
     time::{Duration, Instant},
 };
@@ -233,10 +234,10 @@ async fn get_correct_range() -> BoxResult<()> {
             .send()
             .await?;
         assert_eq!(resp.status(), 206);
-        assert_eq!(
-            resp.text().await?,
-            "estie vitae volutpat eget, aliquet ac ipsum. Quisqu"
-        );
+
+        let file_content = fs::read("tests/data/lorem.txt")?;
+        let expected_content = &file_content[20000..=20050];
+        assert_eq!(resp.bytes().await?, expected_content);
     }
 
     Ok(())

backend/tests/backend/helpers.rs

@@ -48,11 +48,9 @@ impl TestApp {
         install_tracing();
         let id = random_string(16);
         create_test_tree(&id).ok();
-        let main_listener =
-            std::net::TcpListener::bind("127.0.0.1:0").expect("failed to bind to random port");
-        main_listener
-            .set_nonblocking(true)
-            .expect("non blocking listener");
+        let main_listener = TcpListener::bind("127.0.0.1:0")
+            .await
+            .expect("tcp listener");
         let main_addr = (main_listener).local_addr().unwrap();
         let main_port = main_addr.port();
         let mock1_listener = TcpListener::bind("127.0.0.1:0")
@@ -89,15 +87,18 @@ impl TestApp {
         let (server_status, server_started) = broadcast::channel(16);
 
         let server_handle = tokio::spawn(async move {
+            let std_listener = main_listener.into_std().expect("std listener");
             loop {
+                let cloned_listener = std_listener.try_clone().expect("std listener");
+                let tokio_listener =
+                    TcpListener::from_std(cloned_listener).expect("tokio tcp listener");
                 info!("Configuration read !");
                 let mut rx = tx.subscribe();
                 let app = Server::build(&fp, tx.clone())
                     .await
                     .expect("could not build server from configuration");
                 let server = axum::serve(
-                    TcpListener::from_std(main_listener.try_clone().expect("cloned main listener"))
-                        .expect("tokio listener"),
+                    tokio_listener,
                     app.router
                         .into_make_service_with_connect_info::<SocketAddr>(),
                 )

frontend/android/app/build.gradle.kts

@@ -21,12 +21,12 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     defaultConfig {

frontend/android/gradle.properties

@@ -1,3 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true

frontend/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip

frontend/android/settings.gradle.kts

@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.9.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 
 include(":app")