Merge ac9e9f72820ec44173f4f8cc47a36645c4abff61 into 8f75c6ac9dd3acac09d7d1a6422b1834fe6acc9c

Pull request 2330: Upd Go
Merge in DNS/adguard-home from upd-go to master Squashed commit of the following: commit 58aad666b56d7100c7b5291fb8a100fe635e6d62 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Jan 17 19:02:06 2025 +0300 all: upd go
2025-02-20 11:44:09 +08:00 · 2025-01-19 22:00:30 +09:00 · 2025-01-17 19:24:56 +03:00 · 2025-01-10 16:21:34 +03:00 · 2024-10-21 14:45:15 +08:00
10 changed files with 21 additions and 12 deletions
--- 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':
--- 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':
--- 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.
@ -28,10 +32,15 @@ NOTE: Add new changes BELOW THIS COMMENT.

 ### Fixed

+- Request count link in the clients table ([#7513]).
+
 - The formatting of large numbers on the dashboard ([#7329]).

+[#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
+
 <!--
 NOTE: Add new changes ABOVE THIS COMMENT.
 -->
--- a/2
+++ b/2
@ -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
--- 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'
--- 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'
--- a/client/src/components/Settings/Clients/ClientsTable/ClientsTable.tsx
+++ b/client/src/components/Settings/Clients/ClientsTable/ClientsTable.tsx
@ -306,7 +306,7 @@ const ClientsTable = ({
                    return content;
                }

-                return <LogsSearchLink search={row.original.ids[0]}>{content}</LogsSearchLink>;
+                return <LogsSearchLink search={row.original.name}>{content}</LogsSearchLink>;
            },
        },
        {
--- 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
--- a/internal/home/clientshttp.go
+++ b/internal/home/clientshttp.go
@ -528,7 +528,7 @@ func (clients *clientsContainer) findRuntime(ip netip.Addr, idStr string) (cj *c
 	return cj
 }

-// RegisterClientsHandlers registers HTTP handlers
+// registerWebHandlers registers HTTP handlers
 func (clients *clientsContainer) registerWebHandlers() {
 	httpRegister(http.MethodGet, "/control/clients", clients.handleGetClients)
 	httpRegister(http.MethodPost, "/control/clients/add", clients.handleAddClient)
--- 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
Author	SHA1	Message	Date
David Wood	8e547fa20d	Merge ac9e9f72820ec44173f4f8cc47a36645c4abff61 into 8f75c6ac9dd3acac09d7d1a6422b1834fe6acc9c	2025-01-19 22:00:30 +09:00
Eugene Burkov	8f75c6ac9d	Pull request 2330: Upd Go Merge in DNS/adguard-home from upd-go to master Squashed commit of the following: commit 58aad666b56d7100c7b5291fb8a100fe635e6d62 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Jan 17 19:02:06 2025 +0300 all: upd go	2025-01-17 19:24:56 +03:00
Ildar Kamalov	446f21a511	Pull request 2328: ADG-9458 fix request count link in the clients table Updates #7513. Squashed commit of the following: commit 2b7f6bd4d0e1d8855faacf08cc0dff3e4e6d2bbd Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 9 15:28:11 2025 +0300 fix commit 86f3f32272975a199a8fb3867f3e776f71704916 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 9 15:27:34 2025 +0300 fix commit 786c56828f95c66275a19d816759bacc137041f8 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 9 15:26:38 2025 +0300 ADG-9458 fix request count link in the clients table	2025-01-10 16:21:34 +03:00
David Wood	ac9e9f7282	chore: fix function name in comment	2024-10-21 14:45:15 +08:00