asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: prioritize DNS resolution over hostname -f for hostname lookup

Browse Source 
Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-08-26 21:40:58 -03:00
parent 23906d4796
commit fbffd010be
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/meta_plugin/hostname.rs
View File

@@ -54,21 +54,7 @@ impl HostnameMetaPlugin {
Err(_) => return "unknown".to_string(), Err(_) => return "unknown".to_string(),
}; };
// Try to get the FQDN using the system's hostname resolution // First try DNS resolution for both IPv4 and IPv6 addresses
// This should give us the full hostname if configured
if let Ok(full_hostname) = std::process::Command::new("hostname")
.arg("-f")
.output()
{
if full_hostname.status.success() {
let full_hostname_str = String::from_utf8_lossy(&full_hostname.stdout).trim().to_string();
if !full_hostname_str.is_empty() && full_hostname_str != short_hostname {
return full_hostname_str;
}
}
}
// Fallback: try DNS resolution for both IPv4 and IPv6 addresses
// lookup_host should handle both A and AAAA records // lookup_host should handle both A and AAAA records
if let Ok(addrs) = dns_lookup::lookup_host(&short_hostname) { if let Ok(addrs) = dns_lookup::lookup_host(&short_hostname) {
// Try each address (both IPv4 and IPv6) // Try each address (both IPv4 and IPv6)
@@ -106,6 +92,20 @@ impl HostnameMetaPlugin {
} }
} }
// Fallback: try to get the FQDN using the system's hostname resolution
// This should give us the full hostname if configured
if let Ok(full_hostname) = std::process::Command::new("hostname")
.arg("-f")
.output()
{
if full_hostname.status.success() {
let full_hostname_str = String::from_utf8_lossy(&full_hostname.stdout).trim().to_string();
if !full_hostname_str.is_empty() && full_hostname_str != short_hostname {
return full_hostname_str;
}
}
}
// Final fallback: return the short hostname // Final fallback: return the short hostname
short_hostname short_hostname
} }