Sweetbread/Alfis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed DNS-records search.

Browse Source
This commit is contained in:
Revertron
2021-02-21 12:29:09 +01:00
parent 0847b7b8a6
commit 38feb11cff
1 changed files with 86 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blockchain/filter.rs
+86 -8
View File
@@ -16,29 +16,107 @@ impl BlockchainFilter {
impl DnsFilter for BlockchainFilter { impl DnsFilter for BlockchainFilter {
fn lookup(&self, qname: &str, qtype: QueryType) -> Option<DnsPacket> { fn lookup(&self, qname: &str, qtype: QueryType) -> Option<DnsPacket> {
let data = self.context.lock().unwrap().blockchain.get_domain_info(qname); let mut search;
let mut subdomain;
let parts: Vec<&str> = qname.rsplitn(3, ".").collect();
match parts.len() {
1 => { return None; }
2 => {
search = format!("{}.{}", parts[1], parts[0]);
subdomain = String::new();
}
_ => {
search = format!("{}.{}", parts[1], parts[0]);
subdomain = String::from(parts[2]);
}
}
debug!("Searching domain {} and record {}", &search, &subdomain);
let data = self.context.lock().unwrap().blockchain.get_domain_info(&search);
match data { match data {
None => { debug!("Not found data for domain {}", &qname); } None => { debug!("Not found data for domain {}", &search); }
Some(data) => { Some(data) => {
info!("Found data for domain {}", &qname); info!("Found data for domain {}", &search);
let records: Vec<DnsRecord> = match serde_json::from_str(&data) { let mut records: Vec<DnsRecord> = match serde_json::from_str(&data) {
Err(_) => { return None; } Err(_) => { return None; }
Ok(records) => { records } Ok(records) => { records }
}; };
let mut answers: Vec<DnsRecord> = Vec::new(); let mut answers: Vec<DnsRecord> = Vec::new();
for mut record in records { for mut record in records.iter_mut() {
if record.get_querytype() == qtype { if record.get_querytype() == qtype {
match &mut record { match &mut record {
// TODO make it for all types of records DnsRecord::A { domain, .. }
DnsRecord::A { domain, .. } | DnsRecord::AAAA { domain, .. } if domain == "@" => { | DnsRecord::AAAA { domain, .. }
| DnsRecord::NS { domain, .. }
| DnsRecord::CNAME { domain, .. }
| DnsRecord::SRV { domain, .. }
| DnsRecord::MX { domain, .. }
| DnsRecord::UNKNOWN { domain, .. }
| DnsRecord::SOA { domain, .. }
| DnsRecord::TXT { domain, .. } if domain == "@" => {
*domain = String::from(qname); *domain = String::from(qname);
} }
_ => () _ => ()
} }
answers.push(record); match record.get_domain() {
None => {}
Some(domain) => {
if domain == search {
answers.push(record.clone());
} else if domain == subdomain {
match &mut record {
DnsRecord::A { domain, .. }
| DnsRecord::AAAA { domain, .. }
| DnsRecord::NS { domain, .. }
| DnsRecord::CNAME { domain, .. }
| DnsRecord::SRV { domain, .. }
| DnsRecord::MX { domain, .. }
| DnsRecord::UNKNOWN { domain, .. }
| DnsRecord::SOA { domain, .. }
| DnsRecord::TXT { domain, .. } => {
*domain = String::from(qname);
}
_ => ()
}
answers.push(record.clone());
} }
} }
}
}
}
if answers.is_empty() {
// If there are no records found we search for *.domain.ltd record
for mut record in records {
if record.get_querytype() == qtype {
match record.get_domain() {
None => {}
Some(domain) => {
if domain == search {
answers.push(record.clone());
} else if domain == "*" {
match &mut record {
DnsRecord::A { domain, .. }
| DnsRecord::AAAA { domain, .. }
| DnsRecord::NS { domain, .. }
| DnsRecord::CNAME { domain, .. }
| DnsRecord::SRV { domain, .. }
| DnsRecord::MX { domain, .. }
| DnsRecord::UNKNOWN { domain, .. }
| DnsRecord::SOA { domain, .. }
| DnsRecord::TXT { domain, .. } => {
*domain = String::from(qname);
}
_ => ()
}
answers.push(record.clone());
}
}
}
}
}
}
if !answers.is_empty() { if !answers.is_empty() {
// Create DnsPacket // Create DnsPacket
let mut packet = DnsPacket::new(); let mut packet = DnsPacket::new();