From 67d87fe88c9957c964791eaad5583301a019545c Mon Sep 17 00:00:00 2001
From: vovkman <liam.vovk@gmail.com>
Date: Mon, 18 Sep 2023 12:06:57 -0700
Subject: [PATCH] Add TLS config to gRPC server

u

u

Add TLS config to gRPC server
---
 yellowstone-grpc-geyser/src/config.rs |  9 +++++++++
 yellowstone-grpc-geyser/src/grpc.rs   | 18 +++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/yellowstone-grpc-geyser/src/config.rs b/yellowstone-grpc-geyser/src/config.rs
index 87c1dd71..942db299 100644
--- a/yellowstone-grpc-geyser/src/config.rs
+++ b/yellowstone-grpc-geyser/src/config.rs
@@ -80,6 +80,8 @@ pub struct ConfigGrpc {
     /// Limits for possible filters
     #[serde(default)]
     pub filters: ConfigGrpcFilters,
+    /// TLS config
+    pub tls_config: Option<ConfigGrpcServerTls>,
 }
 
 impl ConfigGrpc {
@@ -264,6 +266,13 @@ impl Default for ConfigGrpcFiltersEntry {
     }
 }
 
+#[derive(Debug, Clone, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct ConfigGrpcServerTls {
+    pub cert_path: String,
+    pub key_path: String,
+}
+
 #[derive(Debug, Clone, Copy, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct ConfigPrometheus {
diff --git a/yellowstone-grpc-geyser/src/grpc.rs b/yellowstone-grpc-geyser/src/grpc.rs
index ad576d7b..aa4c8e86 100644
--- a/yellowstone-grpc-geyser/src/grpc.rs
+++ b/yellowstone-grpc-geyser/src/grpc.rs
@@ -1,3 +1,7 @@
+use tonic::{
+    codec::CompressionEncoding,
+    transport::{Identity, ServerTlsConfig},
+};
 use {
     crate::{
         config::{ConfigBlockFailAction, ConfigGrpc},
@@ -42,7 +46,6 @@ use {
     },
     tokio_stream::wrappers::ReceiverStream,
     tonic::{
-        codec::CompressionEncoding,
         transport::server::{Server, TcpIncoming},
         Request, Response, Result as TonicResult, Status, Streaming,
     },
@@ -707,7 +710,7 @@ impl GrpcService {
 
         // Create Server
         let service = GeyserServer::new(Self {
-            config,
+            config: config.clone(),
             blocks_meta,
             subscribe_id: AtomicUsize::new(0),
             broadcast_tx: broadcast_tx.clone(),
@@ -727,12 +730,21 @@ impl GrpcService {
         // Run Server
         let shutdown = Arc::new(Notify::new());
         let shutdown_grpc = Arc::clone(&shutdown);
+
+        let mut server_builder = Server::builder();
+
+        if let Some(tls_config) = config.tls_config {
+            let cert = std::fs::read_to_string(tls_config.cert_path)?;
+            let key = std::fs::read_to_string(tls_config.key_path)?;
+            server_builder = server_builder
+                .tls_config(ServerTlsConfig::new().identity(Identity::from_pem(&cert, &key)))?;
+        }
         tokio::spawn(async move {
             // gRPC Health check service
             let (mut health_reporter, health_service) = health_reporter();
             health_reporter.set_serving::<GeyserServer<Self>>().await;
 
-            Server::builder()
+            server_builder
                 .http2_keepalive_interval(Some(Duration::from_secs(5)))
                 .add_service(health_service)
                 .add_service(service)