Squashed commit of the following:

commit 9190796 Author: Carlos Baez <[email protected]> Date: Wed Nov 13 18:58:20 2024 +0100 Updated to v1.37.3
Mamoru-Foundation · Nov 13, 2024 · 60d450f · 60d450f
1 parent 4d9ee72
commit 60d450f
Show file tree

Hide file tree

Showing 39 changed files with 1,290 additions and 1,172 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -209,7 +209,7 @@ members = [
 
 [workspace.package]
 # This version string will be inherited by sui-core, sui-faucet, sui-node, sui-tools, sui-sdk, sui-move-build, and sui crates.
-version = "1.37.1"
+version = "1.37.3"
 
 [profile.release]
 # debug = 1 means line charts only, which is minimum needed for good stack traces
@@ -262,7 +262,6 @@ async-graphql = "=7.0.1"
 async-graphql-axum = "=7.0.1"
 async-graphql-value = "=7.0.1"
 async-recursion = "1.0.4"
-async-stream = "0.3.6"
 async-trait = "0.1.61"
 atomic_float = "0.1"
 aws-config = "0.56"
@@ -328,10 +327,9 @@ cynic-codegen = "= 3.7.3"
 dashmap = "5.5.3"
 # datatest-stable = "0.1.2"
 datatest-stable = { git = "https://github.com/nextest-rs/datatest-stable.git", rev = "72db7f6d1bbe36a5407e96b9488a581f763e106f" }
-derivative = "2.2.0"
 derive-syn-parse = "0.1.5"
 derive_builder = "0.12.0"
-derive_more = "0.99.17"
+derive_more = "1.0.0"
 diesel = "2.2"
 diesel_migrations = "2.2"
 diesel-async = "0.5"
@@ -583,15 +581,15 @@ move-abstract-interpreter = { path = "external-crates/move/crates/move-abstract-
 move-abstract-stack = { path = "external-crates/move/crates/move-abstract-stack" }
 move-analyzer = { path = "external-crates/move/crates/move-analyzer" }
 
-mamoru-sniffer = { git = "https://github.com/Mamoru-Foundation/mamoru-core", rev = "9f4c36051a548e22145fb0df4f99ce7f8aefad5f" }
-mamoru-sui-types = { git = "https://github.com/Mamoru-Foundation/mamoru-core", rev = "9f4c36051a548e22145fb0df4f99ce7f8aefad5f" }
-
 fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2f502fd8570fe4e9cff36eea5bbd6fef22002898" }
 fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2f502fd8570fe4e9cff36eea5bbd6fef22002898" }
 fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2f502fd8570fe4e9cff36eea5bbd6fef22002898", package = "fastcrypto-zkp" }
 fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2f502fd8570fe4e9cff36eea5bbd6fef22002898", features = [
     "experimental",
 ] }
+mamoru-sniffer = { git = "https://github.com/Mamoru-Foundation/mamoru-core", rev = "9f4c36051a548e22145fb0df4f99ce7f8aefad5f" }
+mamoru-sui-types = { git = "https://github.com/Mamoru-Foundation/mamoru-core", rev = "9f4c36051a548e22145fb0df4f99ce7f8aefad5f" }
+
 passkey-types = { version = "0.2.0" }
 passkey-client = { version = "0.2.0" }
 passkey-authenticator = { version = "0.2.0" }

diff --git a/consensus/core/src/network/tonic_network.rs b/consensus/core/src/network/tonic_network.rs
@@ -24,7 +24,6 @@ use mysten_network::{
     Multiaddr,
 };
 use parking_lot::RwLock;
-use sui_tls::AllowPublicKeys;
 use tokio::{
     pin,
     task::JoinSet,
@@ -45,6 +44,7 @@ use super::{
         consensus_service_client::ConsensusServiceClient,
         consensus_service_server::ConsensusService,
     },
+    tonic_tls::create_rustls_client_config,
     BlockStream, NetworkClient, NetworkManager, NetworkService,
 };
 use crate::{
@@ -54,7 +54,7 @@ use crate::{
     error::{ConsensusError, ConsensusResult},
     network::{
         tonic_gen::consensus_service_server::ConsensusServiceServer,
-        tonic_tls::certificate_server_name,
+        tonic_tls::create_rustls_server_config,
     },
     CommitIndex, Round,
 };
@@ -381,16 +381,7 @@ impl ChannelPool {
         let address = format!("https://{address}");
         let config = &self.context.parameters.tonic;
         let buffer_size = config.connection_buffer_size;
-        let client_tls_config = sui_tls::create_rustls_client_config(
-            self.context
-                .committee
-                .authority(peer)
-                .network_key
-                .clone()
-                .into_inner(),
-            certificate_server_name(&self.context),
-            Some(network_keypair.private_key().into_inner()),
-        );
+        let client_tls_config = create_rustls_client_config(&self.context, network_keypair, peer);
         let endpoint = tonic_rustls::Channel::from_shared(address.clone())
             .unwrap()
             .connect_timeout(timeout)
@@ -737,17 +728,8 @@ impl<S: NetworkService> NetworkManager<S> for TonicManager {
             Arc::new(builder)
         };
 
-        let tls_server_config = sui_tls::create_rustls_server_config(
-            self.network_keypair.clone().private_key().into_inner(),
-            certificate_server_name(&self.context),
-            AllowPublicKeys::new(
-                self.context
-                    .committee
-                    .authorities()
-                    .map(|(_i, a)| a.network_key.clone().into_inner())
-                    .collect(),
-            ),
-        );
+        let tls_server_config =
+            create_rustls_server_config(&self.context, self.network_keypair.clone());
         let tls_acceptor = TlsAcceptor::from(Arc::new(tls_server_config));
 
         // Create listener to incoming connections.

diff --git a/consensus/core/src/network/tonic_tls.rs b/consensus/core/src/network/tonic_tls.rs
@@ -2,7 +2,63 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::context::Context;
+use consensus_config::{AuthorityIndex, NetworkKeyPair};
+use sui_tls::AllowPublicKeys;
+use tokio_rustls::rustls::{ClientConfig, ServerConfig};
 
-pub(crate) fn certificate_server_name(context: &Context) -> String {
+pub(crate) fn create_rustls_server_config(
+    context: &Context,
+    network_keypair: NetworkKeyPair,
+) -> ServerConfig {
+    let allower = AllowPublicKeys::new(
+        context
+            .committee
+            .authorities()
+            .map(|(_i, a)| a.network_key.clone().into_inner())
+            .collect(),
+    );
+    let verifier = sui_tls::ClientCertVerifier::new(allower, certificate_server_name(context));
+    // TODO: refactor to use key bytes
+    let self_signed_cert = sui_tls::SelfSignedCertificate::new(
+        network_keypair.private_key().into_inner(),
+        &certificate_server_name(context),
+    );
+    let tls_cert = self_signed_cert.rustls_certificate();
+    let tls_private_key = self_signed_cert.rustls_private_key();
+    let mut tls_config = verifier
+        .rustls_server_config(vec![tls_cert], tls_private_key)
+        .unwrap_or_else(|e| panic!("Failed to create TLS server config: {:?}", e));
+    tls_config.alpn_protocols = vec![b"h2".to_vec()];
+    tls_config
+}
+
+pub(crate) fn create_rustls_client_config(
+    context: &Context,
+    network_keypair: NetworkKeyPair,
+    target: AuthorityIndex,
+) -> ClientConfig {
+    let target_public_key = context
+        .committee
+        .authority(target)
+        .network_key
+        .clone()
+        .into_inner();
+    let self_signed_cert = sui_tls::SelfSignedCertificate::new(
+        network_keypair.private_key().into_inner(),
+        &certificate_server_name(context),
+    );
+    let tls_cert = self_signed_cert.rustls_certificate();
+    let tls_private_key = self_signed_cert.rustls_private_key();
+    let mut tls_config =
+        sui_tls::ServerCertVerifier::new(target_public_key, certificate_server_name(context))
+            .rustls_client_config(vec![tls_cert], tls_private_key)
+            .unwrap_or_else(|e| panic!("Failed to create TLS client config: {:?}", e));
+    // ServerCertVerifier sets alpn for completeness, but alpn cannot be predefined when
+    // using HttpsConnector from hyper-rustls, as in TonicManager.
+    tls_config.alpn_protocols = vec![];
+    tls_config
+}
+
+fn certificate_server_name(context: &Context) -> String {
     format!("consensus_epoch_{}", context.committee.epoch())
 }
diff --git a/crates/mysten-network/Cargo.toml b/crates/mysten-network/Cargo.toml
@@ -9,7 +9,6 @@ publish = false
 
 [dependencies]
 anemo.workspace = true
-async-stream.workspace = true
 bcs.workspace = true
 bytes.workspace = true
 eyre.workspace = true
@@ -19,10 +18,8 @@ multiaddr.workspace = true
 serde.workspace = true
 once_cell.workspace = true
 snap.workspace = true
-hyper-rustls.workspace = true
 hyper-util.workspace = true
 tokio = { workspace = true, features = ["sync", "rt", "macros"] }
-tokio-rustls.workspace = true
 tokio-stream.workspace = true
 tonic.workspace = true
 tonic-health.workspace = true

diff --git a/crates/mysten-network/src/client.rs b/crates/mysten-network/src/client.rs
@@ -21,67 +21,53 @@ use std::{
     vec,
 };
 use tokio::task::JoinHandle;
-use tokio_rustls::rustls::ClientConfig;
 use tonic::transport::{Channel, Endpoint, Uri};
 use tower::Service;
 use tracing::{info, trace};
 
-pub async fn connect(address: &Multiaddr, tls_config: Option<ClientConfig>) -> Result<Channel> {
-    let channel = endpoint_from_multiaddr(address, tls_config)?
-        .connect()
-        .await?;
+pub async fn connect(address: &Multiaddr) -> Result<Channel> {
+    let channel = endpoint_from_multiaddr(address)?.connect().await?;
     Ok(channel)
 }
 
-pub fn connect_lazy(address: &Multiaddr, tls_config: Option<ClientConfig>) -> Result<Channel> {
-    let channel = endpoint_from_multiaddr(address, tls_config)?.connect_lazy();
+pub fn connect_lazy(address: &Multiaddr) -> Result<Channel> {
+    let channel = endpoint_from_multiaddr(address)?.connect_lazy();
     Ok(channel)
 }
 
-pub(crate) async fn connect_with_config(
-    address: &Multiaddr,
-    tls_config: Option<ClientConfig>,
-    config: &Config,
-) -> Result<Channel> {
-    let channel = endpoint_from_multiaddr(address, tls_config)?
+pub(crate) async fn connect_with_config(address: &Multiaddr, config: &Config) -> Result<Channel> {
+    let channel = endpoint_from_multiaddr(address)?
         .apply_config(config)
         .connect()
         .await?;
     Ok(channel)
 }
 
-pub(crate) fn connect_lazy_with_config(
-    address: &Multiaddr,
-    tls_config: Option<ClientConfig>,
-    config: &Config,
-) -> Result<Channel> {
-    let channel = endpoint_from_multiaddr(address, tls_config)?
+pub(crate) fn connect_lazy_with_config(address: &Multiaddr, config: &Config) -> Result<Channel> {
+    let channel = endpoint_from_multiaddr(address)?
         .apply_config(config)
         .connect_lazy();
     Ok(channel)
 }
 
-fn endpoint_from_multiaddr(
-    addr: &Multiaddr,
-    tls_config: Option<ClientConfig>,
-) -> Result<MyEndpoint> {
+fn endpoint_from_multiaddr(addr: &Multiaddr) -> Result<MyEndpoint> {
     let mut iter = addr.iter();
 
     let channel = match iter.next().ok_or_else(|| eyre!("address is empty"))? {
         Protocol::Dns(_) => {
             let (dns_name, tcp_port, http_or_https) = parse_dns(addr)?;
             let uri = format!("{http_or_https}://{dns_name}:{tcp_port}");
-            MyEndpoint::try_from_uri(uri, tls_config)?
+            MyEndpoint::try_from_uri(uri)?
         }
         Protocol::Ip4(_) => {
             let (socket_addr, http_or_https) = parse_ip4(addr)?;
             let uri = format!("{http_or_https}://{socket_addr}");
-            MyEndpoint::try_from_uri(uri, tls_config)?
+            MyEndpoint::try_from_uri(uri)?
         }
         Protocol::Ip6(_) => {
             let (socket_addr, http_or_https) = parse_ip6(addr)?;
             let uri = format!("{http_or_https}://{socket_addr}");
-            MyEndpoint::try_from_uri(uri, tls_config)?
+            MyEndpoint::try_from_uri(uri)?
         }
         unsupported => return Err(eyre!("unsupported protocol {unsupported}")),
     };
@@ -91,25 +77,21 @@ fn endpoint_from_multiaddr(
 
 struct MyEndpoint {
     endpoint: Endpoint,
-    tls_config: Option<ClientConfig>,
 }
 
 static DISABLE_CACHING_RESOLVER: OnceCell<bool> = OnceCell::new();
 
 impl MyEndpoint {
-    fn new(endpoint: Endpoint, tls_config: Option<ClientConfig>) -> Self {
-        Self {
-            endpoint,
-            tls_config,
-        }
+    fn new(endpoint: Endpoint) -> Self {
+        Self { endpoint }
     }
 
-    fn try_from_uri(uri: String, tls_config: Option<ClientConfig>) -> Result<Self> {
+    fn try_from_uri(uri: String) -> Result<Self> {
         let uri: Uri = uri
             .parse()
             .with_context(|| format!("unable to create Uri from '{uri}'"))?;
         let endpoint = Endpoint::from(uri);
-        Ok(Self::new(endpoint, tls_config))
+        Ok(Self::new(endpoint))
     }
 
     fn apply_config(mut self, config: &Config) -> Self {
@@ -125,51 +107,20 @@ impl MyEndpoint {
         });
 
         if disable_caching_resolver {
-            if let Some(tls_config) = self.tls_config {
-                self.endpoint.connect_with_connector_lazy(
-                    hyper_rustls::HttpsConnectorBuilder::new()
-                        .with_tls_config(tls_config)
-                        .https_only()
-                        .enable_http2()
-                        .build(),
-                )
-            } else {
-                self.endpoint.connect_lazy()
-            }
+            self.endpoint.connect_lazy()
         } else {
             let mut http = HttpConnector::new_with_resolver(CachingResolver::new());
             http.enforce_http(false);
             http.set_nodelay(true);
             http.set_keepalive(None);
             http.set_connect_timeout(None);
 
-            if let Some(tls_config) = self.tls_config {
-                let https = hyper_rustls::HttpsConnectorBuilder::new()
-                    .with_tls_config(tls_config)
-                    .https_only()
-                    .enable_http1()
-                    .wrap_connector(http);
-                self.endpoint.connect_with_connector_lazy(https)
-            } else {
-                self.endpoint.connect_with_connector_lazy(http)
-            }
+            self.endpoint.connect_with_connector_lazy(http)
         }
     }
 
     async fn connect(self) -> Result<Channel> {
-        if let Some(tls_config) = self.tls_config {
-            let https_connector = hyper_rustls::HttpsConnectorBuilder::new()
-                .with_tls_config(tls_config)
-                .https_only()
-                .enable_http2()
-                .build();
-            self.endpoint
-                .connect_with_connector(https_connector)
-                .await
-                .map_err(Into::into)
-        } else {
-            self.endpoint.connect().await.map_err(Into::into)
-        }
+        self.endpoint.connect().await.map_err(Into::into)
     }
 }
 

diff --git a/crates/mysten-network/src/config.rs b/crates/mysten-network/src/config.rs
@@ -9,7 +9,6 @@ use crate::{
 use eyre::Result;
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
-use tokio_rustls::rustls::ClientConfig;
 use tonic::transport::Channel;
 
 #[derive(Debug, Default, Deserialize, Serialize)]
@@ -91,19 +90,11 @@ impl Config {
         ServerBuilder::from_config(self, metrics_provider)
     }
 
-    pub async fn connect(
-        &self,
-        addr: &Multiaddr,
-        tls_config: Option<ClientConfig>,
-    ) -> Result<Channel> {
-        connect_with_config(addr, tls_config, self).await
+    pub async fn connect(&self, addr: &Multiaddr) -> Result<Channel> {
+        connect_with_config(addr, self).await
     }
 
-    pub fn connect_lazy(
-        &self,
-        addr: &Multiaddr,
-        tls_config: Option<ClientConfig>,
-    ) -> Result<Channel> {
-        connect_lazy_with_config(addr, tls_config, self)
+    pub fn connect_lazy(&self, addr: &Multiaddr) -> Result<Channel> {
+        connect_lazy_with_config(addr, self)
     }
-}
+}