From 887c48cee85fe7cc27f7600840722137b6079d06 Mon Sep 17 00:00:00 2001 From: Stanislav Chzhen Date: Tue, 15 Aug 2023 14:29:08 +0300 Subject: [PATCH] Pull request 1961: 6106-fix-dns-filter Updates #6106. Squashed commit of the following: commit e06ae2195c9231901dda76b7afc00f45021ee369 Author: Stanislav Chzhen Date: Tue Aug 15 14:13:15 2023 +0300 dnsforward: add docs commit c9d77fa04b4d358593e492a9abdca94053ace631 Author: Stanislav Chzhen Date: Tue Aug 15 14:02:32 2023 +0300 dnsforward: fix dns filter --- internal/dnsforward/http.go | 3 ++- internal/dnsforward/upstreams.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/dnsforward/http.go b/internal/dnsforward/http.go index 49fc040d..a6f21b5e 100644 --- a/internal/dnsforward/http.go +++ b/internal/dnsforward/http.go @@ -667,7 +667,8 @@ func (s *Server) parseUpstreamLine( PreferIPv6: opts.PreferIPv6, } - if s.dnsFilter.EtcHosts != nil { + // dnsFilter can be nil during application update. + if s.dnsFilter != nil && s.dnsFilter.EtcHosts != nil { resolved := s.resolveUpstreamHost(extractUpstreamHost(upstreamAddr)) sortNetIPAddrs(resolved, opts.PreferIPv6) opts.ServerIPAddrs = resolved diff --git a/internal/dnsforward/upstreams.go b/internal/dnsforward/upstreams.go index df4475a9..004d5e40 100644 --- a/internal/dnsforward/upstreams.go +++ b/internal/dnsforward/upstreams.go @@ -94,7 +94,8 @@ func (s *Server) prepareUpstreamConfig( uc.Upstreams = defaultUpstreamConfig.Upstreams } - if s.dnsFilter.EtcHosts != nil { + // dnsFilter can be nil during application update. + if s.dnsFilter != nil && s.dnsFilter.EtcHosts != nil { err = s.replaceUpstreamsWithHosts(uc, opts) if err != nil { return nil, fmt.Errorf("resolving upstreams with hosts: %w", err)