Update deps

Cargo.toml

@@ -27,22 +27,22 @@ ddnet-accounts-types = { version = "0.1.0", path = "lib/ddnet-accounts-types" }
 ddnet-accounts-shared = { version = "0.1.0", path = "lib/ddnet-accounts-shared" }
 ddnet-account-sql = { version = "0.2.0", path = "lib/ddnet-account-sql", features = ["mysql"] }
 
-tokio = { version = "1.39.3", features = ["rt-multi-thread", "sync", "fs", "time", "macros"] }
-axum = "0.7.5"
-anyhow = { version = "1.0.86", features = ["backtrace"] }
+tokio = { version = "1.41.1", features = ["rt-multi-thread", "sync", "fs", "time", "macros"] }
+axum = "0.7.9"
+anyhow = { version = "1.0.93", features = ["backtrace"] }
 # https://github.com/launchbadge/sqlx/issues/2636
 sqlx = { version = "=0.6.3", features = ["mysql", "any", "runtime-tokio-rustls", "chrono"] }
 email_address = { version = "0.2.9", features = ["serde"] }
 ed25519-dalek = { version = "2.1.1", features = ["serde", "pkcs8"] }
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 argon2 = "0.5.3"
-serde_json = "1.0.125"
+serde_json = "1.0.133"
 parking_lot = "0.12.3"
-lettre = "0.11.7"
-serde = { version = "1.0.208", features = ["derive"] }
-url = { version = "2.5.2", features = ["serde"] }
+lettre = "0.11.10"
+serde = { version = "1.0.215", features = ["derive"] }
+url = { version = "2.5.4", features = ["serde"] }
 log = "0.4.22"
-clap = { version = "4.5.16", features = ["derive", "cargo"] }
+clap = { version = "4.5.21", features = ["derive", "cargo"] }
 env_logger = "0.11.5"
 rcgen = { version = "0.13.1" }
 x509-cert = { version = "0.2.5", features = ["builder"] }
@@ -52,13 +52,13 @@ rand = { version = "0.8.5", features = ["getrandom"], default-features = false }
 sha2 = { version = "0.10", features = ["oid"] }
 der = { version = "0.7.9", features = ["derive"] }
 chrono = { version = "0.4.38", features = ["serde"] }
-tower_governor = "0.4.2"
+tower_governor = "0.4.3"
 tower = "0.4.13"
 strum = { version = "0.26.3", features = ["derive"] }
-reqwest = { version = "0.12.5" }
+reqwest = { version = "0.12.9" }
 hex = "0.4.3"
 iprange = "0.6.7"
-ipnet = "2.9.0"
+ipnet = "2.10.1"
 either = "1.13.0"
 notify = { version = "6.1.1", default-features = false, features = ["macos_kqueue"] }
 
@@ -68,5 +68,5 @@ ddnet-account-game-server = { version = "0.2.0", path = "lib/ddnet-account-game-
 ddnet-account-client-http-fs = { version = "0.1.0", path = "lib/ddnet-account-client-http-fs" }
 ddnet-account-client-reqwest = { version = "0.1.0", path = "lib/ddnet-account-client-reqwest" }
 
-regex = "1.10.6"
-tempfile = "3.12.0"
+regex = "1.11.1"
+tempfile = "3.14.0"

lib/ddnet-account-client-http-fs/Cargo.toml

@@ -12,15 +12,15 @@ ddnet-accounts-shared = { version = "0.1.0", path = "../ddnet-accounts-shared" }
 ddnet-accounts-types = { version = "0.1.0", path = "../ddnet-accounts-types" }
 ddnet-account-client = { version = "0.1.0", path = "../ddnet-account-client" }
 
-anyhow = { version = "1.0.86", features = ["backtrace"] }
+anyhow = { version = "1.0.93", features = ["backtrace"] }
 parking_lot = "0.12.3"
-async-trait = "0.1.81"
-url = { version = "2.5.2", features = ["serde"] }
-tokio = { version = "1.39.3", features = ["rt-multi-thread", "sync", "fs", "time", "macros"] }
-serde = { version = "1.0.208", features = ["derive"] }
-serde_json = "1.0.125"
+async-trait = "0.1.83"
+url = { version = "2.5.4", features = ["serde"] }
+tokio = { version = "1.41.1", features = ["rt-multi-thread", "sync", "fs", "time", "macros"] }
+serde = { version = "1.0.215", features = ["derive"] }
+serde_json = "1.0.133"
 email_address = { version = "0.2.9", features = ["serde"] }
-tempfile = "3.12.0"
+tempfile = "3.14.0"
 x509-cert = { version = "0.2.5" }
 either = "1.13.0"
 chrono = { version = "0.4.38", features = ["serde"] }

lib/ddnet-account-client-http-fs/src/client.rs

@@ -3,11 +3,11 @@ use std::{
     time::Duration,
 };
 
+use anyhow::anyhow;
 use ddnet_account_client::{
     errors::{FsLikeError, HttpLikeError},
     interface::Io,
 };
-use anyhow::anyhow;
 use serde::{Deserialize, Serialize};
 
 use crate::{fs::Fs, http::Http};

lib/ddnet-account-client-http-fs/src/http.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 
-use ddnet_account_client::errors::HttpLikeError;
 use async_trait::async_trait;
+use ddnet_account_client::errors::HttpLikeError;
 use url::Url;
 
 #[async_trait]

lib/ddnet-account-client-reqwest/Cargo.toml

@@ -11,7 +11,7 @@ repository = "https://github.com/ddnet/ddnet-accounts"
 ddnet-account-client-http-fs = { version = "0.1.0", path = "../ddnet-account-client-http-fs" }
 ddnet-account-client = { version = "0.1.0", path = "../ddnet-account-client" }
 
-async-trait = "0.1.81"
-url = { version = "2.5.2", features = ["serde"] }
-reqwest = { version = "0.12.5" }
-anyhow = { version = "1.0.86", features = ["backtrace"] }
+async-trait = "0.1.83"
+url = { version = "2.5.4", features = ["serde"] }
+reqwest = { version = "0.12.9" }
+anyhow = { version = "1.0.93", features = ["backtrace"] }

lib/ddnet-account-client/Cargo.toml

@@ -11,12 +11,12 @@ repository = "https://github.com/ddnet/ddnet-accounts"
 ddnet-accounts-shared = { version = "0.1.0", path = "../ddnet-accounts-shared" }
 ddnet-accounts-types = { version = "0.1.0", path = "../ddnet-accounts-types" }
 
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 email_address = { version = "0.2.9", features = ["serde"] }
-serde_json = "1.0.125"
-anyhow = { version = "1.0.86", features = ["backtrace"] }
-thiserror = "1.0.63"
-serde = { version = "1.0.208", features = ["derive"] }
+serde_json = "1.0.133"
+anyhow = { version = "1.0.93", features = ["backtrace"] }
+thiserror = "1.0.69"
+serde = { version = "1.0.215", features = ["derive"] }
 x509-parser = { version = "0.16.0", default-features = false }
 x509-cert = { version = "0.2.5" }
 hex = "0.4.3"

lib/ddnet-account-client/src/certs.rs

@@ -1,7 +1,7 @@
+use anyhow::anyhow;
 use ddnet_accounts_shared::{
     account_server::certs::AccountServerCertificates, game_server::user_id::VerifyingKey,
 };
-use anyhow::anyhow;
 use x509_cert::{
     der::{Decode, Encode},
     spki::DecodePublicKey,

lib/ddnet-account-client/src/safe_interface.rs

@@ -1,3 +1,5 @@
+use anyhow::anyhow;
+use async_trait::async_trait;
 use ddnet_accounts_shared::{
     account_server::{
         account_info::AccountInfoResponse, account_token::AccountTokenError,
@@ -19,8 +21,6 @@ use ddnet_accounts_shared::{
     },
 };
 use ddnet_accounts_types::account_id::AccountId;
-use anyhow::anyhow;
-use async_trait::async_trait;
 use serde::Deserialize;
 
 use crate::{
@@ -112,7 +112,7 @@ pub struct IoSafe<'a> {
     pub io: &'a dyn Io,
 }
 
-impl<'a> IoSafe<'a> {
+impl IoSafe<'_> {
     fn des_from_vec<T>(data: Vec<u8>) -> anyhow::Result<T, HttpLikeError>
     where
         for<'de> T: Deserialize<'de>,
@@ -130,7 +130,7 @@ impl<'a> From<&'a dyn Io> for IoSafe<'a> {
 }
 
 #[async_trait]
-impl<'a> SafeIo for IoSafe<'a> {
+impl SafeIo for IoSafe<'_> {
     async fn request_credential_auth_email_token(
         &self,
         data: CredentialAuthTokenEmailRequest,

lib/ddnet-account-client/src/sign.rs

@@ -1,7 +1,7 @@
+use anyhow::anyhow;
 use ddnet_accounts_shared::client::{
     account_data::AccountDataForClient, machine_id::machine_uid, sign::prepare_sign_request,
 };
-use anyhow::anyhow;
 use thiserror::Error;
 use x509_parser::oid_registry::asn1_rs::FromDer;
 

lib/ddnet-account-game-server/Cargo.toml

@@ -14,13 +14,13 @@ ddnet-account-sql = { version = "0.2.0", path = "../ddnet-account-sql", default-
 
 # https://github.com/launchbadge/sqlx/issues/2636
 sqlx = { version = "=0.6.3", features = ["any", "runtime-tokio-rustls", "chrono"] }
-anyhow = { version = "1.0.86", features = ["backtrace"] }
-async-trait = "0.1.81"
-thiserror = "1.0.63"
+anyhow = { version = "1.0.93", features = ["backtrace"] }
+async-trait = "0.1.83"
+thiserror = "1.0.69"
 
 [dev-dependencies]
-tokio = { version = "1.39.3", features = ["rt-multi-thread", "sync", "fs", "time", "macros"] }
-anyhow = { version = "1.0.86", features = ["backtrace"] }
+tokio = { version = "1.41.1", features = ["rt-multi-thread", "sync", "fs", "time", "macros"] }
+anyhow = { version = "1.0.93", features = ["backtrace"] }
 
 [features]
 mysql = ["ddnet-account-sql/mysql", "sqlx/mysql"]

lib/ddnet-account-game-server/src/auto_login/queries.rs

@@ -17,7 +17,7 @@ pub struct RegisterUser<'a> {
 }
 
 #[async_trait]
-impl<'a> Query<()> for RegisterUser<'a> {
+impl Query<()> for RegisterUser<'_> {
     #[cfg(feature = "mysql")]
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,

lib/ddnet-account-game-server/src/rename/queries.rs

@@ -17,7 +17,7 @@ pub struct RenameUser<'a> {
 }
 
 #[async_trait]
-impl<'a> Query<()> for RenameUser<'a> {
+impl Query<()> for RenameUser<'_> {
     #[cfg(feature = "mysql")]
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,

lib/ddnet-account-sql/Cargo.toml

@@ -10,8 +10,8 @@ repository = "https://github.com/ddnet/ddnet-accounts"
 [dependencies]
 # https://github.com/launchbadge/sqlx/issues/2636
 sqlx = { version = "=0.6.3", features = ["any", "runtime-tokio-rustls", "chrono"] }
-async-trait = "0.1.81"
-anyhow = { version = "1.0.86", features = ["backtrace"] }
+async-trait = "0.1.83"
+anyhow = { version = "1.0.93", features = ["backtrace"] }
 
 [features]
 mysql = ["sqlx/mysql"]

lib/ddnet-accounts-shared/Cargo.toml

@@ -13,10 +13,10 @@ ddnet-accounts-types = { version = "0.1.0", path = "../ddnet-accounts-types" }
 argon2 = "0.5.3"
 ed25519-dalek = { version = "2.1.1", features = ["serde", "rand_core", "pkcs8", "pem"] }
 rand = { version = "0.8.5", features = ["getrandom"], default-features = false }
-anyhow = { version = "1.0.86", features = ["backtrace"] }
-serde = { version = "1.0.208", features = ["derive"] }
+anyhow = { version = "1.0.93", features = ["backtrace"] }
+serde = { version = "1.0.215", features = ["derive"] }
 email_address = { version = "0.2.9", features = ["serde"] }
-generic-array = { version = "1.1.0", features = ["serde"] }
+generic-array = { version = "1.1.1", features = ["serde"] }
 rcgen = { version = "0.13.1" }
 hex = "0.4.3"
 chrono = { version = "0.4.38", features = ["serde"] }
@@ -26,8 +26,8 @@ const-oid = "0.9.6"
 der = { version = "0.7.9", features = ["derive"] }
 ecdsa = { version = "0.16.9", features = ["digest", "pem"] }
 p256 = "0.13.2"
-thiserror = "1.0.63"
-url = { version = "2.5.2", features = ["serde"] }
+thiserror = "1.0.69"
+url = { version = "2.5.4", features = ["serde"] }
 strum = { version = "0.26.3", features = ["derive"] }
 
 [target.'cfg(not(any(target_arch = "wasm32", target_os = "android")))'.dependencies]

lib/ddnet-accounts-shared/src/account_server/cert_account_ext.rs

@@ -1,5 +1,5 @@
-use ddnet_accounts_types::account_id::AccountId;
 use const_oid::{AssociatedOid, ObjectIdentifier};
+use ddnet_accounts_types::account_id::AccountId;
 use serde::{Deserialize, Serialize};
 use x509_cert::{
     ext::{AsExtension, Extension},

src/account_info/queries.rs

@@ -1,8 +1,8 @@
+use anyhow::anyhow;
+use axum::async_trait;
 use ddnet_account_sql::query::Query;
 use ddnet_accounts_shared::client::machine_id::MachineUid;
 use ddnet_accounts_types::account_id::AccountId;
-use anyhow::anyhow;
-use axum::async_trait;
 use sqlx::any::AnyRow;
 use sqlx::Executor;
 use sqlx::Row;
@@ -21,7 +21,7 @@ pub struct AccountInfoData {
 }
 
 #[async_trait]
-impl<'a> Query<AccountInfoData> for AccountInfo<'a> {
+impl Query<AccountInfoData> for AccountInfo<'_> {
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,
     ) -> anyhow::Result<sqlx::any::AnyStatement<'static>> {

src/account_token/queries.rs

@@ -1,10 +1,10 @@
 use std::str::FromStr;
 
+use anyhow::anyhow;
+use async_trait::async_trait;
 use ddnet_account_sql::query::Query;
 use ddnet_accounts_shared::client::account_token::AccountToken;
 use ddnet_accounts_types::account_id::AccountId;
-use anyhow::anyhow;
-use async_trait::async_trait;
 use sqlx::any::AnyRow;
 use sqlx::Executor;
 use sqlx::Row;
@@ -20,7 +20,7 @@ pub struct AddAccountTokenEmail<'a> {
 }
 
 #[async_trait]
-impl<'a> Query<()> for AddAccountTokenEmail<'a> {
+impl Query<()> for AddAccountTokenEmail<'_> {
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,
     ) -> anyhow::Result<sqlx::any::AnyStatement<'static>> {
@@ -52,7 +52,7 @@ pub struct AddAccountTokenSteam<'a> {
 }
 
 #[async_trait]
-impl<'a> Query<()> for AddAccountTokenSteam<'a> {
+impl Query<()> for AddAccountTokenSteam<'_> {
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,
     ) -> anyhow::Result<sqlx::any::AnyStatement<'static>> {
@@ -86,7 +86,7 @@ pub struct AccountTokenData {
 }
 
 #[async_trait]
-impl<'a> Query<AccountTokenData> for AccountTokenQry<'a> {
+impl Query<AccountTokenData> for AccountTokenQry<'_> {
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,
     ) -> anyhow::Result<sqlx::any::AnyStatement<'static>> {
@@ -118,7 +118,7 @@ pub struct InvalidateAccountToken<'a> {
 }
 
 #[async_trait]
-impl<'a> Query<()> for InvalidateAccountToken<'a> {
+impl Query<()> for InvalidateAccountToken<'_> {
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,
     ) -> anyhow::Result<sqlx::any::AnyStatement<'static>> {

src/certs/queries.rs

@@ -1,6 +1,6 @@
-use ddnet_account_sql::query::Query;
 use anyhow::anyhow;
 use axum::async_trait;
+use ddnet_account_sql::query::Query;
 use sqlx::any::AnyRow;
 use sqlx::Executor;
 use sqlx::Row;
@@ -12,7 +12,7 @@ pub struct AddCert<'a> {
 }
 
 #[async_trait]
-impl<'a> Query<()> for AddCert<'a> {
+impl Query<()> for AddCert<'_> {
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,
     ) -> anyhow::Result<sqlx::any::AnyStatement<'static>> {

src/credential_auth_token/queries.rs

@@ -1,7 +1,7 @@
+use anyhow::anyhow;
 use ddnet_account_sql::query::Query;
 use ddnet_accounts_shared::client::credential_auth_token::CredentialAuthTokenOperation;
 use ddnet_accounts_shared::client::login::CredentialAuthToken;
-use anyhow::anyhow;
 use sqlx::any::AnyRow;
 use sqlx::Executor;
 use sqlx::Statement;
@@ -17,7 +17,7 @@ pub struct AddCredentialAuthToken<'a> {
 }
 
 #[async_trait::async_trait]
-impl<'a> Query<()> for AddCredentialAuthToken<'a> {
+impl Query<()> for AddCredentialAuthToken<'_> {
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,
     ) -> anyhow::Result<sqlx::any::AnyStatement<'static>> {

src/delete/queries.rs

@@ -1,7 +1,7 @@
-use ddnet_account_sql::query::Query;
-use ddnet_accounts_types::account_id::AccountId;
 use anyhow::anyhow;
 use axum::async_trait;
+use ddnet_account_sql::query::Query;
+use ddnet_accounts_types::account_id::AccountId;
 use sqlx::any::AnyRow;
 use sqlx::Executor;
 use sqlx::Statement;
@@ -11,7 +11,7 @@ pub struct RemoveAccount<'a> {
 }
 
 #[async_trait]
-impl<'a> Query<()> for RemoveAccount<'a> {
+impl Query<()> for RemoveAccount<'_> {
     async fn prepare_mysql(
         connection: &mut sqlx::AnyConnection,
     ) -> anyhow::Result<sqlx::any::AnyStatement<'static>> {