Merge in DNS/adguard-home from 6132-fix-hosts-startup to master
Updates #6132.
Squashed commit of the following:
commit 7495e62531f7c0bd775969195da1cbd446f018f7
Merge: c5d99bcef 4b04c620f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 18:50:14 2023 +0300
Merge branch 'master' into 6132-fix-hosts-startup
commit c5d99bcefa870ba0d2543158e97b3001f65be459
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 18:01:17 2023 +0300
filtering: fix hosts results
commit b7acf266ad73520a0b795c495c8fc75c547ed993
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 17:34:43 2023 +0300
all: revert changes of log of changes
commit 293240d5b1277cebd26732c535ad004af76df532
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 17:30:07 2023 +0300
aghnet: imp logs
commit d1f7d73477a1a8fed5b1fb8b7f42d1c92acd919c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 17:19:54 2023 +0300
aghnet: impl handle set
commit b643793c537fcdd4ba00bae4d7207cb4f1d60d80
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 23 17:00:05 2023 +0300
aghnet: fix initial refresh
134 lines
3.3 KiB
Go
134 lines
3.3 KiB
Go
package filtering
|
|
|
|
import (
|
|
"github.com/AdguardTeam/golibs/hostsfile"
|
|
"github.com/AdguardTeam/urlfilter"
|
|
"github.com/AdguardTeam/urlfilter/rules"
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// DNSRewriteResult is the result of application of $dnsrewrite rules.
|
|
type DNSRewriteResult struct {
|
|
Response DNSRewriteResultResponse `json:",omitempty"`
|
|
RCode rules.RCode `json:",omitempty"`
|
|
}
|
|
|
|
// DNSRewriteResultResponse is the collection of DNS response records
|
|
// the server returns.
|
|
type DNSRewriteResultResponse map[rules.RRType][]rules.RRValue
|
|
|
|
// processDNSRewrites processes DNS rewrite rules in dnsr. It returns an empty
|
|
// result if dnsr is empty. Otherwise, the result will have either CanonName or
|
|
// DNSRewriteResult set. dnsr is expected to be non-empty.
|
|
func (d *DNSFilter) processDNSRewrites(dnsr []*rules.NetworkRule) (res Result) {
|
|
var rules []*ResultRule
|
|
dnsrr := &DNSRewriteResult{
|
|
Response: DNSRewriteResultResponse{},
|
|
}
|
|
|
|
for _, nr := range dnsr {
|
|
dr := nr.DNSRewrite
|
|
if dr.NewCNAME != "" {
|
|
// NewCNAME rules have a higher priority than other rules.
|
|
rules = []*ResultRule{{
|
|
FilterListID: int64(nr.GetFilterListID()),
|
|
Text: nr.RuleText,
|
|
}}
|
|
|
|
return Result{
|
|
Rules: rules,
|
|
Reason: RewrittenRule,
|
|
CanonName: dr.NewCNAME,
|
|
}
|
|
}
|
|
|
|
switch dr.RCode {
|
|
case dns.RcodeSuccess:
|
|
dnsrr.RCode = dr.RCode
|
|
dnsrr.Response[dr.RRType] = append(dnsrr.Response[dr.RRType], dr.Value)
|
|
rules = append(rules, &ResultRule{
|
|
FilterListID: int64(nr.GetFilterListID()),
|
|
Text: nr.RuleText,
|
|
})
|
|
default:
|
|
// RcodeRefused and other such codes have higher priority. Return
|
|
// immediately.
|
|
rules = []*ResultRule{{
|
|
FilterListID: int64(nr.GetFilterListID()),
|
|
Text: nr.RuleText,
|
|
}}
|
|
dnsrr = &DNSRewriteResult{
|
|
RCode: dr.RCode,
|
|
}
|
|
|
|
return Result{
|
|
DNSRewriteResult: dnsrr,
|
|
Rules: rules,
|
|
Reason: RewrittenRule,
|
|
}
|
|
}
|
|
}
|
|
|
|
return Result{
|
|
DNSRewriteResult: dnsrr,
|
|
Rules: rules,
|
|
Reason: RewrittenRule,
|
|
}
|
|
}
|
|
|
|
// processDNSResultRewrites returns an empty Result if there are no dnsrewrite
|
|
// rules in dnsres. Otherwise, it returns the processed Result.
|
|
func (d *DNSFilter) processDNSResultRewrites(
|
|
dnsres *urlfilter.DNSResult,
|
|
host string,
|
|
) (dnsRWRes Result) {
|
|
dnsr := dnsres.DNSRewrites()
|
|
if len(dnsr) == 0 {
|
|
return Result{}
|
|
}
|
|
|
|
res := d.processDNSRewrites(dnsr)
|
|
if res.Reason == RewrittenRule && res.CanonName == host {
|
|
// A rewrite of a host to itself. Go on and try matching other things.
|
|
return Result{}
|
|
}
|
|
|
|
return res
|
|
}
|
|
|
|
// appendRewriteResultFromHost appends the rewrite result from rec to vals and
|
|
// resRules.
|
|
func appendRewriteResultFromHost(
|
|
vals []rules.RRValue,
|
|
resRules []*ResultRule,
|
|
rec *hostsfile.Record,
|
|
qtype uint16,
|
|
) (updatedVals []rules.RRValue, updatedRules []*ResultRule) {
|
|
switch qtype {
|
|
case dns.TypeA:
|
|
if !rec.Addr.Is4() {
|
|
return vals, resRules
|
|
}
|
|
|
|
vals = append(vals, rec.Addr)
|
|
case dns.TypeAAAA:
|
|
if !rec.Addr.Is6() {
|
|
return vals, resRules
|
|
}
|
|
|
|
vals = append(vals, rec.Addr)
|
|
case dns.TypePTR:
|
|
for _, name := range rec.Names {
|
|
vals = append(vals, name)
|
|
}
|
|
}
|
|
|
|
recText, _ := rec.MarshalText()
|
|
resRules = append(resRules, &ResultRule{
|
|
FilterListID: SysHostsListID,
|
|
Text: string(recText),
|
|
})
|
|
|
|
return vals, resRules
|
|
}
|