Add support for netblocks to CookiesMiddlewareProcessor.

Cargo.toml

@@ -17,9 +17,9 @@ name = "domain"
 path = "src/lib.rs"
 
 [dependencies]
-octseq         =  { version = "0.5.2-dev", git = "https://github.com/NLnetLabs/octseq.git", rev ="3f7797f4274af0a52e66105250ee1186ff2ab6ac", default-features = false }
-time           =  { version = "0.3.1", default-features = false }
-
+octseq         = { version = "0.5.2-dev", git = "https://github.com/NLnetLabs/octseq.git", rev ="3f7797f4274af0a52e66105250ee1186ff2ab6ac", default-features = false }
+time           = { version = "0.3.1", default-features = false }
+inetnum        = { version = "0.1.0", optional = true }
 rand           = { version = "0.8", optional = true }
 arc-swap       = { version = "1.7.0", optional = true }
 bytes          = { version = "1.0", optional = true, default-features = false }
@@ -41,7 +41,7 @@ tracing        = { version = "0.1.40", optional = true }
 tracing-subscriber = { version = "0.3.18", optional = true, features = ["env-filter"] }
 
 # For testing in integration tests:
-mock_instant = { version = "0.4.0", optional = true }
+mock_instant = { version = "0.5.1", optional = true }
 
 [features]
 default     = ["std", "rand"]
@@ -59,20 +59,12 @@ validate    = ["bytes", "std", "ring"]
 zonefile    = ["bytes", "serde", "std"]
 
 # Unstable features
-unstable-client-transport = [ "moka", "net", "tracing" ]
-unstable-server-transport = ["arc-swap", "chrono/clock", "libc", "net", "tracing"]
-unstable-stelline = ["tokio/test-util", "tracing", "tracing-subscriber", "unstable-server-transport", "zonefile"]
+unstable-client-transport = ["moka", "net", "tracing"]
+unstable-server-transport = ["arc-swap", "chrono/clock", "libc", "net", "siphasher", "tracing"]
+unstable-stelline = ["tokio/test-util", "tracing", "tracing-subscriber", "unstable-server-transport", "zonefile", "mock_instant"]
 unstable-validator = ["validate", "zonefile", "unstable-client-transport"]
 unstable-zonetree = ["futures", "parking_lot", "serde", "tokio", "tracing"]
 
-# Test features
-# Commented out as using --all-features to build would cause mock time to also
-# be used. We plan to move the test code under src/ and then use #[cfg(test)]
-# and this will no longer be needed. The cookies test that depends on this is
-# currently also disabled by being renamed to .rpl.not so it is okay to comment
-# this out.
-#mock-time = ["mock_instant"]
-
 [dev-dependencies]
 lazy_static        = { version = "1.4.0" }
 rstest             = "0.19.0"

examples/server-transports.rs

@@ -33,7 +33,6 @@ use domain::net::server::dgram::DgramServer;
 use domain::net::server::message::Request;
 use domain::net::server::middleware::builder::MiddlewareBuilder;
 use domain::net::server::middleware::processor::MiddlewareProcessor;
-#[cfg(feature = "siphasher")]
 use domain::net::server::middleware::processors::cookies::CookiesMiddlewareProcessor;
 use domain::net::server::middleware::processors::mandatory::MandatoryMiddlewareProcessor;
 use domain::net::server::service::{
@@ -688,12 +687,9 @@ async fn main() {
     let mut fn_svc_middleware = MiddlewareBuilder::new();
     fn_svc_middleware.push(MandatoryMiddlewareProcessor::new().into());
 
-    #[cfg(feature = "siphasher")]
-    {
-        let server_secret = "server12secret34".as_bytes().try_into().unwrap();
-        fn_svc_middleware
-            .push(CookiesMiddlewareProcessor::new(server_secret).into());
-    }
+    let server_secret = "server12secret34".as_bytes().try_into().unwrap();
+    fn_svc_middleware
+        .push(CookiesMiddlewareProcessor::new(server_secret).into());
 
     let fn_svc_middleware = fn_svc_middleware.build();
 

src/base/serial.rs

@@ -13,7 +13,7 @@ use chrono::{DateTime, TimeZone};
 use core::cmp::Ordering;
 use core::{cmp, fmt, str};
 #[cfg(all(feature = "std", test))]
-use mock_instant::{SystemTime, UNIX_EPOCH};
+use mock_instant::thread_local::{SystemTime, UNIX_EPOCH};
 use octseq::parse::Parser;
 #[cfg(all(feature = "std", not(test)))]
 use std::time::{SystemTime, UNIX_EPOCH};

src/net/client/validator_test.rs

@@ -14,7 +14,7 @@ use crate::stelline::connect::Connect;
 use crate::stelline::parse_stelline::parse_file;
 use crate::stelline::parse_stelline::Config;
 
-use mock_instant::MockClock;
+use mock_instant::thread_local::MockClock;
 use rstest::rstest;
 use tracing::instrument;
 

src/net/server/dgram.rs

@@ -28,6 +28,7 @@ use tokio::time::interval;
 use tokio::time::timeout;
 use tokio::time::Instant;
 use tokio::time::MissedTickBehavior;
+use tracing::warn;
 use tracing::Level;
 use tracing::{enabled, error, trace};
 
@@ -720,13 +721,16 @@ where
 
                 // Actually write the DNS response message bytes to the UDP
                 // socket.
-                let _ = Self::send_to(
+                if let Err(err) = Self::send_to(
                     &state.sock,
                     bytes,
                     &client_addr,
                     state.write_timeout,
                 )
-                .await;
+                .await
+                {
+                    warn!(%client_addr, "Failed to send response: {err}");
+                }
 
                 metrics.dec_num_pending_writes();
                 metrics.inc_num_sent_responses();