From b6c866e3649b25362c529af66ddda746ef4fc562 Mon Sep 17 00:00:00 2001 From: Alex Simenduev Date: Thu, 27 Apr 2023 22:43:04 +0300 Subject: [PATCH] trimDomain: ensure domain trimmed without modyfing original domains --- agent/dns.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/dns.go b/agent/dns.go index 1643929331af8..5804dc97dd8ef 100644 --- a/agent/dns.go +++ b/agent/dns.go @@ -1048,14 +1048,14 @@ func (d *DNSServer) dispatch(remoteAddr net.Addr, req, resp *dns.Msg, maxRecursi } func (d *DNSServer) trimDomain(query string) string { - longer := "." + strings.TrimLeft(d.domain, ".") - shorter := "." + strings.TrimLeft(d.altDomain, ".") + longer := d.domain + shorter := d.altDomain if len(shorter) > len(longer) { longer, shorter = shorter, longer } - if strings.HasSuffix(query, longer) { + if strings.HasSuffix(query, "."+strings.TrimLeft(longer, ".")) { return strings.TrimSuffix(query, longer) } return strings.TrimSuffix(query, shorter)