always use FQDN domain when using hickory resolver

bytedance · Feb 8, 2025 · b407c3c · b407c3c
1 parent d04fbc1
commit b407c3c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/g3bench/src/target/dns/mod.rs b/g3bench/src/target/dns/mod.rs
@@ -84,17 +84,19 @@ impl DnsRequest {
         let parts = s.split(',').collect::<Vec<&str>>();
         match parts.len() {
             1 => {
-                let name = Name::from_utf8(parts[0])
+                let mut name = Name::from_utf8(parts[0])
                     .map_err(|e| anyhow!("invalid domain name {}: {e}", parts[0]))?;
+                name.set_fqdn(true);
                 Ok(DnsRequest {
                     name,
                     class: DNSClass::IN,
                     rtype: RecordType::A,
                 })
             }
             2 => {
-                let name = Name::from_utf8(parts[0])
+                let mut name = Name::from_utf8(parts[0])
                     .map_err(|e| anyhow!("invalid domain name: {}: {e}", parts[0]))?;
+                name.set_fqdn(true);
                 let rtype = RecordType::from_str(parts[1])
                     .map_err(|e| anyhow!("invalid record type {}: {e}", parts[1]))?;
                 Ok(DnsRequest {
@@ -104,8 +106,9 @@ impl DnsRequest {
                 })
             }
             3 => {
-                let name = Name::from_utf8(parts[0])
+                let mut name = Name::from_utf8(parts[0])
                     .map_err(|e| anyhow!("invalid domain name {}: {e}", parts[0]))?;
+                name.set_fqdn(true);
                 let class = DNSClass::from_str(parts[1])
                     .map_err(|e| anyhow!("invalid class type {}: {e}", parts[1]))?;
                 let rtype = RecordType::from_str(parts[2])

diff --git a/lib/g3-resolver/src/driver/hickory/client.rs b/lib/g3-resolver/src/driver/hickory/client.rs
@@ -152,6 +152,8 @@ impl HickoryClientJob {
                 ResolveDriverError::BadName.into(),
             );
         };
+        // always use FQDN format such like "www.example.com."
+        name.set_fqdn(true);
 
         loop {
             match async_client