vrr/cheburcheck
2
0
Fork 0
mirror of https://github.com/LowderPlay/cheburcheck.git synced 2026-10-19 07:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: bump hickory resolver

Browse source
This commit is contained in:
Lowder 2026-09-07 17:50:39 +05:00
parent 04275dbb36
commit 6a1cf6b82b
No known key found for this signature in database
GPG key ID: E63B80B1F1DC187C
4 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Cargo.lock generated
View file

Binary file not shown.

2
querying/Cargo.toml
View file

@ -13,7 +13,7 @@ reqwest = { workspace = true }
csv = "1.4.0" csv = "1.4.0"
maxminddb = "0.27.3" maxminddb = "0.27.3"
log = { workspace = true } log = { workspace = true }
hickory-resolver = { version = "0.26.0-beta.3", features = ["tokio", "webpki-roots", "https-ring"] } hickory-resolver = { version = "0.26.0", features = ["tokio", "webpki-roots", "https-ring"] }
thiserror = "2.0.18" thiserror = "2.0.18"
url = "2.5.8" url = "2.5.8"
indicatif = "0.18.4" indicatif = "0.18.4"

29
querying/src/lists.rs
View file

@ -64,14 +64,14 @@ impl CdnList {
let record: NetworkRecord = result?; let record: NetworkRecord = result?;
trie.insert(record.cidr, record); trie.insert(record.cidr, record);
} }
let (v4, v6) = trie.ip_count(); let count = trie.ip_count();
info!("ip count: v4={}, v6={}", v4, v6); info!("ip count: v4={}, v6={:?}", count.ipv4, count.ipv6);
self.trie = trie; self.trie = trie;
Ok(()) Ok(())
} }
pub fn v4_count(&self) -> u32 { pub fn v4_count(&self) -> u64 {
self.trie.ip_count().0 self.trie.ip_count().ipv4
} }
pub fn contains(&self, ip: &IpAddr) -> Option<NetworkRecord> { pub fn contains(&self, ip: &IpAddr) -> Option<NetworkRecord> {
@ -141,8 +141,8 @@ impl RuBlacklist {
IpNet::from_str(&net).map_err(|e| Error::new(io::ErrorKind::InvalidData, e))?; IpNet::from_str(&net).map_err(|e| Error::new(io::ErrorKind::InvalidData, e))?;
ip_trie.insert(net, ()); ip_trie.insert(net, ());
} }
let (v4, v6) = ip_trie.ip_count(); let count = ip_trie.ip_count();
info!("ip count: v4={}, v6={}", v4, v6); info!("ip count: v4={}, v6={:?}", count.ipv4, count.ipv6);
self.ip_trie = ip_trie; self.ip_trie = ip_trie;
let mut blocked_domains = Vec::new(); let mut blocked_domains = Vec::new();
@ -160,8 +160,8 @@ impl RuBlacklist {
Ok(()) Ok(())
} }
pub fn v4_count(&self) -> u32 { pub fn v4_count(&self) -> u64 {
self.ip_trie.ip_count().0 self.ip_trie.ip_count().ipv4
} }
pub fn contains_ip(&self, ip: &IpAddr) -> Option<IpNet> { pub fn contains_ip(&self, ip: &IpAddr) -> Option<IpNet> {
@ -219,9 +219,20 @@ impl Updatable for RuBlacklist {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::RuBlacklist; use super::{CdnList, RuBlacklist};
use std::io::Cursor; use std::io::Cursor;
#[test]
fn ipv4_counts_can_represent_the_entire_address_space() {
let cdn = CdnList::load(Cursor::new("provider,cidr,region\nexample,0.0.0.0/0,\n")).unwrap();
let blacklist =
RuBlacklist::load(Cursor::new("0.0.0.0/0\n"), Cursor::new(""), Cursor::new(""))
.unwrap();
assert_eq!(cdn.v4_count(), 1_u64 << 32);
assert_eq!(blacklist.v4_count(), 1_u64 << 32);
}
#[test] #[test]
fn domain_lookup_matches_subdomains_on_label_boundaries() { fn domain_lookup_matches_subdomains_on_label_boundaries() {
let list = RuBlacklist::load( let list = RuBlacklist::load(

2
querying/src/resolver.rs
View file

@ -77,7 +77,7 @@ impl Resolver {
.map_err(map_resolve_error)? .map_err(map_resolve_error)?
.answers() .answers()
.iter() .iter()
.filter_map(|record| match record.data() { .filter_map(|record| match &record.data {
RData::PTR(ptr) => Some(ptr.to_string().trim_end_matches('.').to_string()), RData::PTR(ptr) => Some(ptr.to_string().trim_end_matches('.').to_string()),
_ => None, _ => None,
}) })