Murzaby/Adguardhome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2026-08-04 15:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Pull request 2700: 8183-include-edns

Browse source 
Updates #8183.

Squashed commit of the following:

commit b6ada16f9121fd2ed3fae5de2446c8c2c42ef183
Author: f.setrakov <f.setrakov@adguard.com>
Date:   Wed Jul 15 12:03:19 2026 +0300

    all: fix changelog

commit c920b48346174d56a83ef69dc02c96ea05a60df3
Merge: 70a703c31 c1f208ef6
Author: f.setrakov <f.setrakov@adguard.com>
Date:   Wed Jul 15 11:47:39 2026 +0300

    Merge branch 'master' into 8183-include-edns

commit 70a703c312
Author: f.setrakov <f.setrakov@adguard.com>
Date:   Mon Jul 13 15:27:07 2026 +0300

    all: imp docs

commit 941bdabebe
Author: f.setrakov <f.setrakov@adguard.com>
Date:   Thu Jul 9 14:36:41 2026 +0300

    all: include edns opt for filtered req
This commit is contained in:
Fedor Setrakov 2026-07-15 09:15:56 +00:00
parent c1f208ef65
commit 4da215221a
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -18,6 +18,12 @@ See also the [v0.107.79 GitHub milestone][ms-v0.107.79].
NOTE: Add new changes BELOW THIS COMMENT.
-->
### Fixed
- Blocked requests without an EDNS(0) OPT record ([#8183]).
[#8183]: https://github.com/AdguardTeam/AdGuardHome/issues/8183
<!--
NOTE: Add new changes ABOVE THIS COMMENT.
-->
@ -62,8 +68,6 @@ See also the [v0.107.78 GitHub milestone][ms-v0.107.78].
- The `filtering` object of the YAML configuration now includes a new property, `max_http_size`, which defines the maximum size of the HTTP request for rulelists. To disable the limitation, set a large size, such as `1 TB`.
### Fixed
- Invalid AA flag in DNS responses ([#7955]).
- The parsing of the `ech` parameter in DNS rewrite rules for the HTTPS record type ([#8276]).

18
internal/dnsforward/msg.go
View file

@ -17,10 +17,17 @@ import (
// template. Also extract all the methods to a separate entity.
// reply creates a DNS response for req.
//
// NOTE: If req uses EDNS(0), the response copies its UDP size and DO flag.
func (*Server) reply(req *dns.Msg, code int) (resp *dns.Msg) {
resp = (&dns.Msg{}).SetRcode(req, code)
resp.RecursionAvailable = true
opt := req.IsEdns0()
if opt != nil {
resp.SetEdns0(opt.UDPSize(), opt.Do())
}
return resp
}
@ -404,7 +411,11 @@ func (s *Server) NewMsgSERVFAIL(req *dns.Msg) (resp *dns.Msg) {
// NewMsgNOTIMPLEMENTED implements the [proxy.MessageConstructor] interface for
// *Server.
func (s *Server) NewMsgNOTIMPLEMENTED(req *dns.Msg) (resp *dns.Msg) {
resp = s.reply(req, dns.RcodeNotImplemented)
// NOTE: [Server.reply] must not be used there, because it unconditionally
// copies UDP size and DO bit from the request, when in this case we want to
// use constant values.
resp = (&dns.Msg{}).SetRcode(req, dns.RcodeNotImplemented)
resp.RecursionAvailable = true
// Most of the Internet and especially the inner core has an MTU of at least
// 1500 octets. Maximum DNS/UDP payload size for IPv6 on MTU 1500 ethernet
@ -415,7 +426,10 @@ func (s *Server) NewMsgNOTIMPLEMENTED(req *dns.Msg) (resp *dns.Msg) {
// NOTIMPLEMENTED without EDNS is treated as 'we don't support EDNS', so
// explicitly set it.
resp.SetEdns0(maxUDPPayload, false)
opt := req.IsEdns0()
if opt != nil {
resp.SetEdns0(maxUDPPayload, false)
}
return resp
}