From 090f75d79fcad19a7447d158fc926a304b0dff57 Mon Sep 17 00:00:00 2001 From: Maksim Kazantsev Date: Fri, 14 Aug 2026 12:43:21 +0000 Subject: [PATCH] Pull request 2752: ADG-12585-upd-go Squashed commit of the following: commit 50fb4bc95e3ed51f3522f42ee874979719e64a73 Author: Maksim Kazantsev Date: Fri Aug 14 15:25:56 2026 +0300 all: imp chlog; commit d8ce15472f62bd93b7f8a0774cf1dd2f7b0ad599 Author: Maksim Kazantsev Date: Fri Aug 14 15:22:13 2026 +0300 all: upd go; --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 3 +++ Makefile | 2 +- bamboo-specs/release.yaml | 6 +++--- bamboo-specs/test.yaml | 4 ++-- docker/ci.Dockerfile | 2 +- go.mod | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4399ad40d3..12a6b336b39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ # See https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#permissions. 'permissions': {} 'env': - 'GO_VERSION': '1.26.5' + 'GO_VERSION': '1.26.6' 'NODE_VERSION': '20' 'on': 'push': diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f0a676a578..7c7a745cf26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ NOTE: Add new changes BELOW THIS COMMENT. ### Security +- Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.26.6][go-1.26.6]. + - AdGuard Home is now more resistant to resource exhaustion attacks when using DNS-over-QUIC. This is GHSA-w6v6-f44j-3rj2. We thank @ATinyShoe for reporting this security issue. @@ -46,6 +48,7 @@ NOTE: Add new changes BELOW THIS COMMENT. - Blocked requests without an EDNS(0) OPT record ([#8183]). +[go-1.26.6]: https://groups.google.com/g/golang-announce/c/94pEornpRlI [#7514]: https://github.com/AdguardTeam/AdGuardHome/issues/7514 [#8183]: https://github.com/AdguardTeam/AdGuardHome/issues/8183 diff --git a/Makefile b/Makefile index e947fcefa0a..d0499b170f3 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ DIST_DIR = dist GOAMD64 = v1 GOPROXY = https://proxy.golang.org|direct GOTELEMETRY = off -GOTOOLCHAIN = go1.26.5 +GOTOOLCHAIN = go1.26.6 GPG_KEY = devteam@adguard.com GPG_KEY_PASSPHRASE = not-a-real-password NPM = npm diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index fe9b4de04bc..4f0410d5ad0 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -12,7 +12,7 @@ 'channel': 'edge' 'clientDir': 'client_v2' 'dockerFrontend': 'adguard/home-js-builder:4.0' - 'dockerGo': 'adguard/go-builder:1.26.5--1' + 'dockerGo': 'adguard/go-builder:1.26.6--1' 'stages': - 'Build frontend': @@ -297,7 +297,7 @@ 'channel': 'beta' 'clientDir': 'client' 'dockerFrontend': 'adguard/home-js-builder:4.0' - 'dockerGo': 'adguard/go-builder:1.26.5--1' + 'dockerGo': 'adguard/go-builder:1.26.6--1' # release-vX.Y.Z branches are the branches from which the actual final # release is built. - '^release-v[0-9]+\.[0-9]+\.[0-9]+': @@ -314,4 +314,4 @@ 'channel': 'release' 'clientDir': 'client' 'dockerFrontend': 'adguard/home-js-builder:4.0' - 'dockerGo': 'adguard/go-builder:1.26.5--1' + 'dockerGo': 'adguard/go-builder:1.26.6--1' diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index c8218bc532e..570c02a4ed4 100644 --- a/bamboo-specs/test.yaml +++ b/bamboo-specs/test.yaml @@ -11,7 +11,7 @@ 'channel': 'development' 'clientDir': 'client_v2' 'dockerFrontend': 'adguard/home-js-builder:4.0' - 'dockerGo': 'adguard/go-builder:1.26.5--1' + 'dockerGo': 'adguard/go-builder:1.26.6--1' 'stages': - 'Tests': @@ -272,4 +272,4 @@ 'channel': 'candidate' 'clientDir': 'client' 'dockerFrontend': 'adguard/home-js-builder:4.0' - 'dockerGo': 'adguard/go-builder:1.26.5--1' + 'dockerGo': 'adguard/go-builder:1.26.6--1' diff --git a/docker/ci.Dockerfile b/docker/ci.Dockerfile index 5cabdee6464..647661d9a9a 100644 --- a/docker/ci.Dockerfile +++ b/docker/ci.Dockerfile @@ -28,7 +28,7 @@ # needed. Keep it in sync with bamboo-specs/bamboo.yaml. # NOTE: Keep in sync with bamboo-specs/bamboo.yaml. -ARG BASE_IMAGE=adguard/go-builder:1.26.5--1 +ARG BASE_IMAGE=adguard/go-builder:1.26.6--1 # The dependencies stage is needed to install packages and tool dependencies. # This is also where binaries like osslsigncode, which may be required for tests diff --git a/go.mod b/go.mod index 4fb4302c1cf..26613e14e2f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/AdguardTeam/AdGuardHome -go 1.26.5 +go 1.26.6 require ( github.com/AdguardTeam/dnscrypt v0.0.2