fix: GHSA-8qv2-5vq6-g2g7 webpki CPU denial of service in certificate …

…path 1. Upgraded tonic, prost and tokio to the latest and greatest of versions which was necessary because one of their transitive dependencies being affected by the GHSA-8qv2-5vq6-g2g7 vulnerability. 2. These upgrades also forced our hand in terms of bumping up the rust edition from 2018 to 2021 and upgrading the rust compiler to v1.74. 3. fix(relay): update the code for tonic 0.10.2 4. fix(relay): upgrade rust docker image tag to 1.69.0 Depends on https://github.com/hyperledger/cacti/pull/2916 (which upgrades the rust compiler in the dev container) Co-authored by: Sandeep Nishad <[email protected]> Signed-off-by: Peter Somogyvari <[email protected]> Signed-off-by: Sandeep Nishad <[email protected]>
hyperledger-cacti · Dec 19, 2023 · e24458f · e24458f
1 parent ff3eb8c
commit e24458f
Show file tree

Hide file tree

Showing 32 changed files with 2,126 additions and 932 deletions.
diff --git a/packages/cactus-core-api/Cargo.lock b/packages/cactus-core-api/Cargo.lock
diff --git a/packages/cactus-core-api/Cargo.toml b/packages/cactus-core-api/Cargo.toml
@@ -2,21 +2,21 @@
 name = "relay"
 version = "0.0.1"
 authors = ["Antony Targett <[email protected]>", "Nick Waywood <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "pb"
 path = "src/main/rust/pb.rs"
 
 
 [dependencies]
-tonic = {version="0.6.2",  features = ["tls"]}
-prost = "0.9"
-tokio = { version = "1.18", features = ["macros", "fs"] }
-serde = {version="1.0.110", features = ["derive"]}
+tonic = {version="0.10.2",  features = ["tls"]}
+prost = "0.12.3"
+tokio = { version = "1.34.0", features = ["macros", "fs"] }
+serde = {version="1.0.193", features = ["derive"]}
 
 [build-dependencies]
-tonic-build = "0.6.2"
+tonic-build = "0.10.2"
 
 
 

diff --git a/packages/cactus-core-api/src/main/rust/generated/proto-rs/common.ack.rs b/packages/cactus-core-api/src/main/rust/generated/proto-rs/common.ack.rs
@@ -1,6 +1,8 @@
 /// This message respresents "ACKs" sent between relay-relay,
 /// relay-driver and relay-network
-#[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Message)]
+#[derive(serde::Serialize, serde::Deserialize)]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Ack {
     #[prost(enumeration = "ack::Status", tag = "2")]
     pub status: i32,
@@ -13,9 +15,8 @@ pub struct Ack {
 }
 /// Nested message and enum types in `Ack`.
 pub mod ack {
+    #[derive(serde::Serialize, serde::Deserialize)]
     #[derive(
-        serde::Serialize,
-        serde::Deserialize,
         Clone,
         Copy,
         Debug,
@@ -24,11 +25,31 @@ pub mod ack {
         Hash,
         PartialOrd,
         Ord,
-        ::prost::Enumeration,
+        ::prost::Enumeration
     )]
     #[repr(i32)]
     pub enum Status {
         Ok = 0,
         Error = 1,
     }
+    impl Status {
+        /// String value of the enum field names used in the ProtoBuf definition.
+        ///
+        /// The values are not transformed in any way and thus are considered stable
+        /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+        pub fn as_str_name(&self) -> &'static str {
+            match self {
+                Status::Ok => "OK",
+                Status::Error => "ERROR",
+            }
+        }
+        /// Creates an enum from field names used in the ProtoBuf definition.
+        pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+            match value {
+                "OK" => Some(Self::Ok),
+                "ERROR" => Some(Self::Error),
+                _ => None,
+            }
+        }
+    }
 }
diff --git a/packages/cactus-core-api/src/main/rust/generated/proto-rs/common.query.rs b/packages/cactus-core-api/src/main/rust/generated/proto-rs/common.query.rs
@@ -1,5 +1,7 @@
 /// the payload to define the data that is being requested
-#[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Message)]
+#[derive(serde::Serialize, serde::Deserialize)]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Query {
     #[prost(string, repeated, tag = "1")]
     pub policy: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,

diff --git a/packages/cactus-core-api/src/main/rust/generated/proto-rs/common.state.rs b/packages/cactus-core-api/src/main/rust/generated/proto-rs/common.state.rs
@@ -1,5 +1,7 @@
 /// Metadata for a View
-#[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Message)]
+#[derive(serde::Serialize, serde::Deserialize)]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Meta {
     /// Underlying distributed ledger protocol.
     #[prost(enumeration = "meta::Protocol", tag = "1")]
@@ -18,9 +20,8 @@ pub struct Meta {
 }
 /// Nested message and enum types in `Meta`.
 pub mod meta {
+    #[derive(serde::Serialize, serde::Deserialize)]
     #[derive(
-        serde::Serialize,
-        serde::Deserialize,
         Clone,
         Copy,
         Debug,
@@ -29,7 +30,7 @@ pub mod meta {
         Hash,
         PartialOrd,
         Ord,
-        ::prost::Enumeration,
+        ::prost::Enumeration
     )]
     #[repr(i32)]
     pub enum Protocol {
@@ -38,8 +39,34 @@ pub mod meta {
         Fabric = 3,
         Corda = 4,
     }
+    impl Protocol {
+        /// String value of the enum field names used in the ProtoBuf definition.
+        ///
+        /// The values are not transformed in any way and thus are considered stable
+        /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+        pub fn as_str_name(&self) -> &'static str {
+            match self {
+                Protocol::Bitcoin => "BITCOIN",
+                Protocol::Ethereum => "ETHEREUM",
+                Protocol::Fabric => "FABRIC",
+                Protocol::Corda => "CORDA",
+            }
+        }
+        /// Creates an enum from field names used in the ProtoBuf definition.
+        pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+            match value {
+                "BITCOIN" => Some(Self::Bitcoin),
+                "ETHEREUM" => Some(Self::Ethereum),
+                "FABRIC" => Some(Self::Fabric),
+                "CORDA" => Some(Self::Corda),
+                _ => None,
+            }
+        }
+    }
 }
-#[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Message)]
+#[derive(serde::Serialize, serde::Deserialize)]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct View {
     #[prost(message, optional, tag = "1")]
     pub meta: ::core::option::Option<Meta>,
@@ -50,7 +77,9 @@ pub struct View {
     pub data: ::prost::alloc::vec::Vec<u8>,
 }
 /// View represents the response from a remote network
-#[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Message)]
+#[derive(serde::Serialize, serde::Deserialize)]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ViewPayload {
     #[prost(string, tag = "1")]
     pub request_id: ::prost::alloc::string::String,
@@ -59,7 +88,9 @@ pub struct ViewPayload {
 }
 /// Nested message and enum types in `ViewPayload`.
 pub mod view_payload {
-    #[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Oneof)]
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum State {
         #[prost(message, tag = "2")]
         View(super::View),
@@ -69,7 +100,9 @@ pub mod view_payload {
 }
 /// the payload that is used for the communication between the requesting relay
 /// and its network
-#[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Message)]
+#[derive(serde::Serialize, serde::Deserialize)]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RequestState {
     #[prost(string, tag = "1")]
     pub request_id: ::prost::alloc::string::String,
@@ -80,9 +113,8 @@ pub struct RequestState {
 }
 /// Nested message and enum types in `RequestState`.
 pub mod request_state {
+    #[derive(serde::Serialize, serde::Deserialize)]
     #[derive(
-        serde::Serialize,
-        serde::Deserialize,
         Clone,
         Copy,
         Debug,
@@ -91,7 +123,7 @@ pub mod request_state {
         Hash,
         PartialOrd,
         Ord,
-        ::prost::Enumeration,
+        ::prost::Enumeration
     )]
     #[repr(i32)]
     pub enum Status {
@@ -102,7 +134,33 @@ pub mod request_state {
         Error = 2,
         Completed = 3,
     }
-    #[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Oneof)]
+    impl Status {
+        /// String value of the enum field names used in the ProtoBuf definition.
+        ///
+        /// The values are not transformed in any way and thus are considered stable
+        /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+        pub fn as_str_name(&self) -> &'static str {
+            match self {
+                Status::PendingAck => "PENDING_ACK",
+                Status::Pending => "PENDING",
+                Status::Error => "ERROR",
+                Status::Completed => "COMPLETED",
+            }
+        }
+        /// Creates an enum from field names used in the ProtoBuf definition.
+        pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+            match value {
+                "PENDING_ACK" => Some(Self::PendingAck),
+                "PENDING" => Some(Self::Pending),
+                "ERROR" => Some(Self::Error),
+                "COMPLETED" => Some(Self::Completed),
+                _ => None,
+            }
+        }
+    }
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum State {
         #[prost(message, tag = "3")]
         View(super::View),