Fix IPv6 format for DNS address received from android (#1350)

this adds the address in the expected format in Go [ipv6]:port
netbirdio · Dec 1, 2023 · b8c46e2 · b8c46e2
1 parent 7a46a63
commit b8c46e2
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/client/internal/dns/server.go b/client/internal/dns/server.go
@@ -488,7 +488,18 @@ func (s *DefaultServer) addHostRootZone() {
 	handler := newUpstreamResolver(s.ctx)
 	handler.upstreamServers = make([]string, len(s.hostsDnsList))
 	for n, ua := range s.hostsDnsList {
-		handler.upstreamServers[n] = fmt.Sprintf("%s:53", ua)
+		a, err := netip.ParseAddr(ua)
+		if err != nil {
+			log.Errorf("invalid upstream IP address: %s, error: %s", ua, err)
+			continue
+		}
+
+		ipString := ua
+		if !a.Is4() {
+			ipString = fmt.Sprintf("[%s]", ua)
+		}
+
+		handler.upstreamServers[n] = fmt.Sprintf("%s:53", ipString)
 	}
 	handler.deactivate = func() {}
 	handler.reactivate = func() {}