Skip to content

fix: domain name comparison in should_forward_by_query #1953

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

Merged
merged 1 commit into from
May 12, 2025
Merged

fix: domain name comparison in should_forward_by_query #1953

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
8 changes: 7 additions & 1 deletion crates/shadowsocks-service/src/local/dns/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,13 +594,19 @@ fn should_forward_by_query(context: &ServiceContext, balancer: &PingBalancer, qu
if let ServerAddr::DomainName(dn, ..) = svr_cfg.addr() {
// Convert domain name to `Name`
// Ignore it if error occurs
if let Ok(name) = Name::from_str(dn) {
if let Ok(mut name) = Name::from_str(dn) {
// cmp will handle FQDN in case insensitive way
if let Ordering::Equal = query.name().cmp(&name) {
// It seems that query is for this server, just bypass it to local resolver
trace!("DNS querying name {} of server {:?}", query.name(), svr_cfg);
return Some(false);
}
// test it again with fqdn set
name.set_fqdn(true);
if let Ordering::Equal = query.name().cmp(&name) {
trace!("DNS querying name {} of server {:?}", query.name(), svr_cfg);
return Some(false);
}
}
}
}
Expand Down
Loading