feat: return error if provider does not support target lookup

ghztomash · ghztomash · commit f8a5ac6808e6 · 2024-04-25T23:50:15.000+02:00
diff --git a/src/lookup/abstractapi.rs b/src/lookup/abstractapi.rs
@@ -102,6 +102,10 @@ impl Provider for AbstractApi {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::AbstractApi
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/error.rs b/src/lookup/error.rs
@@ -23,4 +23,7 @@ pub enum LookupError {
     /// Generic error
     #[error("Lookup error")]
     GenericError(String),
+    /// Target address not supported by this provider
+    #[error("Target lookup not supported")]
+    TargetNotSupported,
 }
diff --git a/src/lookup/freeipapi.rs b/src/lookup/freeipapi.rs
@@ -78,6 +78,10 @@ impl Provider for FreeIpApi {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::FreeIpApi
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ifconfig.rs b/src/lookup/ifconfig.rs
@@ -77,6 +77,10 @@ impl Provider for IfConfig {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IfConfig
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ip2location.rs b/src/lookup/ip2location.rs
@@ -75,6 +75,10 @@ impl Provider for Ip2Location {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::Ip2Location
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ipapico.rs b/src/lookup/ipapico.rs
@@ -80,6 +80,10 @@ impl Provider for IpApiCo {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpApiCo
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ipapicom.rs b/src/lookup/ipapicom.rs
@@ -84,6 +84,10 @@ impl Provider for IpApiCom {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpApiCom
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ipapiio.rs b/src/lookup/ipapiio.rs
@@ -89,6 +89,10 @@ impl Provider for IpApiIo {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpApiIo
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ipbase.rs b/src/lookup/ipbase.rs
@@ -149,6 +149,10 @@ impl Provider for IpBase {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpBase
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ipdata.rs b/src/lookup/ipdata.rs
@@ -131,6 +131,10 @@ impl Provider for IpData {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpData
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ipgeolocation.rs b/src/lookup/ipgeolocation.rs
@@ -92,6 +92,10 @@ impl Provider for IpGeolocation {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpGeolocation
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ipinfo.rs b/src/lookup/ipinfo.rs
@@ -82,6 +82,10 @@ impl Provider for IpInfo {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpInfo
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ipleak.rs b/src/lookup/ipleak.rs
@@ -75,6 +75,10 @@ impl Provider for IpLeak {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpLeak
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/iplocateio.rs b/src/lookup/iplocateio.rs
@@ -83,6 +83,10 @@ impl Provider for IpLocateIo {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpLocateIo
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/ipwhois.rs b/src/lookup/ipwhois.rs
@@ -86,6 +86,10 @@ impl Provider for IpWhoIs {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::IpWhoIs
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
 
 #[cfg(test)]
diff --git a/src/lookup/mock.rs b/src/lookup/mock.rs
@@ -29,4 +29,8 @@ impl Provider for Mock {
     fn get_type(&self) -> LookupProvider {
         LookupProvider::Mock(self.ip.to_string())
     }
+
+    fn supports_target_lookup(&self) -> bool {
+        true
+    }
 }
diff --git a/src/lookup/mod.rs b/src/lookup/mod.rs
@@ -73,6 +73,11 @@ pub trait Provider {
     fn add_auth(&self, request: RequestBuilder, _key: &Option<String>) -> RequestBuilder {
         request
     }
+
+    /// Check if the provider supports target lookup
+    fn supports_target_lookup(&self) -> bool {
+        false
+    }
 }
 
 /// ProviderResponse trait that define methods to parse the response from the provider
@@ -292,6 +297,9 @@ impl LookupService {
     /// This function makes an API request to the current lookup provider and parses the response into a `LookupResponse` instance.
     #[maybe_async::maybe_async]
     pub async fn lookup(&self, target: Option<IpAddr>) -> Result<LookupResponse> {
+        if target.is_some() && !self.provider.supports_target_lookup() {
+            return Err(LookupError::TargetNotSupported);
+        }
         let response = self.make_api_request(target).await?;
         self.provider.parse_reply(response)
     }
@@ -376,6 +384,22 @@ mod tests {
         );
     }
 
+    #[maybe_async::test(feature = "blocking", async(not(feature = "blocking"), tokio::test))]
+    async fn test_target_supported() {
+        let address = "8.8.8.8".parse::<std::net::IpAddr>().unwrap();
+        let provider = LookupService::new(LookupProvider::Mock(address.to_string()), None);
+        let response = provider.lookup(Some(address)).await;
+        assert!(response.is_ok());
+    }
+
+    #[maybe_async::test(feature = "blocking", async(not(feature = "blocking"), tokio::test))]
+    async fn test_target_not_supported() {
+        let address = "1.1.1.1".parse::<std::net::IpAddr>().unwrap();
+        let provider = LookupService::new(LookupProvider::MyIp, None);
+        let response = provider.lookup(Some(address)).await.unwrap_err();
+        assert_eq!(response.to_string(), "Target lookup not supported", "Target lookup should fail");
+    }
+
     #[test]
     fn test_conversions() {
         let provider = LookupProvider::from_str("freeipapi").unwrap();

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,10 @@ impl Provider for AbstractApi {`
`102`	`102`	`fn get_type(&self) -> LookupProvider {`
`103`	`103`	`LookupProvider::AbstractApi`
`104`	`104`	`}`
	`105`	`+`
	`106`	`+ fn supports_target_lookup(&self) -> bool {`
	`107`	`+ true`
	`108`	`+ }`
`105`	`109`	`}`
`106`	`110`
`107`	`111`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,7 @@ pub enum LookupError {`
`23`	`23`	`/// Generic error`
`24`	`24`	`#[error("Lookup error")]`
`25`	`25`	`GenericError(String),`
	`26`	`+ /// Target address not supported by this provider`
	`27`	`+ #[error("Target lookup not supported")]`
	`28`	`+ TargetNotSupported,`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,10 @@ impl Provider for FreeIpApi {`
`78`	`78`	`fn get_type(&self) -> LookupProvider {`
`79`	`79`	`LookupProvider::FreeIpApi`
`80`	`80`	`}`
	`81`	`+`
	`82`	`+ fn supports_target_lookup(&self) -> bool {`
	`83`	`+ true`
	`84`	`+ }`
`81`	`85`	`}`
`82`	`86`
`83`	`87`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,10 @@ impl Provider for IfConfig {`
`77`	`77`	`fn get_type(&self) -> LookupProvider {`
`78`	`78`	`LookupProvider::IfConfig`
`79`	`79`	`}`
	`80`	`+`
	`81`	`+ fn supports_target_lookup(&self) -> bool {`
	`82`	`+ true`
	`83`	`+ }`
`80`	`84`	`}`
`81`	`85`
`82`	`86`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,10 @@ impl Provider for Ip2Location {`
`75`	`75`	`fn get_type(&self) -> LookupProvider {`
`76`	`76`	`LookupProvider::Ip2Location`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ fn supports_target_lookup(&self) -> bool {`
	`80`	`+ true`
	`81`	`+ }`
`78`	`82`	`}`
`79`	`83`
`80`	`84`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,10 @@ impl Provider for IpApiCo {`
`80`	`80`	`fn get_type(&self) -> LookupProvider {`
`81`	`81`	`LookupProvider::IpApiCo`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+ fn supports_target_lookup(&self) -> bool {`
	`85`	`+ true`
	`86`	`+ }`
`83`	`87`	`}`
`84`	`88`
`85`	`89`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,10 @@ impl Provider for IpApiCom {`
`84`	`84`	`fn get_type(&self) -> LookupProvider {`
`85`	`85`	`LookupProvider::IpApiCom`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ fn supports_target_lookup(&self) -> bool {`
	`89`	`+ true`
	`90`	`+ }`
`87`	`91`	`}`
`88`	`92`
`89`	`93`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,10 @@ impl Provider for IpApiIo {`
`89`	`89`	`fn get_type(&self) -> LookupProvider {`
`90`	`90`	`LookupProvider::IpApiIo`
`91`	`91`	`}`
	`92`	`+`
	`93`	`+ fn supports_target_lookup(&self) -> bool {`
	`94`	`+ true`
	`95`	`+ }`
`92`	`96`	`}`
`93`	`97`
`94`	`98`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,10 @@ impl Provider for IpBase {`
`149`	`149`	`fn get_type(&self) -> LookupProvider {`
`150`	`150`	`LookupProvider::IpBase`
`151`	`151`	`}`
	`152`	`+`
	`153`	`+ fn supports_target_lookup(&self) -> bool {`
	`154`	`+ true`
	`155`	`+ }`
`152`	`156`	`}`
`153`	`157`
`154`	`158`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,10 @@ impl Provider for IpData {`
`131`	`131`	`fn get_type(&self) -> LookupProvider {`
`132`	`132`	`LookupProvider::IpData`
`133`	`133`	`}`
	`134`	`+`
	`135`	`+ fn supports_target_lookup(&self) -> bool {`
	`136`	`+ true`
	`137`	`+ }`
`134`	`138`	`}`
`135`	`139`
`136`	`140`	`#[cfg(test)]`