From 9cccb28bf27921ebcd585efa6f72c3668024886d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 01:35:05 +0000
Subject: [PATCH] fix(deps): update rust crate tonic to 0.12 [security]

---
 Cargo.lock        | 152 ++++++++++++++--------------------------------
 client/Cargo.toml |   2 +-
 common/Cargo.toml |   2 +-
 server/Cargo.toml |   2 +-
 4 files changed, 47 insertions(+), 111 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59f4e568..f0b121b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -225,34 +225,6 @@ dependencies = [
  "paste",
 ]
 
-[[package]]
-name = "axum"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
-dependencies = [
- "async-trait",
- "axum-core 0.3.4",
- "bitflags 1.3.2",
- "bytes",
- "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.28",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "sync_wrapper 0.1.2",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "axum"
 version = "0.7.5"
@@ -260,7 +232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
 dependencies = [
  "async-trait",
- "axum-core 0.4.3",
+ "axum-core",
  "bytes",
  "futures-util",
  "http 1.1.0",
@@ -287,23 +259,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "axum-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "axum-core"
 version = "0.4.3"
@@ -331,8 +286,8 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733"
 dependencies = [
- "axum 0.7.5",
- "axum-core 0.4.3",
+ "axum",
+ "axum-core",
  "bytes",
  "futures-util",
  "headers",
@@ -1185,23 +1140,25 @@ dependencies = [
 
 [[package]]
 name = "hyper-timeout"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
 dependencies = [
- "hyper 0.14.28",
+ "hyper 1.3.1",
+ "hyper-util",
  "pin-project-lite",
  "tokio",
- "tokio-io-timeout",
+ "tower-service",
 ]
 
 [[package]]
 name = "hyper-util"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
 dependencies = [
  "bytes",
+ "futures-channel",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
@@ -1209,6 +1166,9 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -1755,6 +1715,15 @@ dependencies = [
  "prost-derive",
 ]
 
+[[package]]
+name = "prost"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
+dependencies = [
+ "bytes",
+]
+
 [[package]]
 name = "prost-build"
 version = "0.12.4"
@@ -1769,7 +1738,7 @@ dependencies = [
  "once_cell",
  "petgraph",
  "prettyplease",
- "prost",
+ "prost 0.12.4",
  "prost-types",
  "regex",
  "syn",
@@ -1795,7 +1764,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
 dependencies = [
- "prost",
+ "prost 0.12.4",
 ]
 
 [[package]]
@@ -2103,20 +2072,6 @@ dependencies = [
  "sct",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring",
- "rustls-pki-types",
- "rustls-webpki 0.102.2",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "rustls"
 version = "0.23.5"
@@ -2409,7 +2364,7 @@ dependencies = [
  "once_cell",
  "pretty_env_logger",
  "prettytable-rs",
- "prost",
+ "prost 0.12.4",
  "regex",
  "reqwest",
  "rustls 0.23.5",
@@ -2432,7 +2387,7 @@ version = "1.1.4"
 dependencies = [
  "bytes",
  "chrono",
- "prost",
+ "prost 0.12.4",
  "protobuf-src",
  "serde",
  "tonic",
@@ -2444,7 +2399,7 @@ name = "stat_server"
 version = "1.8.1"
 dependencies = [
  "anyhow",
- "axum 0.7.5",
+ "axum",
  "axum-extra",
  "bytes",
  "chrono",
@@ -2461,7 +2416,7 @@ dependencies = [
  "once_cell",
  "pretty_env_logger",
  "prettytable-rs",
- "prost",
+ "prost 0.12.4",
  "reqwest",
  "rhai",
  "rust-embed",
@@ -2691,16 +2646,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "tokio-macros"
 version = "2.2.0"
@@ -2722,17 +2667,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-dependencies = [
- "rustls 0.22.4",
- "rustls-pki-types",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.26.0"
@@ -2758,9 +2692,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2817,28 +2751,30 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.11.0"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
 dependencies = [
  "async-stream",
  "async-trait",
- "axum 0.6.20",
- "base64 0.21.7",
+ "axum",
+ "base64 0.22.0",
  "bytes",
  "flate2",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.28",
+ "h2 0.4.4",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.3.1",
  "hyper-timeout",
+ "hyper-util",
  "percent-encoding",
  "pin-project",
- "prost",
+ "prost 0.13.3",
  "rustls-pemfile 2.1.2",
- "rustls-pki-types",
+ "socket2",
  "tokio",
- "tokio-rustls 0.25.0",
+ "tokio-rustls 0.26.0",
  "tokio-stream",
  "tower",
  "tower-layer",
diff --git a/client/Cargo.toml b/client/Cargo.toml
index d234a0e4..859ac41b 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -43,7 +43,7 @@ stat_common = {path = "../common", version = "1.1.4"}
 sysinfo = "0.30.7"
 tokio = {version = "1", features = ["full"]}
 tokio-rustls = { version = "0.26" }
-tonic = {version = "0.11", features = ["tls", "tls-webpki-roots", "gzip"]}
+tonic = {version = "0.12", features = ["tls", "tls-webpki-roots", "gzip"]}
 tower = { version = "0.4" }
 webpki-roots = "0.26"
 url = "2.5.0"
diff --git a/common/Cargo.toml b/common/Cargo.toml
index d0150751..3dca62be 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -18,7 +18,7 @@ repository = "https://github.com/zdz/ServerStatus-Rust"
 bytes = {version = "1", features = ["serde"]}
 prost = "0.12"
 serde = {version = "1.0", default-features = false, features = ["derive", "alloc"]}
-tonic = {version = "0.11", features = ["tls"]}
+tonic = {version = "0.12", features = ["tls"]}
 
 [target.'cfg(not(target_env = "msvc"))'.build-dependencies]
 chrono = "0.4"
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 79277fcc..0b6784fb 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -50,7 +50,7 @@ stat_common = {path = "../common", version = "1.1.4"}
 tokio = {version = "1", features = ["full"]}
 tokio-rustls = { version = "0.26" }
 toml = "0.8"
-tonic = {version = "0.11", features = ["tls", "tls-webpki-roots", "gzip"]}
+tonic = {version = "0.12", features = ["tls", "tls-webpki-roots", "gzip"]}
 tower-http = { version = "0.5", features = ["cors", "add-extension"] }
 url = "2.5.0"
 uuid = {version = "1.7", default-features = false, features = ["serde", "v4"]}