Merge dfbc9bed20 into 2383ab57c6

Pull request 2213: 6902-doc-fix
Updates #6902. * commit 'b18fe84c5c87a87246afc1fe06aeeeca472ffc67': dnsforward, home: imp more chore: fix function names in comment
2024-04-26 08:59:15 -07:00 · 2024-04-26 18:53:35 +03:00 · 2024-04-26 18:45:10 +03:00 · 2024-04-26 18:44:52 +03:00 · 2024-04-26 15:50:36 +03:00 · 2024-04-10 19:40:42 +08:00
6 changed files with 15 additions and 11 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -34,6 +34,8 @@ NOTE: Add new changes BELOW THIS COMMENT.

 ### Fixed

+- Domain specifications for top-level domains not considered for requests to
+  unqualified domains ([#6744]).
 - Support for link-local subnets, i.e. `fe80::/16`, as client identifiers
  ([#6312]).
 - Issues with QUIC and HTTP/3 upstreams on older Linux kernel versions
@ -55,6 +57,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
 [#6192]: https://github.com/AdguardTeam/AdGuardHome/issues/6192
 [#6312]: https://github.com/AdguardTeam/AdGuardHome/issues/6312
 [#6422]: https://github.com/AdguardTeam/AdGuardHome/issues/6422
+[#6744]: https://github.com/AdguardTeam/AdGuardHome/issues/6744
 [#6854]: https://github.com/AdguardTeam/AdGuardHome/issues/6854
 [#6875]: https://github.com/AdguardTeam/AdGuardHome/issues/6875
 [#6882]: https://github.com/AdguardTeam/AdGuardHome/issues/6882
--- a/go.mod
+++ b/go.mod
@ -3,8 +3,7 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.22.2

 require (
-	// TODO(a.garipov): Use a tagged version once released.
-	github.com/AdguardTeam/dnsproxy v0.70.1-0.20240424112457-69feed2dd25e
+	github.com/AdguardTeam/dnsproxy v0.71.0
 	github.com/AdguardTeam/golibs v0.23.2
 	github.com/AdguardTeam/urlfilter v0.18.0
 	github.com/NYTimes/gziphandler v1.1.1
@ -29,8 +28,8 @@ require (
 	// own code for that.  Perhaps, use gopacket.
 	github.com/mdlayher/raw v0.1.0
 	github.com/miekg/dns v1.1.58
-	// TODO(a.garipov): Use a tagged version once released.
-	github.com/quic-go/quic-go v0.42.1-0.20240424132812-713525777535
+	// TODO(a.garipov): Use release version.
+	github.com/quic-go/quic-go v0.42.1-0.20240424141022-12aa63824c7f
 	github.com/stretchr/testify v1.9.0
 	github.com/ti-mo/netfilter v0.5.1
 	go.etcd.io/bbolt v1.3.9
--- a/go.sum
+++ b/go.sum
@ -1,5 +1,5 @@
-github.com/AdguardTeam/dnsproxy v0.70.1-0.20240424112457-69feed2dd25e h1:ju0wprmCakjAOIuvKrmLU+hUFiStIsreWVk4JWmQPm0=
-github.com/AdguardTeam/dnsproxy v0.70.1-0.20240424112457-69feed2dd25e/go.mod h1:eWyFj9zVMdJ4tjHULulfFIXiu6GID/aVvewLVVXLXWE=
+github.com/AdguardTeam/dnsproxy v0.71.0 h1:7epvSeTtjTdwbeifRJK6jTXldoJwqd3GWqAYDlSo7zQ=
+github.com/AdguardTeam/dnsproxy v0.71.0/go.mod h1:rCaCL4m4n63sgwTOyUVdc7MC42PlUYBt11Fz/UjD+kM=
 github.com/AdguardTeam/golibs v0.23.2 h1:rMjYantwtQ39e8G4zBQ6ZLlm4s3XH30Bc9VxhoOHwao=
 github.com/AdguardTeam/golibs v0.23.2/go.mod h1:o9i55Sx6v7qogRQeqaBfmLbC/pZqeMBWi015U5PTDY0=
 github.com/AdguardTeam/urlfilter v0.18.0 h1:ZZzwODC/ADpjJSODxySrrUnt/fvOCfGFaCW6j+wsGfQ=
@ -101,8 +101,8 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/quic-go/quic-go v0.42.1-0.20240424132812-713525777535 h1:63/XLGwhqZUU0L4DPWihJH9tyqwmvfaxNPjU9I/Av/M=
-github.com/quic-go/quic-go v0.42.1-0.20240424132812-713525777535/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
+github.com/quic-go/quic-go v0.42.1-0.20240424141022-12aa63824c7f h1:L7x60Z6AW2giF/SvbDpMglGHJxtmFJV03khPwXLDScU=
+github.com/quic-go/quic-go v0.42.1-0.20240424141022-12aa63824c7f/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
 github.com/shirou/gopsutil/v3 v3.23.7 h1:C+fHO8hfIppoJ1WdsVm1RoI0RwXoNdfTK7yWXV0wVj4=
 github.com/shirou/gopsutil/v3 v3.23.7/go.mod h1:c4gnmoRC0hQuaLqvxnx1//VXQ0Ms/X9UnJF8pddY5z4=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
--- a/internal/dnsforward/stats.go
+++ b/internal/dnsforward/stats.go
@ -130,7 +130,7 @@ func (s *Server) logQuery(dctx *dnsContext, ip net.IP, processingTime time.Durat
 	s.queryLog.Add(p)
 }

-// updatesStats writes the request into statistics.
+// updateStats writes the request data into statistics.
 func (s *Server) updateStats(dctx *dnsContext, clientIP string, processingTime time.Duration) {
 	pctx := dctx.proxyCtx

--- a/internal/filtering/servicelist.go
+++ b/internal/filtering/servicelist.go
@ -1980,6 +1980,8 @@ var blockedServices = []blockedService{{
 		"||minecraft.net^",
 		"||minecraftservices.com^",
 		"||mojang.com^",
+		"||20ca2.playfabapi.com^", // Bedrock PlayFab Services (Login, Marketplace, etc.)
+		"||minecraft-services.net^", // Bedrock Services (Realms)
 	},
 }, {
 	ID:      "nebula",
--- a/internal/home/service.go
+++ b/internal/home/service.go
@ -306,7 +306,7 @@ func handleServiceStatusCommand(s service.Service) {
 	}
 }

-// handleServiceStatusCommand handles service "install" command
+// handleServiceInstallCommand handles service "install" command.
 func handleServiceInstallCommand(s service.Service) {
 	err := svcAction(s, "install")
 	if err != nil {
@ -340,7 +340,7 @@ AdGuard Home is now available at the following addresses:`)
 	}
 }

-// handleServiceStatusCommand handles service "uninstall" command
+// handleServiceUninstallCommand handles service "uninstall" command.
 func handleServiceUninstallCommand(s service.Service) {
 	if aghos.IsOpenWrt() {
 		// On OpenWrt it is important to run disable command first
Author	SHA1	Message	Date
Jake Shirley	e42bc3b577	Merge `dfbc9bed20` into `2383ab57c6`	2024-04-26 08:59:15 -07:00
Ainar Garipov	2383ab57c6	Pull request 2213: 6902-doc-fix Updates #6902. * commit 'b18fe84c5c87a87246afc1fe06aeeeca472ffc67': dnsforward, home: imp more chore: fix function names in comment	2024-04-26 18:53:35 +03:00
Ainar Garipov	b18fe84c5c	dnsforward, home: imp more	2024-04-26 18:45:10 +03:00
Ainar Garipov	10f11b9725	Merge branch 'master' into 6902-doc-fix	2024-04-26 18:44:52 +03:00
Eugene Burkov	6dabfb463f	Pull request 2212: 6744 Upd proxy Updates #6744. Squashed commit of the following: commit 160694a13a02d575dc363003ec9f3fab6141fb51 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Apr 26 14:46:04 2024 +0300 all: upd to release commit `b7dd961459` Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 25 20:45:04 2024 +0300 all: fix tags commit `2374845fbf` Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 25 19:54:39 2024 +0300 all: upd proxy	2024-04-26 15:50:36 +03:00
looklose	9f319d5c51	chore: fix function names in comment Signed-off-by: looklose <shishuaiqun@yeah.net>	2024-04-10 19:40:42 +08:00
Jake Shirley	dfbc9bed20	Added Minecraft (Bedrock) endpoints to Minecraft service block list	2023-01-22 18:45:01 -08:00