mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2026-10-20 18:52:42 +00:00
Squashed commit of the following:
commit fd449c5931b8d0bff325f1f6edabe16b965e77d8
Merge: c4a416ee5 d0b89e4d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 26 15:06:54 2025 +0300
Merge branch 'master' into AGDNS-3118-upd-urlfilter
commit c4a416ee591600058b357532b7a7269806a1edfa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 24 17:26:29 2025 +0300
filtering: imp code, docs
commit a7d2af91f40239e6541b4ccf20da8c81a24a4fbf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Sep 24 13:52:56 2025 +0300
all: upd urlfilter, other deps, tools, etc.
105 lines
2.3 KiB
Go
105 lines
2.3 KiB
Go
package filtering
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/netip"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
|
|
"github.com/AdguardTeam/golibs/hostsfile"
|
|
"github.com/AdguardTeam/golibs/logutil/slogutil"
|
|
"github.com/AdguardTeam/golibs/netutil"
|
|
"github.com/AdguardTeam/urlfilter/rules"
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// matchSysHosts tries to match the host against the operating system's hosts
|
|
// database. err is always nil.
|
|
func (d *DNSFilter) matchSysHosts(
|
|
host string,
|
|
qtype uint16,
|
|
setts *Settings,
|
|
) (res Result, err error) {
|
|
// TODO(e.burkov): Where else is this checked?
|
|
if !setts.FilteringEnabled || d.conf.EtcHosts == nil {
|
|
return Result{}, nil
|
|
}
|
|
|
|
vals, rs, matched := d.hostsRewrites(qtype, host, d.conf.EtcHosts)
|
|
if !matched {
|
|
return Result{}, nil
|
|
}
|
|
|
|
return Result{
|
|
DNSRewriteResult: &DNSRewriteResult{
|
|
Response: DNSRewriteResultResponse{
|
|
qtype: vals,
|
|
},
|
|
RCode: dns.RcodeSuccess,
|
|
},
|
|
Rules: rs,
|
|
Reason: RewrittenAutoHosts,
|
|
}, nil
|
|
}
|
|
|
|
// hostsRewrites returns values and rules matched by qt and host within hs.
|
|
func (d *DNSFilter) hostsRewrites(
|
|
qtype uint16,
|
|
host string,
|
|
hs hostsfile.Storage,
|
|
) (vals []rules.RRValue, rls []*ResultRule, matched bool) {
|
|
ctx := context.TODO()
|
|
|
|
var isValidProto func(netip.Addr) (ok bool)
|
|
switch qtype {
|
|
case dns.TypeA:
|
|
isValidProto = netip.Addr.Is4
|
|
case dns.TypeAAAA:
|
|
isValidProto = netip.Addr.Is6
|
|
case dns.TypePTR:
|
|
addr, err := netutil.IPFromReversedAddr(host)
|
|
if err != nil {
|
|
d.logger.DebugContext(
|
|
ctx,
|
|
"failed to parse PTR record",
|
|
"host", host,
|
|
slogutil.KeyError, err,
|
|
)
|
|
|
|
return nil, nil, false
|
|
}
|
|
|
|
names := hs.ByAddr(addr)
|
|
|
|
for _, name := range names {
|
|
vals = append(vals, name)
|
|
rls = append(rls, &ResultRule{
|
|
Text: fmt.Sprintf("%s %s", addr, name),
|
|
FilterListID: rulelist.APIIDEtcHosts,
|
|
})
|
|
}
|
|
|
|
return vals, rls, len(names) > 0
|
|
default:
|
|
d.logger.DebugContext(
|
|
ctx,
|
|
"unsupported qtype",
|
|
"qtype", qtype,
|
|
)
|
|
|
|
return nil, nil, false
|
|
}
|
|
|
|
addrs := hs.ByName(host)
|
|
for _, addr := range addrs {
|
|
if isValidProto(addr) {
|
|
vals = append(vals, addr)
|
|
}
|
|
rls = append(rls, &ResultRule{
|
|
Text: fmt.Sprintf("%s %s", addr, host),
|
|
FilterListID: rulelist.APIIDEtcHosts,
|
|
})
|
|
}
|
|
|
|
return vals, rls, len(addrs) > 0
|
|
}
|