Add TSIG middleware.

examples/server-transports.rs

@@ -490,7 +490,7 @@ impl<Svc> StatsMiddlewareSvc<Svc> {
     fn postprocess<RequestOctets>(
         request: &Request<RequestOctets>,
         response: &AdditionalBuilder<StreamTarget<Svc::Target>>,
-        stats: Arc<RwLock<Stats>>,
+        stats: &RwLock<Stats>,
     ) where
         RequestOctets: Octets + Send + Sync + Unpin,
         Svc: Service<RequestOctets>,
@@ -512,7 +512,7 @@ impl<Svc> StatsMiddlewareSvc<Svc> {
     fn map_stream_item<RequestOctets>(
         request: Request<RequestOctets>,
         stream_item: ServiceResult<Svc::Target>,
-        stats: Arc<RwLock<Stats>>,
+        stats: &mut Arc<RwLock<Stats>>,
     ) -> ServiceResult<Svc::Target>
     where
         RequestOctets: Octets + Send + Sync + Unpin,

src/net/client/dgram.rs

@@ -322,7 +322,7 @@ where
     S: AsyncConnect + Clone + Send + Sync + 'static,
     S::Connection:
         AsyncDgramRecv + AsyncDgramSend + Send + Sync + Unpin + 'static,
-    Req: ComposeRequest + Clone + Send + Sync + 'static,
+    Req: ComposeRequest + Send + Sync + 'static,
 {
     fn send_request(
         &self,

src/net/server/message.rs

@@ -192,7 +192,7 @@ where
 
 impl<Octs, Metadata> Request<Octs, Metadata>
 where
-    Octs: AsRef<[u8]> + Send + Sync + Unpin,
+    Octs: AsRef<[u8]> + Send + Sync,
 {
     /// Creates a new request wrapper around a message along with its context.
     pub fn new(
@@ -270,7 +270,7 @@ where
 
 impl<Octs, Metadata> Clone for Request<Octs, Metadata>
 where
-    Octs: AsRef<[u8]> + Send + Sync + Unpin,
+    Octs: AsRef<[u8]> + Send + Sync,
     Metadata: Clone,
 {
     fn clone(&self) -> Self {

src/net/server/middleware/edns.rs

@@ -325,7 +325,7 @@ where
     fn map_stream_item(
         request: Request<RequestOctets, RequestMeta>,
         mut stream_item: ServiceResult<NextSvc::Target>,
-        _pp_meta: (),
+        _pp_meta: &mut (),
     ) -> ServiceResult<NextSvc::Target> {
         if let Ok(cr) = &mut stream_item {
             if let Some(response) = cr.response_mut() {

src/net/server/middleware/mandatory.rs

@@ -268,11 +268,11 @@ where
     fn map_stream_item(
         request: Request<RequestOctets, RequestMeta>,
         mut stream_item: ServiceResult<NextSvc::Target>,
-        strict: bool,
+        strict: &mut bool,
     ) -> ServiceResult<NextSvc::Target> {
         if let Ok(cr) = &mut stream_item {
             if let Some(response) = cr.response_mut() {
-                Self::postprocess(&request, response, strict);
+                Self::postprocess(&request, response, *strict);
             }
         }
         stream_item

src/net/server/middleware/mod.rs

@@ -12,21 +12,19 @@
 //! post-processing the resulting responses and propagating them back down
 //! through the layers to the server.
 //!
-//! Currently the following middleware are available:
+//! If needed middleware services can pass service specific data to upstream
+//! services for consumption, via the  `RequestMeta` custom data support of
+//! the [`Service`] trait. An example of this can be seen in the
+//! [`TsigMiddlewareSvc`][tsig::TsigMiddlewareSvc].
 //!
-//!   - [`MandatoryMiddlewareSvc`]: Core DNS RFC standards based message
-//!         processing for MUST requirements.
-//!   - [`EdnsMiddlewareSvc`]: RFC 6891 and related EDNS message processing.
-//!   - [`CookiesMiddlewareSvc`]: RFC 7873 DNS Cookies related message
-//!         processing.
+//! Currently the following middleware are available:
 //!
-//! [`MandatoryMiddlewareSvc`]: mandatory::MandatoryMiddlewareSvc
-//! [`EdnsMiddlewareSvc`]: edns::EdnsMiddlewareSvc
-//! [`CookiesMiddlewareSvc`]: cookies::CookiesMiddlewareSvc
 //! [`Service`]: crate::net::server::service::Service
 
 #[cfg(feature = "siphasher")]
 pub mod cookies;
 pub mod edns;
 pub mod mandatory;
 pub mod stream;
+#[cfg(feature = "tsig")]
+pub mod tsig;

src/net/server/middleware/stream.rs

@@ -110,7 +110,7 @@ type PostprocessingStreamCallback<
 > = fn(
     Request<RequestOctets, RequestMeta>,
     StreamItem,
-    PostProcessingMeta,
+    &mut PostProcessingMeta,
 ) -> StreamItem;
 
 //------------ PostprocessingStream ------------------------------------------
@@ -153,7 +153,7 @@ where
     pub fn new(
         svc_call_fut: Future,
         request: Request<RequestOctets, RequestMeta>,
-        metadata: PostProcessingMeta,
+        pp_meta: PostProcessingMeta,
         cb: PostprocessingStreamCallback<
             RequestOctets,
             Stream::Item,
@@ -165,7 +165,7 @@ where
             state: PostprocessingStreamState::Pending(svc_call_fut),
             request,
             cb,
-            pp_meta: metadata,
+            pp_meta,
         }
     }
 }
@@ -187,7 +187,6 @@ where
     Stream: futures_util::stream::Stream + Unpin,
     Self: Unpin,
     RequestMeta: Clone,
-    PostProcessingMeta: Clone,
 {
     type Item = Stream::Item;
 
@@ -206,9 +205,8 @@ where
                 let stream_item = ready!(stream.poll_next_unpin(cx));
                 trace!("Stream item retrieved, mapping to downstream type");
                 let request = self.request.clone();
-                let pp_meta = self.pp_meta.clone();
-                let map =
-                    stream_item.map(|item| (self.cb)(request, item, pp_meta));
+                let map = stream_item
+                    .map(|item| (self.cb)(request, item, &mut self.pp_meta));
                 Poll::Ready(map)
             }
         }