create types ListOfCertificatesByAddress and CertificatesByAddress

sozu-proxy · Apr 28, 2023 · 75b5ade · 75b5ade
1 parent 802c3e9
commit 75b5ade
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 26 deletions.
diff --git a/bin/src/ctl/display.rs b/bin/src/ctl/display.rs
@@ -644,11 +644,11 @@ pub fn print_certificates(
 
     for (_worker_id, response_content) in response_contents.iter() {
         match response_content {
-            ResponseContent::Certificates(h) => {
-                for (addr, h2) in h.iter() {
-                    println!("\t{addr}:");
+            ResponseContent::Certificates(list) => {
+                for certs in list.certificates.iter() {
+                    println!("\t{}:", certs.address);
 
-                    for summary in h2.iter() {
+                    for summary in certs.certificate_summaries.iter() {
                         println!(
                             "\t\t{}:\t{}",
                             summary.domain,

diff --git a/command/src/command.proto b/command/src/command.proto
@@ -295,6 +295,15 @@ message CertificateSummary {
     required string fingerprint = 2;
 }
 
+message ListOfCertificatesByAddress {
+    repeated CertificatesByAddress certificates = 1;
+}
+
+message CertificatesByAddress {
+    required string address = 1;
+    repeated CertificateSummary certificate_summaries = 2;
+}
+
 // A certificate matching a request by fingerprint,
 // and the list of domain names associated
 message CertificateWithNames {

diff --git a/command/src/response.rs b/command/src/response.rs
@@ -1,17 +1,11 @@
-use std::{
-    cmp::Ordering,
-    collections::{BTreeMap, HashMap},
-    default::Default,
-    fmt,
-    net::SocketAddr,
-};
+use std::{cmp::Ordering, collections::BTreeMap, default::Default, fmt, net::SocketAddr};
 
 use crate::{
     proto::command::{
-        AddBackend, AggregatedMetrics, AvailableMetrics, CertificateSummary, ClusterHashes,
-        ClusterInformations, Event, FilteredTimeSerie, ListenersList, LoadBalancingParams,
-        PathRule, PathRuleKind, RequestHttpFrontend, RequestTcpFrontend, ResponseStatus,
-        RulePosition, RunState, WorkerInfos, WorkerMetrics, CertificateWithNames,
+        AddBackend, AggregatedMetrics, AvailableMetrics, CertificateWithNames, ClusterHashes,
+        ClusterInformations, Event, FilteredTimeSerie, ListOfCertificatesByAddress, ListenersList,
+        LoadBalancingParams, PathRule, PathRuleKind, RequestHttpFrontend, RequestTcpFrontend,
+        ResponseStatus, RulePosition, RunState, WorkerInfos, WorkerMetrics,
     },
     request::PROTOCOL_VERSION,
     state::ClusterId,
@@ -72,7 +66,7 @@ pub enum ResponseContent {
     ClustersHashes(ClusterHashes),
 
     /// a list of certificates for each socket address
-    Certificates(HashMap<SocketAddr, Vec<CertificateSummary>>),
+    Certificates(ListOfCertificatesByAddress),
 
     /// returns the certificate matching a request by fingerprint,
     /// and the list of domain names associated

diff --git a/lib/src/https.rs b/lib/src/https.rs
@@ -33,8 +33,9 @@ use sozu_command::{
     config::DEFAULT_CIPHER_SUITES,
     logging,
     proto::command::{
-        request::RequestType, AddCertificate, CertificateSummary, Cluster, HttpsListenerConfig,
-        RemoveCertificate, RemoveListener, ReplaceCertificate, RequestHttpFrontend, TlsVersion,
+        request::RequestType, AddCertificate, CertificateSummary, CertificatesByAddress, Cluster,
+        HttpsListenerConfig, ListOfCertificatesByAddress, RemoveCertificate, RemoveListener,
+        ReplaceCertificate, RequestHttpFrontend, TlsVersion,
     },
     ready::Ready,
     request::WorkerRequest,
@@ -954,16 +955,21 @@ impl HttpsProxy {
                     })
                     .collect();
 
-                (owned.address, certificate_summaries)
+                CertificatesByAddress {
+                    address: owned.address.to_string(),
+                    certificate_summaries,
+                }
             })
-            .collect::<HashMap<_, _>>();
+            .collect();
 
         info!(
             "got Certificates::All query, answering with {:?}",
             certificates
         );
 
-        Ok(Some(ResponseContent::Certificates(certificates)))
+        Ok(Some(ResponseContent::Certificates(
+            ListOfCertificatesByAddress { certificates },
+        )))
     }
 
     pub fn query_certificate_for_domain(
@@ -976,26 +982,31 @@ impl HttpsProxy {
             .map(|listener| {
                 let owned = listener.borrow();
                 let resolver = unwrap_msg!(owned.resolver.0.lock());
-                let mut certificate_summary = vec![];
+                let mut certificate_summaries = vec![];
 
                 resolver
                     .domain_lookup(domain.as_bytes(), true)
                     .map(|(k, fingerprint)| {
-                        certificate_summary.push(CertificateSummary {
+                        certificate_summaries.push(CertificateSummary {
                             domain: String::from_utf8(k.to_vec()).unwrap(),
                             fingerprint: fingerprint.to_string(),
                         });
                     });
-                (owned.address, certificate_summary)
+                CertificatesByAddress {
+                    address: owned.address.to_string(),
+                    certificate_summaries,
+                }
             })
-            .collect::<HashMap<_, _>>();
+            .collect();
 
         info!(
             "got Certificates::Domain({}) query, answering with {:?}",
             domain, certificates
         );
 
-        Ok(Some(ResponseContent::Certificates(certificates)))
+        Ok(Some(ResponseContent::Certificates(
+            ListOfCertificatesByAddress { certificates },
+        )))
     }
 
     pub fn activate_listener(