mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 14:35:48 +03:00
ff7c715c5f
Closes #6854.Updates #6875. Squashed commit of the following: commit b98adbc0cc6eeaffb262d57775c487e03b1d5ba5 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Apr 10 19:21:44 2024 +0300 dnsforward: upd proxy, imp code, docs commit 4de1eb2bca1047426e02ba680c212f46782e5616 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Apr 10 16:09:58 2024 +0300 WIP commit afa9d61e8dc129f907dc681cd2f831cb5c3b054a Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 19:24:09 2024 +0300 all: log changes commit c8340676a448687a39acd26bc8ce5f94473e441f Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 19:06:10 2024 +0300 dnsforward: move code commit 08bb7d43d2a3f689ef2ef2409935dc3946752e94 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 18:09:46 2024 +0300 dnsforward: imp code commit b27547ec806dd9bce502d3c6a7c28f33693ed575 Merge: b7efca7886f36ebc06
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 17:33:19 2024 +0300 Merge branch 'master' into AGDNS-1982-upd-proxy commit b7efca788b66aa672598b088040d4534ce2e55b0 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 17:27:14 2024 +0300 all: upd proxy finally commit 3e16fa87befe4c0ef3a3e7a638d7add28627f9b6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Apr 5 18:20:13 2024 +0300 dnsforward: upd proxy commit f3cdfc86334a182effcd0de22fac5e678fa53ea7 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 4 20:37:32 2024 +0300 all: upd proxy, golibs commit a79298d6d0504521893ee11fdc3a23c098aea911 Merge: 9feeba5c7fd25dcacb
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 4 20:34:01 2024 +0300 Merge branch 'master' into AGDNS-1982-upd-proxy commit 9feeba5c7f24ff1d308a216608d985cb2a7b7588 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 4 20:25:57 2024 +0300 all: imp code, docs commit 6c68d463db64293eb9c5e29ff91879fd68920a77 Merge: d8108e651ee619b2db
Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 4 18:46:11 2024 +0300 Merge branch 'master' into AGDNS-1982-upd-proxy commit d8108e65164df8d67aa4e95154a8768a06255b78 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Apr 3 19:25:27 2024 +0300 all: imp code commit 20461565801c9fcd06a652c6066b524b06c80433 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Apr 3 17:10:33 2024 +0300 all: remove private rdns logic
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.replyCompressed(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
|
|
}
|