Merge pull request #199 from blacklanternsecurity/dev

Update radixtarget

Author: TheTechromancer

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cloudcheck"
-version = "8.1.3"
+version = "8.2.0"
 edition = "2024"
 description = "CloudCheck is a simple Rust tool to check whether an IP address or hostname belongs to a cloud provider."
 license = "GPL-3.0"
@@ -13,7 +13,7 @@ reqwest = { version = "0.12", features = ["json"] }
 openssl = { version = "0.10", features = ["vendored"] }
 pyo3 = { version = "0.27", optional = true }
 pyo3-async-runtimes = { version = "0.27", features = ["tokio-runtime"], optional = true }
-radixtarget = "4.1"
+radixtarget = "4.2"
 
 [features]
 default = []

Cargo.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "cloudcheck"
-version = "8.1.3"
+version = "8.2.0"
 description = "Detailed database of cloud providers. Instantly look up a domain or IP address"
 readme = "README.md"
 requires-python = ">=3.9"

pyproject.toml

@@ -9,7 +9,7 @@ use tokio::sync::OnceCell;
 #[cfg(feature = "py")]
 mod python;
 
-const CLOUDCHECK_SIGNATURE_URL: &str = "https://raw.githubusercontent.com/blacklanternsecurity/cloudcheck/refs/heads/cloudcheck-v8/cloud_providers_v2.json";
+const CLOUDCHECK_SIGNATURE_URL: &str = "https://raw.githubusercontent.com/blacklanternsecurity/cloudcheck/refs/heads/stable/cloud_providers_v2.json";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CloudProvider {
@@ -104,7 +104,7 @@ impl CloudCheck {
                 let providers_data: HashMap<String, ProviderData> =
                     serde_json::from_str(&json_data)?;
 
-                let mut radix = RadixTarget::new(&[], ScopeMode::Normal);
+                let mut radix = RadixTarget::new(&[], ScopeMode::Normal)?;
                 let mut providers_map: HashMap<String, Vec<CloudProvider>> = HashMap::new();
 
                 for (_, provider) in providers_data {
@@ -116,7 +116,14 @@ impl CloudCheck {
                     for cidr in provider.cidrs {
                         let normalized = match radix.get(&cidr) {
                             Some(n) => n,
-                            None => radix.insert(&cidr).unwrap(),
+                            None => match radix.insert(&cidr) {
+                                Ok(Some(n)) => n,
+                                Ok(None) => continue,
+                                Err(e) => {
+                                    eprintln!("Error inserting CIDR '{}': {}", cidr, e);
+                                    continue;
+                                }
+                            },
                         };
                         providers_map
                             .entry(normalized.clone())
@@ -125,9 +132,23 @@ impl CloudCheck {
                     }
 
                     for domain in provider.domains {
-                        let normalized = match radix.get(&domain) {
+                        // Clean domain: strip comments (everything after #) and trim whitespace
+                        let cleaned_domain = domain.split('#').next().unwrap_or(&domain).trim();
+
+                        if cleaned_domain.is_empty() {
+                            continue;
+                        }
+
+                        let normalized = match radix.get(cleaned_domain) {
                             Some(n) => n,
-                            None => radix.insert(&domain).unwrap(),
+                            None => match radix.insert(cleaned_domain) {
+                                Ok(Some(n)) => n,
+                                Ok(None) => continue,
+                                Err(e) => {
+                                    eprintln!("Error inserting domain '{}': {}", cleaned_domain, e);
+                                    continue;
+                                }
+                            },
                         };
                         providers_map
                             .entry(normalized.clone())