fix: add Resolver implementations for references and Arc<> (#8)

crates/geoip/src/block/middleware/tests.rs

@@ -5,7 +5,7 @@ use {
     },
     hyper::{Body, Request, Response, StatusCode},
     maxminddb::{geoip2, geoip2::City},
-    std::{convert::Infallible, net::IpAddr},
+    std::{convert::Infallible, net::IpAddr, sync::Arc},
     tower::{Service, ServiceBuilder, ServiceExt},
 };
 
@@ -51,6 +51,44 @@ async fn test_blocked_country() {
     assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
 }
 
+#[tokio::test]
+async fn test_reference() {
+    let resolver = LocalResolver::new(Some(resolve_ip), None);
+    let blocked_countries = vec!["CU".into(), "IR".into(), "KP".into()];
+
+    let geoblock = GeoBlockLayer::new(&resolver, blocked_countries, BlockingPolicy::Block);
+
+    let mut service = ServiceBuilder::new().layer(geoblock).service_fn(handle);
+
+    let request = Request::builder()
+        .header("X-Forwarded-For", "127.0.0.1")
+        .body(Body::empty())
+        .unwrap();
+
+    let response = service.ready().await.unwrap().call(request).await.unwrap();
+
+    assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+}
+
+#[tokio::test]
+async fn test_arc() {
+    let resolver = Arc::from(LocalResolver::new(Some(resolve_ip), None));
+    let blocked_countries = vec!["CU".into(), "IR".into(), "KP".into()];
+
+    let geoblock = GeoBlockLayer::new(&resolver, blocked_countries, BlockingPolicy::Block);
+
+    let mut service = ServiceBuilder::new().layer(geoblock).service_fn(handle);
+
+    let request = Request::builder()
+        .header("X-Forwarded-For", "127.0.0.1")
+        .body(Body::empty())
+        .unwrap();
+
+    let response = service.ready().await.unwrap().call(request).await.unwrap();
+
+    assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+}
+
 #[tokio::test]
 async fn test_non_blocked_country() {
     let resolver = LocalResolver::new(Some(resolve_ip), None);

crates/geoip/src/lib.rs

@@ -8,7 +8,7 @@ use {
     },
     bytes::Bytes,
     maxminddb::geoip2::City,
-    std::{net::IpAddr, sync::Arc},
+    std::{net::IpAddr, ops::Deref, sync::Arc},
 };
 
 pub mod block;
@@ -32,6 +32,40 @@ pub trait Resolver: Clone {
     fn lookup_geo_data(&self, addr: IpAddr) -> Result<Data, Self::Error>;
 }
 
+impl<'a, T> Resolver for &'a T
+where
+    T: Resolver,
+{
+    type Error = T::Error;
+
+    fn lookup_geo_data_raw(&self, addr: IpAddr) -> Result<City<'_>, Self::Error> {
+        let r = <&T>::deref(self);
+        r.lookup_geo_data_raw(addr)
+    }
+
+    fn lookup_geo_data(&self, addr: IpAddr) -> Result<Data, Self::Error> {
+        let r = <&T>::deref(self);
+        r.lookup_geo_data(addr)
+    }
+}
+
+impl<T> Resolver for Arc<T>
+where
+    T: Resolver,
+{
+    type Error = T::Error;
+
+    fn lookup_geo_data_raw(&self, addr: IpAddr) -> Result<City<'_>, Self::Error> {
+        let r = self.deref();
+        r.lookup_geo_data_raw(addr)
+    }
+
+    fn lookup_geo_data(&self, addr: IpAddr) -> Result<Data, Self::Error> {
+        let r = self.deref();
+        r.lookup_geo_data(addr)
+    }
+}
+
 #[derive(Debug, thiserror::Error)]
 pub enum LocalResolverError {
     #[error("Geoip data lookup is not supported")]