recursor_test: port to Catalog, and enable full recurse test
the SOA logic requires iana-servers and example.com to properly be in two separate zones, hence a Catalog
This commit is contained in:
parent
50e0653373
commit
2aa98d0799
|
|
@ -12,6 +12,7 @@ use std::future::Future;
|
|||
use std::net::*;
|
||||
use std::pin::Pin;
|
||||
use std::str::FromStr as _;
|
||||
use std::sync::Arc;
|
||||
use std::time::Instant;
|
||||
|
||||
use futures::stream::{self, Stream};
|
||||
|
|
@ -19,7 +20,7 @@ use futures::future;
|
|||
use futures::StreamExt as _;
|
||||
use futures::executor::block_on;
|
||||
|
||||
use hickory_client::op::{Message, MessageType, ResponseCode, Query};
|
||||
use hickory_client::op::{Message, MessageType, Query};
|
||||
use hickory_client::rr::{rdata, Name, RData, Record, RecordType};
|
||||
use hickory_integration::mock_client::*;
|
||||
use hickory_proto::DnsHandle;
|
||||
|
|
@ -31,7 +32,7 @@ use hickory_recursor::Recursor;
|
|||
use hickory_resolver::config::*;
|
||||
use hickory_resolver::name_server::ConnectionProvider;
|
||||
use hickory_resolver::name_server::{NameServer, NameServerPool};
|
||||
use hickory_server::authority::{AuthLookup, Authority, LookupError, LookupOptions, ZoneType};
|
||||
use hickory_server::authority::{Catalog, LookupError, LookupOptions, ZoneType};
|
||||
use hickory_server::store::in_memory::InMemoryAuthority;
|
||||
|
||||
|
||||
|
|
@ -81,12 +82,20 @@ const ZONE_IANA: &str = r#"
|
|||
60) ; MINIMUM
|
||||
|
||||
a.iana-servers.net. A 10.0.0.3
|
||||
"#;
|
||||
|
||||
const ZONE_EXAMPLE_COM: &str = r#"
|
||||
@ IN SOA a.iana-servers.net. noc.dns.icann.org. (
|
||||
20 ; SERIAL
|
||||
7200 ; REFRESH
|
||||
600 ; RETRY
|
||||
3600000; EXPIRE
|
||||
60) ; MINIMUM
|
||||
|
||||
example.com. A 10.0.100.1
|
||||
www.example.com. A 10.0.100.1
|
||||
"#;
|
||||
|
||||
// type MockedNameServer<O> = NameServer<HardcodedConnProvider>;
|
||||
type HardcodedNameServer = NameServer<HardcodedConnProvider>;
|
||||
|
||||
/// A ConnectionProvider which includes hard-coded DNS test data shared across tests.
|
||||
|
|
@ -122,46 +131,52 @@ impl DnsHandle for HardcodedDnsHandle {
|
|||
let query = query.clone();
|
||||
stream::once(async move {
|
||||
println!("HardcodedDnsHandle: fielding query");
|
||||
let authority = make_authority_for(addr);
|
||||
let lookup = authority.lookup(
|
||||
&LowerName::new(query.name()),
|
||||
query.query_type(),
|
||||
LookupOptions::default(),
|
||||
).await;
|
||||
println!("HardcodeDnsHandle: result {:?}", lookup);
|
||||
let mut response = Message::new();
|
||||
response.add_query(query.clone());
|
||||
response.set_message_type(MessageType::Response);
|
||||
match lookup {
|
||||
Ok(AuthLookup::Records { answers, additionals }) => {
|
||||
response.add_answers(answers.iter().cloned());
|
||||
response.add_additionals(additionals.iter().flatten().cloned());
|
||||
},
|
||||
Ok(AuthLookup::SOA(name_servers)) => {
|
||||
response.add_name_servers(name_servers.iter().cloned());
|
||||
},
|
||||
Err(LookupError::ResponseCode(code)) => {
|
||||
response.set_response_code(code);
|
||||
},
|
||||
Err(LookupError::NameExists) => {
|
||||
if !query.query_type().is_soa() {
|
||||
println!("nx_domain and not soa, lookup: {:?} SOA", authority.origin());
|
||||
let soa_lookup = authority.lookup(
|
||||
// &LowerName::new(&Name::from_str("iana-servers.net.").unwrap()),
|
||||
authority.origin(),
|
||||
// RecordType::ANY,
|
||||
RecordType::SOA,
|
||||
LookupOptions::default(),
|
||||
).await;
|
||||
println!("HardcodeDnsHandle: revised result {:?}", lookup);
|
||||
if let Ok(r) = soa_lookup {
|
||||
response.add_name_servers(r.iter().cloned());
|
||||
let query_lower = LowerName::new(query.name());
|
||||
let catalog = make_catalog_for(addr);
|
||||
let authority = catalog.find(&query_lower);
|
||||
if let Some(authority) = authority {
|
||||
let lookup = authority.lookup(
|
||||
&query_lower,
|
||||
query.query_type(),
|
||||
LookupOptions::default(),
|
||||
).await;
|
||||
// println!("HardcodeDnsHandle: result {:?}", lookup);
|
||||
match lookup {
|
||||
Ok(mut lookup_obj) => {
|
||||
response.add_answers(lookup_obj.iter().cloned());
|
||||
if let Some(additionals_obj) = lookup_obj.take_additionals() {
|
||||
response.add_additionals(additionals_obj.iter().cloned());
|
||||
}
|
||||
}
|
||||
},
|
||||
Err(LookupError::ResponseCode(code)) => {
|
||||
response.set_response_code(code);
|
||||
},
|
||||
Err(LookupError::NameExists) => {
|
||||
if !query.query_type().is_soa() {
|
||||
println!("nx_domain and not soa, lookup: {:?} SOA", authority.origin());
|
||||
let soa_lookup = authority.lookup(
|
||||
authority.origin(),
|
||||
RecordType::SOA,
|
||||
LookupOptions::default(),
|
||||
).await;
|
||||
// println!("HardcodeDnsHandle: revised result {:?}", lookup);
|
||||
if let Ok(r) = soa_lookup {
|
||||
response.add_name_servers(r.iter().cloned());
|
||||
}
|
||||
}
|
||||
},
|
||||
_ => (),
|
||||
}
|
||||
// Err(LookupError::NameExists) => (),
|
||||
_ => panic!("unexpected result {:?}", lookup),
|
||||
}
|
||||
// response.set_header(*response.header().clone()
|
||||
// .set_query_count(response.queries().len() as _)
|
||||
// .set_answer_count(response.answers().len() as _)
|
||||
// .set_name_server_count(response.name_servers().len() as _)
|
||||
// .set_additional_count(response.additionals().len() as _)
|
||||
// );
|
||||
let resp = DnsResponse::from_message(response).unwrap();
|
||||
Ok(resp)
|
||||
})
|
||||
|
|
@ -171,22 +186,32 @@ impl DnsHandle for HardcodedDnsHandle {
|
|||
}
|
||||
}
|
||||
|
||||
fn make_authority_for(nameserver: SocketAddr) -> InMemoryAuthority {
|
||||
println!("retrieving authority for {:?}...", nameserver);
|
||||
let (zone_text, name) = match nameserver {
|
||||
s if s == SocketAddr::new(NS_ROOT, 53) => {
|
||||
(ZONE_ROOT, ".")
|
||||
},
|
||||
s if s == SocketAddr::new(NS_TLDS, 53) => {
|
||||
(ZONE_TLDS, ".")
|
||||
},
|
||||
s if s == SocketAddr::new(NS_IANA, 53) => {
|
||||
(ZONE_IANA, "iana-servers.net.")
|
||||
},
|
||||
|
||||
fn make_catalog_for(nameserver: SocketAddr) -> Catalog {
|
||||
println!("retrieving catalog for {:?}...", nameserver);
|
||||
let zones = match nameserver {
|
||||
s if s == SocketAddr::new(NS_ROOT, 53) => vec![
|
||||
(".", ZONE_ROOT),
|
||||
],
|
||||
s if s == SocketAddr::new(NS_TLDS, 53) => vec![
|
||||
(".", ZONE_TLDS),
|
||||
],
|
||||
s if s == SocketAddr::new(NS_IANA, 53) => vec![
|
||||
("iana-servers.net.", ZONE_IANA),
|
||||
("example.com.", ZONE_EXAMPLE_COM),
|
||||
],
|
||||
ns => panic!("unexpected nameserver {:?}", ns),
|
||||
};
|
||||
let (origin, records) = Parser::new(zone_text, None, Some(Name::from_str(name).unwrap())).parse().unwrap();
|
||||
InMemoryAuthority::new(origin, records, ZoneType::Primary, false /* allow_axfr */).unwrap()
|
||||
let mut catalog = Catalog::new();
|
||||
for (name, zone_text) in zones {
|
||||
let (origin, records) = Parser::new(zone_text, None, Some(Name::from_str(name).unwrap())).parse().unwrap();
|
||||
let authority = InMemoryAuthority::new(origin.clone(), records, ZoneType::Primary, false /* allow_axfr */).unwrap();
|
||||
catalog.upsert(
|
||||
LowerName::new(&origin),
|
||||
Box::new(Arc::new(authority)),
|
||||
)
|
||||
}
|
||||
catalog
|
||||
}
|
||||
|
||||
pub fn logger(level: &str) {
|
||||
|
|
@ -200,10 +225,10 @@ pub fn logger(level: &str) {
|
|||
|
||||
let formatter = tracing_subscriber::fmt::layer().compact();
|
||||
|
||||
tracing_subscriber::registry()
|
||||
let _ = tracing_subscriber::registry()
|
||||
.with(formatter)
|
||||
.with(subscriber)
|
||||
.init();
|
||||
.try_init();
|
||||
}
|
||||
|
||||
fn mock_nameserver(addr: IpAddr) -> HardcodedNameServer {
|
||||
|
|
@ -322,27 +347,27 @@ fn test_v4_domain() {
|
|||
assert_eq!(&*lookup.records().to_vec(), &[expected_record]);
|
||||
}
|
||||
|
||||
// /// Query a top-level domain for a record several layers deep.
|
||||
// /// `.` (NS) -> `com.` (NS) -> `example.com.` (NS) -> `www.example.com.` (NS, NXDomain), `www.example.com` (A)
|
||||
// #[test]
|
||||
// fn test_recurse() {
|
||||
// logger("DEBUG");
|
||||
//
|
||||
// let query = Query::query(Name::from_str("www.example.com.").unwrap(), RecordType::A);
|
||||
// let expected_record = v4_record(
|
||||
// Name::from_str("www.example.com.").unwrap(),
|
||||
// Ipv4Addr::new(10, 0, 100, 1),
|
||||
// );
|
||||
//
|
||||
// let roots = NameServerPool::from_nameservers(
|
||||
// Default::default(),
|
||||
// vec![mock_nameserver(NS_ROOT)],
|
||||
// vec![],
|
||||
// );
|
||||
// let recursor = Recursor::new_with_pool(roots, 1024, 1048576).unwrap();
|
||||
//
|
||||
// let now = Instant::now();
|
||||
// let lookup = block_on(recursor.resolve(query, now)).unwrap();
|
||||
//
|
||||
// assert_eq!(&*lookup.records().to_vec(), &[expected_record]);
|
||||
// }
|
||||
/// Query a top-level domain for a record several layers deep.
|
||||
/// `.` (NS) -> `com.` (NS) -> `example.com.` (NS) -> `www.example.com.` (NS, NXDomain), `www.example.com` (A)
|
||||
#[test]
|
||||
fn test_recurse() {
|
||||
logger("DEBUG");
|
||||
|
||||
let query = Query::query(Name::from_str("www.example.com.").unwrap(), RecordType::A);
|
||||
let expected_record = v4_record(
|
||||
Name::from_str("www.example.com.").unwrap(),
|
||||
Ipv4Addr::new(10, 0, 100, 1),
|
||||
);
|
||||
|
||||
let roots = NameServerPool::from_nameservers(
|
||||
Default::default(),
|
||||
vec![mock_nameserver(NS_ROOT)],
|
||||
vec![],
|
||||
);
|
||||
let recursor = Recursor::new_with_pool(roots, 1024, 1048576).unwrap();
|
||||
|
||||
let now = Instant::now();
|
||||
let lookup = block_on(recursor.resolve(query, now)).unwrap();
|
||||
|
||||
assert_eq!(&*lookup.records().to_vec(), &[expected_record]);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user