From 8b5cbf998692680e9fe0182f5c08a095096f837d Mon Sep 17 00:00:00 2001
From: tottoto <tottotodev@gmail.com>
Date: Mon, 27 May 2024 07:02:22 +0900
Subject: [PATCH] feat(tls): Use rustls_pki_types::CertificateDer to describe
 DER encoded certificate

---
 tonic/src/request.rs               |  6 ++++--
 tonic/src/transport/mod.rs         |  4 +++-
 tonic/src/transport/server/conn.rs | 10 +++++-----
 tonic/src/transport/tls.rs         | 30 ------------------------------
 4 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/tonic/src/request.rs b/tonic/src/request.rs
index dad49bdfe..a27a7070c 100644
--- a/tonic/src/request.rs
+++ b/tonic/src/request.rs
@@ -2,13 +2,15 @@ use crate::metadata::{MetadataMap, MetadataValue};
 #[cfg(feature = "transport")]
 use crate::transport::server::TcpConnectInfo;
 #[cfg(feature = "tls")]
-use crate::transport::{server::TlsConnectInfo, CertificateDer};
+use crate::transport::server::TlsConnectInfo;
 use crate::Extensions;
 #[cfg(feature = "transport")]
 use std::net::SocketAddr;
 #[cfg(feature = "tls")]
 use std::sync::Arc;
 use std::time::Duration;
+#[cfg(feature = "tls")]
+use tokio_rustls::rustls::pki_types::CertificateDer;
 use tokio_stream::Stream;
 
 /// A gRPC request and metadata from an RPC call.
@@ -258,7 +260,7 @@ impl<T> Request<T> {
     /// TLS enabled connections.
     #[cfg(feature = "tls")]
     #[cfg_attr(docsrs, doc(cfg(feature = "tls")))]
-    pub fn peer_certs(&self) -> Option<Arc<Vec<CertificateDer>>> {
+    pub fn peer_certs(&self) -> Option<Arc<Vec<CertificateDer<'static>>>> {
         self.extensions()
             .get::<TlsConnectInfo<TcpConnectInfo>>()
             .and_then(|i| i.peer_certs())
diff --git a/tonic/src/transport/mod.rs b/tonic/src/transport/mod.rs
index 47b553815..758bdb7d8 100644
--- a/tonic/src/transport/mod.rs
+++ b/tonic/src/transport/mod.rs
@@ -106,9 +106,11 @@ pub use self::server::Server;
 pub use self::service::grpc_timeout::TimeoutExpired;
 #[cfg(feature = "tls")]
 #[cfg_attr(docsrs, doc(cfg(feature = "tls")))]
-pub use self::tls::{Certificate, CertificateDer};
+pub use self::tls::Certificate;
 pub use axum::{body::BoxBody as AxumBoxBody, Router as AxumRouter};
 pub use hyper::{Body, Uri};
+#[cfg(feature = "tls")]
+pub use tokio_rustls::rustls::pki_types::CertificateDer;
 
 pub(crate) use self::service::executor::Executor;
 
diff --git a/tonic/src/transport/server/conn.rs b/tonic/src/transport/server/conn.rs
index a3bc7c360..69e5a2c05 100644
--- a/tonic/src/transport/server/conn.rs
+++ b/tonic/src/transport/server/conn.rs
@@ -2,11 +2,11 @@ use hyper::server::conn::AddrStream;
 use std::net::SocketAddr;
 use tokio::net::TcpStream;
 
-#[cfg(feature = "tls")]
-use crate::transport::CertificateDer;
 #[cfg(feature = "tls")]
 use std::sync::Arc;
 #[cfg(feature = "tls")]
+use tokio_rustls::rustls::pki_types::CertificateDer;
+#[cfg(feature = "tls")]
 use tokio_rustls::server::TlsStream;
 
 /// Trait that connected IO resources implement and use to produce info about the connection.
@@ -126,7 +126,7 @@ where
         let inner = inner.connect_info();
 
         let certs = if let Some(certs) = session.peer_certificates() {
-            let certs = certs.iter().map(CertificateDer::new).collect();
+            let certs = certs.iter().cloned().collect();
             Some(Arc::new(certs))
         } else {
             None
@@ -148,7 +148,7 @@ where
 #[derive(Debug, Clone)]
 pub struct TlsConnectInfo<T> {
     inner: T,
-    certs: Option<Arc<Vec<CertificateDer>>>,
+    certs: Option<Arc<Vec<CertificateDer<'static>>>>,
 }
 
 #[cfg(feature = "tls")]
@@ -165,7 +165,7 @@ impl<T> TlsConnectInfo<T> {
     }
 
     /// Return the set of connected peer TLS certificates.
-    pub fn peer_certs(&self) -> Option<Arc<Vec<CertificateDer>>> {
+    pub fn peer_certs(&self) -> Option<Arc<Vec<CertificateDer<'static>>>> {
         self.certs.clone()
     }
 }
diff --git a/tonic/src/transport/tls.rs b/tonic/src/transport/tls.rs
index 0f12c9beb..c2b7ef23f 100644
--- a/tonic/src/transport/tls.rs
+++ b/tonic/src/transport/tls.rs
@@ -11,12 +11,6 @@ pub struct Identity {
     pub(crate) key: Vec<u8>,
 }
 
-/// Reprensents a DER encoded certificate.
-#[derive(Debug, Clone)]
-pub struct CertificateDer {
-    bytes: Vec<u8>,
-}
-
 impl Certificate {
     /// Parse a PEM encoded X509 Certificate.
     ///
@@ -64,27 +58,3 @@ impl Identity {
         Self { cert, key }
     }
 }
-
-impl CertificateDer {
-    pub(crate) fn new(bytes: impl AsRef<[u8]>) -> Self {
-        let bytes = bytes.as_ref().into();
-        Self { bytes }
-    }
-
-    /// Consumes `self`, returning the underlying DER encoded certificate
-    pub fn into_bytes(self) -> Vec<u8> {
-        self.bytes
-    }
-}
-
-impl AsRef<[u8]> for CertificateDer {
-    fn as_ref(&self) -> &[u8] {
-        self.bytes.as_ref()
-    }
-}
-
-impl AsMut<[u8]> for CertificateDer {
-    fn as_mut(&mut self) -> &mut [u8] {
-        self.bytes.as_mut()
-    }
-}