diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab3f5cce..1a733062 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ 'name': 'build' 'env': - 'GO_VERSION': '1.23.4' + 'GO_VERSION': '1.23.5' 'NODE_VERSION': '16' 'on': diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d0fb2647..735a3882 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ 'name': 'lint' 'env': - 'GO_VERSION': '1.23.4' + 'GO_VERSION': '1.23.5' 'on': 'push': diff --git a/CHANGELOG.md b/CHANGELOG.md index 27917d77..2503edd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,10 @@ See also the [v0.107.56 GitHub milestone][ms-v0.107.56]. 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.23.5][go-1.23.5]. + ### Added - The new HTTP API `POST /clients/search` that finds clients by their IP addresses, CIDRs, MAC addresses, or ClientIDs. See `openapi/openapi.yaml` for the full description. @@ -35,6 +39,8 @@ NOTE: Add new changes BELOW THIS COMMENT. [#7513]: https://github.com/AdguardTeam/AdGuardHome/issues/7513 [#7329]: https://github.com/AdguardTeam/AdGuardHome/issues/7329 +[go-1.23.5]: https://groups.google.com/g/golang-announce/c/sSaUhLA-2SI + diff --git a/Makefile b/Makefile index 6c09f06e..15149924 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ DIST_DIR = dist GOAMD64 = v1 GOPROXY = https://proxy.golang.org|direct GOTELEMETRY = off -GOTOOLCHAIN = go1.23.4 +GOTOOLCHAIN = go1.23.5 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 1f96e853..1504f65b 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -8,7 +8,7 @@ 'variables': 'channel': 'edge' 'dockerFrontend': 'adguard/home-js-builder:2.0' - 'dockerGo': 'adguard/go-builder:1.23.4--1' + 'dockerGo': 'adguard/go-builder:1.23.5--1' 'stages': - 'Build frontend': @@ -278,7 +278,7 @@ 'variables': 'channel': 'beta' 'dockerFrontend': 'adguard/home-js-builder:2.0' - 'dockerGo': 'adguard/go-builder:1.23.4--1' + 'dockerGo': 'adguard/go-builder:1.23.5--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]+': @@ -294,4 +294,4 @@ 'variables': 'channel': 'release' 'dockerFrontend': 'adguard/home-js-builder:2.0' - 'dockerGo': 'adguard/go-builder:1.23.4--1' + 'dockerGo': 'adguard/go-builder:1.23.5--1' diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index 9f89a92c..53f052d3 100644 --- a/bamboo-specs/test.yaml +++ b/bamboo-specs/test.yaml @@ -6,7 +6,7 @@ 'name': 'AdGuard Home - Build and run tests' 'variables': 'dockerFrontend': 'adguard/home-js-builder:2.0' - 'dockerGo': 'adguard/go-builder:1.23.4--1' + 'dockerGo': 'adguard/go-builder:1.23.5--1' 'channel': 'development' 'stages': @@ -196,5 +196,5 @@ # may need to build a few of these. 'variables': 'dockerFrontend': 'adguard/home-js-builder:2.0' - 'dockerGo': 'adguard/go-builder:1.23.4--1' + 'dockerGo': 'adguard/go-builder:1.23.5--1' 'channel': 'candidate' diff --git a/go.mod b/go.mod index 60c38a7a..1ed09910 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/AdguardTeam/AdGuardHome -go 1.23.4 +go 1.23.5 require ( github.com/AdguardTeam/dnsproxy v0.73.5 diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 8ef8dd1a..218ac65c 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module github.com/AdguardTeam/AdGuardHome/internal/tools -go 1.23.4 +go 1.23.5 require ( github.com/fzipp/gocyclo v0.6.0