mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-30 02:28:16 +03:00
28cfde9212
Merge in DNS/adguard-home from upd-urlfilter to master Updates #6050. Squashed commit of the following: commit 80337ab02d616e25fa455e46c9535c088b5c5ea5 Merge: fb2cfd1a531f7aaecc
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 23 16:50:49 2023 +0300 Merge branch 'master' into upd-urlfilter commit fb2cfd1a5c94d92030fc8832615764f100d010e5 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 23 16:22:43 2023 +0300 dnsforward: imp code, docs commit 2900333bb85d4e064db9de27bd5bfe7c3ef00747 Merge: 977ed35e42bfc9fcb1
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 18:06:05 2023 +0300 Merge branch 'master' into upd-urlfilter commit 977ed35e4ed377f1031721d58e0fcb58de1e74ac Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 17:06:30 2023 +0300 all: log changes commit 1228a0770485799bf50bbe68005dbb0ba9a96a9c Merge: 78305eb2e4b4036fa6
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:51:42 2023 +0300 Merge branch 'master' into upd-urlfilter commit 78305eb2ebc3854dd11ce35d6b4c7eecccd7cc78 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 15:55:05 2023 +0300 all: upd urlfilter commit 63a29e18d5034e5f9433121ff7e7c45aebfa1f0f Merge: 748c53430762e5be97
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 20:12:49 2023 +0300 Merge branch 'master' into upd-urlfilter commit 748c5343020b0c6d4d4f16eb3d30b875c0a94e0f Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 20:07:44 2023 +0300 all: imp code, docs commit 91975140f3305a6793e07142f7c9a75120a4ce8c Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 16:16:19 2023 +0300 all: upd urlfilter
178 lines
4.1 KiB
Go
178 lines
4.1 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"fmt"
|
|
"net/netip"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/urlfilter/rules"
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// filterDNSRewriteResponse handles a single DNS rewrite response entry. It
|
|
// returns the properly constructed answer resource record.
|
|
func (s *Server) filterDNSRewriteResponse(
|
|
req *dns.Msg,
|
|
rr rules.RRType,
|
|
v rules.RRValue,
|
|
) (ans dns.RR, err error) {
|
|
switch rr {
|
|
case dns.TypeA, dns.TypeAAAA:
|
|
return s.ansFromDNSRewriteIP(v, rr, req)
|
|
case dns.TypePTR, dns.TypeTXT:
|
|
return s.ansFromDNSRewriteText(v, rr, req)
|
|
case dns.TypeMX:
|
|
return s.ansFromDNSRewriteMX(v, rr, req)
|
|
case dns.TypeHTTPS, dns.TypeSVCB:
|
|
return s.ansFromDNSRewriteSVCB(v, rr, req)
|
|
case dns.TypeSRV:
|
|
return s.ansFromDNSRewriteSRV(v, rr, req)
|
|
default:
|
|
log.Debug("don't know how to handle dns rr type %d, skipping", rr)
|
|
|
|
return nil, nil
|
|
}
|
|
}
|
|
|
|
// ansFromDNSRewriteIP creates a new answer resource record from the A/AAAA
|
|
// dnsrewrite rule data.
|
|
func (s *Server) ansFromDNSRewriteIP(
|
|
v rules.RRValue,
|
|
rr rules.RRType,
|
|
req *dns.Msg,
|
|
) (ans dns.RR, err error) {
|
|
ip, ok := v.(netip.Addr)
|
|
if !ok {
|
|
return nil, fmt.Errorf("value for rr type %s has type %T, not netip.Addr", dns.Type(rr), v)
|
|
}
|
|
|
|
if rr == dns.TypeA {
|
|
return s.genAnswerA(req, ip), nil
|
|
}
|
|
|
|
return s.genAnswerAAAA(req, ip), nil
|
|
}
|
|
|
|
// ansFromDNSRewriteText creates a new answer resource record from the TXT/PTR
|
|
// dnsrewrite rule data.
|
|
func (s *Server) ansFromDNSRewriteText(
|
|
v rules.RRValue,
|
|
rr rules.RRType,
|
|
req *dns.Msg,
|
|
) (ans dns.RR, err error) {
|
|
str, ok := v.(string)
|
|
if !ok {
|
|
return nil, fmt.Errorf("value for rr type %s has type %T, not string", dns.Type(rr), v)
|
|
}
|
|
|
|
if rr == dns.TypeTXT {
|
|
return s.genAnswerTXT(req, []string{str}), nil
|
|
}
|
|
|
|
return s.genAnswerPTR(req, str), nil
|
|
}
|
|
|
|
// ansFromDNSRewriteMX creates a new answer resource record from the MX
|
|
// dnsrewrite rule data.
|
|
func (s *Server) ansFromDNSRewriteMX(
|
|
v rules.RRValue,
|
|
rr rules.RRType,
|
|
req *dns.Msg,
|
|
) (ans dns.RR, err error) {
|
|
mx, ok := v.(*rules.DNSMX)
|
|
if !ok {
|
|
return nil, fmt.Errorf(
|
|
"value for rr type %s has type %T, not *rules.DNSMX",
|
|
dns.Type(rr),
|
|
v,
|
|
)
|
|
}
|
|
|
|
return s.genAnswerMX(req, mx), nil
|
|
}
|
|
|
|
// ansFromDNSRewriteSVCB creates a new answer resource record from the
|
|
// SVCB/HTTPS dnsrewrite rule data.
|
|
func (s *Server) ansFromDNSRewriteSVCB(
|
|
v rules.RRValue,
|
|
rr rules.RRType,
|
|
req *dns.Msg,
|
|
) (ans dns.RR, err error) {
|
|
svcb, ok := v.(*rules.DNSSVCB)
|
|
if !ok {
|
|
return nil, fmt.Errorf(
|
|
"value for rr type %s has type %T, not *rules.DNSSVCB",
|
|
dns.Type(rr),
|
|
v,
|
|
)
|
|
}
|
|
|
|
if rr == dns.TypeHTTPS {
|
|
return s.genAnswerHTTPS(req, svcb), nil
|
|
}
|
|
|
|
return s.genAnswerSVCB(req, svcb), nil
|
|
}
|
|
|
|
// ansFromDNSRewriteSRV creates a new answer resource record from the SRV
|
|
// dnsrewrite rule data.
|
|
func (s *Server) ansFromDNSRewriteSRV(
|
|
v rules.RRValue,
|
|
rr rules.RRType,
|
|
req *dns.Msg,
|
|
) (dns.RR, error) {
|
|
srv, ok := v.(*rules.DNSSRV)
|
|
if !ok {
|
|
return nil, fmt.Errorf(
|
|
"value for rr type %s has type %T, not *rules.DNSSRV",
|
|
dns.Type(rr),
|
|
v,
|
|
)
|
|
}
|
|
|
|
return s.genAnswerSRV(req, srv), nil
|
|
}
|
|
|
|
// filterDNSRewrite handles dnsrewrite filters. It constructs a DNS response
|
|
// and sets it into pctx.Res. All parameters must not be nil.
|
|
func (s *Server) filterDNSRewrite(
|
|
req *dns.Msg,
|
|
res *filtering.Result,
|
|
pctx *proxy.DNSContext,
|
|
) (err error) {
|
|
resp := s.makeResponse(req)
|
|
dnsrr := res.DNSRewriteResult
|
|
if dnsrr == nil {
|
|
return errors.Error("no dns rewrite rule content")
|
|
}
|
|
|
|
resp.Rcode = dnsrr.RCode
|
|
if resp.Rcode != dns.RcodeSuccess {
|
|
pctx.Res = resp
|
|
|
|
return nil
|
|
}
|
|
|
|
if dnsrr.Response == nil {
|
|
return errors.Error("no dns rewrite rule responses")
|
|
}
|
|
|
|
qtype := req.Question[0].Qtype
|
|
values := dnsrr.Response[qtype]
|
|
for i, v := range values {
|
|
var ans dns.RR
|
|
ans, err = s.filterDNSRewriteResponse(req, qtype, v)
|
|
if err != nil {
|
|
return fmt.Errorf("dns rewrite response for %s[%d]: %w", dns.Type(qtype), i, err)
|
|
}
|
|
|
|
resp.Answer = append(resp.Answer, ans)
|
|
}
|
|
|
|
pctx.Res = resp
|
|
|
|
return nil
|
|
}
|