From fd5e94f0d4afadbf48deab1cee4ee23f82f1bd0f Mon Sep 17 00:00:00 2001
From: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed, 6 Mar 2024 14:11:05 +0300
Subject: [PATCH] all: upd go

---
 .github/workflows/build.yml | 2 +-
 .github/workflows/lint.yml  | 2 +-
 CHANGELOG.md                | 4 ++++
 Makefile                    | 2 +-
 bamboo-specs/release.yaml   | 3 +++
 bamboo-specs/snapcraft.yaml | 3 +++
 bamboo-specs/test.yaml      | 2 ++
 go.mod                      | 2 +-
 8 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3cb7c40..f140346b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.21.7'
+  'GO_VERSION': '1.21.8'
   'NODE_VERSION': '16'
 
 'on':
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b418e66f..ebbe80ef 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.21.7'
+  'GO_VERSION': '1.21.8'
 
 'on':
   'push':
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b140624..25f7f200 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,9 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 - Go version has been updated to prevent the possibility of exploiting the Go
   vulnerabilities fixed in Go 1.21.6 and Go 1.21.7.
+- Go version has been updated to prevent the possibility of exploiting the
+  CVE-2024-24783, CVE-2023-45290, CVE-2023-45289, CVE-2024-24785, and
+  CVE-2024-24784 Go vulnerabilities fixed in [Go 1.21.8][go-1.21.8].
 
 ### Added
 
@@ -74,6 +77,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
 [#6711]: https://github.com/AdguardTeam/AdGuardHome/issues/6711
 
 [go-toolchain]: https://go.dev/blog/toolchain
+[go-1.21.8]:    https://groups.google.com/g/golang-announce/c/5pwGVUPoMbg
 
 <!--
 NOTE: Add new changes ABOVE THIS COMMENT.
diff --git a/Makefile b/Makefile
index 2ec8699b..8fccfc35 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ DIST_DIR = dist
 GOAMD64 = v1
 GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
 GOSUMDB = sum.golang.google.cn
-GOTOOLCHAIN = go1.21.7
+GOTOOLCHAIN = go1.21.8
 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 5ca3ac56..8c54708b 100644
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -7,6 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
     'channel': 'edge'
+    # TODO(e.burkov):  !! update
     'dockerGo': 'adguard/golang-ubuntu:8.0'
 
 'stages':
@@ -272,6 +273,7 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
+            # TODO(e.burkov):  !! update
             'dockerGo': 'adguard/golang-ubuntu:8.0'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
@@ -287,4 +289,5 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
+            # TODO(e.burkov):  !! update
             'dockerGo': 'adguard/golang-ubuntu:8.0'
diff --git a/bamboo-specs/snapcraft.yaml b/bamboo-specs/snapcraft.yaml
index 06f85937..0ffe3f20 100644
--- a/bamboo-specs/snapcraft.yaml
+++ b/bamboo-specs/snapcraft.yaml
@@ -10,6 +10,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
     'channel': 'edge'
+    # TODO(e.burkov):  !! update
     'dockerGo': 'adguard/golang-ubuntu:8.0'
     'snapcraftChannel': 'edge'
 
@@ -191,6 +192,7 @@
         # need to build a few of these.
         'variables':
             'channel': 'beta'
+            # TODO(e.burkov):  !! update
             'dockerGo': 'adguard/golang-ubuntu:8.0'
             'snapcraftChannel': 'beta'
     # release-vX.Y.Z branches are the branches from which the actual final
@@ -207,5 +209,6 @@
         # are the ones that actually get released.
         'variables':
             'channel': 'release'
+            # TODO(e.burkov):  !! update
             'dockerGo': 'adguard/golang-ubuntu:8.0'
             'snapcraftChannel': 'candidate'
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
index 532e7f4b..284823f1 100644
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -5,6 +5,7 @@
     'key': 'AHBRTSPECS'
     'name': 'AdGuard Home - Build and run tests'
 'variables':
+    # TODO(e.burkov):  !! update
     'dockerGo': 'adguard/golang-ubuntu:8.0'
     'channel': 'development'
 
@@ -127,5 +128,6 @@
         # Set the default release channel on the release branch to beta, as we
         # may need to build a few of these.
         'variables':
+            # TODO(e.burkov):  !! update
             'dockerGo': 'adguard/golang-ubuntu:8.0'
             'channel': 'candidate'
diff --git a/go.mod b/go.mod
index 537a6e76..b9c6330e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/AdguardTeam/AdGuardHome
 
-go 1.21.7
+go 1.21.8
 
 require (
 	github.com/AdguardTeam/dnsproxy v0.65.2