Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 19, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
483 changes: 260 additions & 223 deletions packages/cactus-core-api/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions packages/cactus-core-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
name = "relay"
version = "0.0.1"
authors = ["Antony Targett <atargett@au1.ibm.com>", "Nick Waywood <nwaywood@au1.ibm.com>"]
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"



Expand Down
29 changes: 25 additions & 4 deletions packages/cactus-core-api/src/main/rust/generated/proto-rs/common.ack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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,
Expand All @@ -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,
}
}
}
}
4 changes: 3 additions & 1 deletion packages/cactus-core-api/src/main/rust/generated/proto-rs/common.query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>,
Expand Down
82 changes: 70 additions & 12 deletions packages/cactus-core-api/src/main/rust/generated/proto-rs/common.state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")]
Expand All @@ -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,
Expand All @@ -29,7 +30,7 @@ pub mod meta {
Hash,
PartialOrd,
Ord,
::prost::Enumeration,
::prost::Enumeration
)]
#[repr(i32)]
pub enum Protocol {
Expand All @@ -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>,
Expand All @@ -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,
Expand All @@ -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),
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -91,7 +123,7 @@ pub mod request_state {
Hash,
PartialOrd,
Ord,
::prost::Enumeration,
::prost::Enumeration
)]
#[repr(i32)]
pub enum Status {
Expand All @@ -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),
Expand Down
Loading
Loading