Merge pull request #175 from erikh/test-fixes

erikh · web-flow · commit 8d51d33d4e52 · 2022-03-28T16:39:37.000-07:00
Test fixes related to tracing integration
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,7 +53,7 @@ ZeroNS provides names that are a part of ZeroTier Central's
   resolvers that do not match the TLD, similar to `dnsmasq`.
 - Tells Central to point all clients that have the "Manage DNS" settings turned
   **on** to resolve to it.
-- Finally, sets a provided TLD (`.domain` is the default), as well as
+- Finally, sets a provided TLD (`.home.arpa` is the default), as well as
   configuring `A` (IPv4) and `AAAA` (IPv6) records for:
   - Member IDs: `zt-<memberid>.<tld>` will resolve to the IPv4/v6 addresses for
     them.
diff --git a/src/init.rs b/src/init.rs
@@ -189,7 +189,13 @@ impl Launcher {
 
                 let chain = if let Some(chain_cert) = self.chain_cert.clone() {
                     let pem = std::fs::read(chain_cert)?;
-                    Some(X509::stack_from_pem(&pem)?)
+                    let chain = X509::stack_from_pem(&pem)?;
+
+                    let mut stack = Stack::new()?;
+                    for cert in chain {
+                        stack.push(cert)?;
+                    }
+                    Some(stack)
                 } else {
                     None
                 };
@@ -201,19 +207,11 @@ impl Launcher {
                     None
                 };
 
-                let certs = if chain.is_some() {
-                    let mut stack = Stack::new()?;
-                    for cert in chain.unwrap() {
-                        stack.push(cert)?;
-                    }
-                    Some((tls_cert.unwrap(), Some(stack)))
-                } else if tls_cert.is_some() {
-                    Some((tls_cert.unwrap(), None))
-                } else {
-                    None
-                };
-
-                tokio::spawn(server.clone().listen(ip, Duration::new(1, 0), certs, key));
+                tokio::spawn(
+                    server
+                        .clone()
+                        .listen(ip, Duration::new(1, 0), tls_cert, chain, key),
+                );
             }
 
             return Ok(ztauthority);
diff --git a/src/server.rs b/src/server.rs
@@ -1,8 +1,8 @@
-use tracing::info;
 use std::{
     net::{IpAddr, SocketAddr},
     time::Duration,
 };
+use tracing::info;
 
 use openssl::{
     pkey::{PKey, Private},
@@ -28,7 +28,8 @@ impl Server {
         self,
         ip: IpAddr,
         tcp_timeout: Duration,
-        certs: Option<(X509, Option<Stack<X509>>)>,
+        certs: Option<X509>,
+        cert_chain: Option<Stack<X509>>,
         key: Option<PKey<Private>>,
     ) -> Result<(), anyhow::Error> {
         let sa = SocketAddr::new(ip, 53);
@@ -39,10 +40,13 @@ impl Server {
 
         if certs.is_some() && key.is_some() {
             info!("Configuring DoT Listener");
-
             let tls = TcpListener::bind(SocketAddr::new(ip, 853)).await?;
-            match sf.register_tls_listener(tls, tcp_timeout, (certs.unwrap(), key.clone().unwrap()))
-            {
+
+            match sf.register_tls_listener(
+                tls,
+                tcp_timeout,
+                ((certs.clone().unwrap(), cert_chain), key.clone().unwrap()),
+            ) {
                 Ok(_) => {}
                 Err(e) => tracing::error!("Cannot start DoT listener: {}", e),
             }
diff --git a/tests/integration.rs b/tests/integration.rs
@@ -5,16 +5,16 @@ mod service;
 mod sixplane {
     use std::{net::IpAddr, path::Path, str::FromStr, time::Duration};
 
-    use tracing::info;
     use rand::prelude::SliceRandom;
+    use tracing::info;
     use trust_dns_resolver::{IntoName, Name};
 
     use crate::service::{HostsType, Lookup, Service, ServiceConfig, ToIPv6Vec};
     use zeronsd::{addresses::Calculator, hosts::parse_hosts, utils::init_logger};
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_battery_single_domain() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let service = Service::new(ServiceConfig::default().network_filename("6plane-only")).await;
 
         let record = service.member_record();
@@ -33,7 +33,7 @@ mod sixplane {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_battery_single_domain_named() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let update_interval = Duration::new(2, 0);
         let service = Service::new(
             ServiceConfig::default()
@@ -63,7 +63,7 @@ mod sixplane {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_battery_multi_domain_hosts_file() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let service = Service::new(
             ServiceConfig::default()
                 .hosts(HostsType::Fixture("basic-ipv6"))
@@ -100,7 +100,7 @@ mod sixplane {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_wildcard_central() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let service = Service::new(
             ServiceConfig::default()
                 .update_interval(Some(Duration::new(5, 0)))
@@ -151,16 +151,16 @@ mod sixplane {
 mod rfc4193 {
     use std::{net::IpAddr, path::Path, str::FromStr, time::Duration};
 
-    use tracing::info;
     use rand::{prelude::SliceRandom, thread_rng};
+    use tracing::info;
     use trust_dns_resolver::{IntoName, Name};
 
     use crate::service::{HostsType, Lookup, Service, ServiceConfig, ToIPv6Vec, ToPTRVec};
     use zeronsd::{addresses::Calculator, hosts::parse_hosts, utils::init_logger};
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_battery_single_domain() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let service = Service::new(ServiceConfig::default().network_filename("rfc4193-only")).await;
 
         let record = service.member_record();
@@ -239,7 +239,7 @@ mod rfc4193 {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_battery_single_domain_named() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let update_interval = Duration::new(2, 0);
         let service = Service::new(
             ServiceConfig::default()
@@ -288,7 +288,7 @@ mod rfc4193 {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_battery_multi_domain_hosts_file() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let service = Service::new(
             ServiceConfig::default()
                 .hosts(HostsType::Fixture("basic-ipv6"))
@@ -325,7 +325,7 @@ mod rfc4193 {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_wildcard_central() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let service = Service::new(
             ServiceConfig::default()
                 .update_interval(Some(Duration::new(5, 0)))
@@ -376,8 +376,8 @@ mod rfc4193 {
 mod ipv4 {
     use std::time::Duration;
 
-    use tracing::info;
     use std::str::FromStr;
+    use tracing::info;
     use trust_dns_resolver::Name;
 
     use zeronsd::utils::init_logger;
@@ -386,7 +386,7 @@ mod ipv4 {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_wildcard_central() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let service = Service::new(
             ServiceConfig::default()
                 .update_interval(Some(Duration::new(5, 0)))
@@ -436,7 +436,7 @@ mod ipv4 {
     async fn test_battery_single_domain() {
         use rand::{seq::SliceRandom, thread_rng};
 
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let service = Service::new(ServiceConfig::default().ips(Some(vec![
             "172.16.240.2",
             "172.16.240.3",
@@ -520,7 +520,7 @@ mod ipv4 {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_battery_single_domain_named() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let update_interval = Duration::new(2, 0);
         let service = Service::new(
             ServiceConfig::default()
@@ -569,8 +569,8 @@ mod ipv4 {
 }
 
 mod all {
-    use tracing::info;
     use rand::prelude::SliceRandom;
+    use tracing::info;
     use trust_dns_resolver::{IntoName, Name};
 
     use zeronsd::{
@@ -590,7 +590,7 @@ mod all {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_battery_multi_domain_hosts_file() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let ips = vec!["172.16.240.2", "172.16.240.3", "172.16.240.4"];
         let service = Service::new(
             ServiceConfig::default()
@@ -630,7 +630,7 @@ mod all {
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_hosts_file_reloading() {
-        init_logger(tracing::LevelFilter::Error);
+        init_logger(Some(tracing::Level::ERROR));
         let hosts_path = "/tmp/zeronsd-test-hosts";
         std::fs::write(hosts_path, "127.0.0.2 islay\n::2 islay\n").unwrap();
         let service = Service::new(
@@ -686,7 +686,7 @@ async fn test_get_listen_ip() -> Result<(), anyhow::Error> {
     use service::*;
     use zeronsd::utils::*;
 
-    init_logger(tracing::LevelFilter::Error);
+    init_logger(Some(tracing::Level::ERROR));
 
     let tn = TestNetwork::new("basic-ipv4", &mut TestContext::default().await)
         .await
diff --git a/tests/service.rs b/tests/service.rs
@@ -17,9 +17,9 @@ use std::{
 use async_trait::async_trait;
 use ipnetwork::IpNetwork;
 use lazy_static::lazy_static;
-use tracing::{info, warn};
 use rand::prelude::{IteratorRandom, SliceRandom};
 use tokio::{sync::Mutex, task::JoinHandle};
+use tracing::{info, warn};
 use trust_dns_resolver::{
     config::{NameServerConfig, ResolverConfig, ResolverOpts},
     name_server::{GenericConnection, GenericConnectionProvider, TokioRuntime},
@@ -506,6 +506,7 @@ async fn create_listeners(
             Duration::new(0, 500),
             None,
             None,
+            None,
         )));
     }
 
