Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix CNAME record not added when query A #403

Merged
merged 1 commit into from
Oct 8, 2024
Merged

🐛 Fix CNAME record not added when query A #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/dns_conf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,7 @@ impl RuntimeConfig {

#[inline]
pub fn local_ttl(&self) -> u64 {
self.local_ttl
.unwrap_or_else(|| self.rr_ttl_min().unwrap_or_default())
self.local_ttl.or_else(|| self.rr_ttl_min()).unwrap_or(10)
}

/// Maximum number of IPs returned to the client|8|number of IPs, 1~16
Expand Down
33 changes: 19 additions & 14 deletions src/dns_mw_cname.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,39 @@ impl Middleware<DnsContext, DnsRequest, DnsResponse, DnsError> for DnsCNameMiddl

match cname {
Some(mut cname) => {
if req.query().query_type() == RecordType::CNAME {
let local_ttl = ctx.cfg().local_ttl();
if !cname.is_fqdn() {
cname.set_fqdn(true);
}

let local_ttl = ctx.cfg().local_ttl();

let cname_record = Record::from_rdata(
req.query().original().name().clone(),
local_ttl as u32,
RData::CNAME(CNAME(cname.clone())),
);

if req.query().query_type() == RecordType::CNAME {
let query = req.query().original().clone();
let name = query.name().to_owned();
let valid_until = Instant::now() + Duration::from_secs(local_ttl);

let records = vec![Record::from_rdata(
name,
local_ttl as u32,
RData::CNAME(CNAME(cname.clone())),
)];

Ok(DnsResponse::new_with_deadline(query, records, valid_until))
Ok(DnsResponse::new_with_deadline(
query,
vec![cname_record],
valid_until,
))
} else {
let mut ctx =
DnsContext::new(&cname, ctx.cfg().clone(), ctx.server_opts().clone());

if !cname.is_fqdn() {
cname.set_fqdn(true);
}
let new_req = req.with_cname(cname);
let new_req = req.with_cname(cname.clone());
match next.run(&mut ctx, &new_req).await {
Ok(mut lookup) => {
std::mem::swap(
lookup.queries_mut(),
&mut vec![req.query().original().clone()],
);
lookup.answers_mut().insert(0, cname_record);
Ok(lookup)
}
Err(err) => Err(err),
Expand Down