Fixing Ability to runs https requests

MyJetTools · Apr 5, 2024 · 2057507 · 2057507
1 parent 2d9b3f6
commit 2057507
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/my-grpc-extensions/Cargo.toml b/my-grpc-extensions/Cargo.toml
@@ -22,6 +22,8 @@ my-logger = { tag = "1.1.0", git = "https://github.com/MyJetTools/my-logger.git"
 rust-extensions = { tag = "0.1.4", git = "https://github.com/MyJetTools/rust-extensions.git", features = [
     "with-tokio",
 ] }
+
+my-tls = { tag = "0.1.1", git = "https://github.com/MyJetTools/my-tls.git" }
 tokio = { version = "*", features = ["full"] }
 tonic = { version = "0", features = ["tls", "tls-roots", "prost"] }
 hyper = { version = "0" }

diff --git a/my-grpc-extensions/src/grpc_channel/grpc_channel.rs b/my-grpc-extensions/src/grpc_channel/grpc_channel.rs
@@ -5,7 +5,7 @@ use my_logger::LogEventCtx;
 use my_telemetry::MyTelemetryContext;
 
 use tokio::{sync::Mutex, time::error::Elapsed};
-use tonic::transport::Channel;
+use tonic::transport::{Certificate, Channel, ClientTlsConfig};
 
 use crate::{GrpcChannelPool, RentedChannel};
 
@@ -100,7 +100,13 @@ impl<'s, TService: Send + Sync + 'static> GrpcChannel<TService> {
                 )
             }
 
-            let end_point = end_point.unwrap();
+            let mut end_point = end_point.unwrap();
+
+            if connect_url.to_lowercase().starts_with("https") {
+                let cert = Certificate::from_pem(my_tls::ALL_CERTIFICATES);
+                let tls = ClientTlsConfig::new().ca_certificate(cert);
+                end_point = end_point.tls_config(tls).unwrap();
+            }
 
             match tokio::time::timeout(self.request_timeout, end_point.connect()).await {
                 Ok(channel) => match channel {