mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-07-28 21:59:05 +00:00
Merge in DNS/adguard-home from AGDNS-3061-config-modifier to master Squashed commit of the following: commit a0068547bd0209d12e8dbf98ddd5e4ed2545cdd0 Merge: 97b798af6451255675Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Aug 5 17:39:31 2025 +0300 Merge branch 'master' into AGDNS-3061-config-modifier commit 97b798af6a50ee27ee5ed2bcf1c4c3670f5afc5d Merge: 96d21efc9b8043e4f0Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jul 30 20:27:41 2025 +0300 Merge branch 'master' into AGDNS-3061-config-modifier commit 96d21efc984073adef5026de8a03b5bf94542648 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jul 30 20:18:43 2025 +0300 all: imp code commit 67c5608b4be3bd712a0ab5980f25ecea1ed21d65 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jul 29 20:31:19 2025 +0300 all: imp code commit 52f45a9f70f57d8e7f7fc0e9e8291ff0dde74343 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Jul 28 20:32:13 2025 +0300 all: use config modifier commit d389ffd286460d8ff1964bd2ee8dabdafb832b9b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 25 14:20:31 2025 +0300 bamboo-specs: fix ci commit 3f303ac9131a07e4af5783696b237436fd93d65c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Jul 25 14:18:42 2025 +0300 home: config modifier
182 lines
4.2 KiB
Go
182 lines
4.2 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/netip"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"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(
|
|
ctx context.Context,
|
|
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(ctx, v, rr, req)
|
|
case dns.TypeSRV:
|
|
return s.ansFromDNSRewriteSRV(v, rr, req)
|
|
default:
|
|
s.logger.DebugContext(ctx, "unsupported dns rr type, skipping", "res_record", 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(
|
|
ctx context.Context,
|
|
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(ctx, req, svcb), nil
|
|
}
|
|
|
|
return s.genAnswerSVCB(ctx, 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(
|
|
ctx context.Context,
|
|
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(ctx, 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
|
|
}
|