Merge pull request 'Update Rust crate actix-cors to v0.7.1' (#296) from renovate/actix-cors-0.x-lockfile into master

Reviewed-on: #296

renovate.json

@@ -3,7 +3,7 @@
   "ignorePaths": ["**/flutter/**", "**/react/**"],
   "packageRules": [
     {
-      "matchUpdateTypes": ["minor", "patch"],
+      "matchUpdateTypes": ["major", "minor", "patch"],
       "automerge": true
     }
   ]

rust/Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-
+resolver = "2"
 members = [
  "sea_battle_backend",
  "sea_battle_cli_player"

rust/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 COPY sea_battle_backend /usr/local/bin/sea_battle_backend
 

rust/sea_battle_backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sea_battle_backend"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 license = "GPL-2.0-or-later"
 description = "A Sea Battle game backend server"
@@ -12,24 +12,24 @@ categories = [ "games" ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.4.0", features = ["derive"] }
-log = "0.4.20"
-env_logger = "0.10.0"
-serde = { version = "1.0.185", features = ["derive"] }
-serde_json = "1.0.105"
-actix-web = "4.1.0"
-actix-cors = "0.6.2"
-actix = "0.13.0"
-actix-web-actors = "4.1.0"
-actix-rt = "2.7.0"
-uuid = { version = "1.4.1", features = ["v4"] }
+clap = { version = "4.5.4", features = ["derive"] }
+log = "0.4.21"
+env_logger = "0.11.3"
+serde = { version = "1.0.200", features = ["derive"] }
+serde_json = "1.0.116"
+actix-web = "4.5.1"
+actix-cors = "0.7.0"
+actix = "0.13.3"
+actix-web-actors = "4.3.0"
+actix-rt = "2.9.0"
+uuid = { version = "1.8.0", features = ["v4"] }
 rand = "0.8.5"
-serde_with = "3.3.0"
+serde_with = "3.8.1"
 tokio = { version = "1", features = ["full"] }
-semver = "1.0.18"
+semver = "1.0.22"
 
 [dev-dependencies]
 #reqwest = { version = "0.11.11", default-features = false, features = ["json", "rustls-tls"] }
-tokio-tungstenite = "0.20.0"
+tokio-tungstenite = "0.21.0"
 serde_urlencoded = "0.7.1"
-futures = "0.3.23"
+futures = "0.3.30"

rust/sea_battle_backend/src/data/game_rules.rs

@@ -144,7 +144,7 @@ impl GameRules {
 
     /// Check out whether these game rules are valid or not
     pub fn is_valid(&self) -> bool {
-        return self.get_errors().is_empty();
+        self.get_errors().is_empty()
     }
 }
 

rust/sea_battle_cli_player/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sea_battle_cli_player"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 license = "GPL-2.0-or-later"
 description = "A Sea Battle game shell client"
@@ -13,22 +13,22 @@ categories = [ "games" ]
 
 [dependencies]
 sea_battle_backend = { path = "../sea_battle_backend", version = "0.2.0" }
-clap = { version = "4.4.0", features = ["derive"] }
-log = "0.4.20"
-env_logger = "0.10.0"
+clap = { version = "4.5.4", features = ["derive"] }
+log = "0.4.21"
+env_logger = "0.11.3"
 tui = "0.19.0"
 crossterm = "0.27.0"
 lazy_static = "1.4.0"
-tokio = "1.32.0"
-num = "0.4.1"
-num-traits = "0.2.16"
-num-derive = "0.4.0"
-textwrap = "0.16.0"
-tokio-tungstenite = { version = "0.20.0", features = ["__rustls-tls", "rustls-tls-native-roots"] }
+tokio = "1.37.0"
+num = "0.4.2"
+num-traits = "0.2.18"
+num-derive = "0.4.2"
+textwrap = "0.16.1"
+tokio-tungstenite = { version = "0.21.0", features = ["__rustls-tls", "rustls-tls-native-roots"] }
 serde_urlencoded = "0.7.1"
-futures = "0.3.23"
-serde_json = "1.0.105"
-hostname = "0.3.1"
-rustls = "0.21.6"
-hyper-rustls = { version = "0.24.1", features = ["rustls-native-certs"] }
-reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features = false }
+futures = "0.3.30"
+serde_json = "1.0.116"
+hostname = "0.4.0"
+rustls = "0.22.2"
+reqwest = { version = "0.12.4", features = ["json", "rustls-tls"], default-features = false }
+rustls-native-certs = {version = "0.7.0"}

rust/sea_battle_cli_player/src/client.rs

@@ -2,7 +2,6 @@ use crate::cli_args::cli_args;
 use crate::server;
 use futures::stream::{SplitSink, SplitStream};
 use futures::{SinkExt, StreamExt};
-use hyper_rustls::ConfigBuilderExt;
 use sea_battle_backend::data::*;
 use sea_battle_backend::human_player_ws::{ClientMessage, ServerMessage};
 use sea_battle_backend::server::{
@@ -127,13 +126,18 @@ impl Client {
 
         let (socket, _) = if ws_url.starts_with("wss") {
             // Perform a connection over TLS
+            let mut roots = rustls::RootCertStore::empty();
+            for cert in rustls_native_certs::load_native_certs()? {
+                roots.add(cert).unwrap();
+            }
+
             let config = rustls::ClientConfig::builder()
-                .with_safe_defaults()
-                .with_native_roots()
+                .with_root_certificates(roots)
                 .with_no_client_auth();
             let connector = tokio_tungstenite::Connector::Rustls(Arc::new(config));
 
-            tokio_tungstenite::connect_async_tls_with_config(ws_url, None, false,Some(connector)).await?
+            tokio_tungstenite::connect_async_tls_with_config(ws_url, None, false, Some(connector))
+                .await?
         } else {
             // Perform an unsecure connection
             tokio_tungstenite::connect_async(ws_url).await?

rust/sea_battle_cli_player/src/ui_widgets/game_map_widget.rs

@@ -98,7 +98,7 @@ impl<'a> GameMapWidget<'a> {
     }
 }
 
-impl<'a> Widget for GameMapWidget<'a> {
+impl Widget for GameMapWidget<'_> {
     fn render(mut self, area: Rect, buf: &mut Buffer) {
         let alphabet = PlayConfiguration::default().ordinate_alphabet;