From 622181b88f32dd90ff33726558796fe3b5d75526 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Thu, 9 Mar 2023 13:26:20 +0300
Subject: [PATCH] Pull request 1765: upd-all

Merge in DNS/adguard-home from upd-all to master

Squashed commit of the following:

commit 00363964e808533ef349040e86d89ba2f4a31eb1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 9 13:17:06 2023 +0300

    all: upd go, i18n, svcs, trackers
---
 .github/workflows/build.yml               |  2 +-
 .github/workflows/lint.yml                |  2 +-
 CHANGELOG.md                              |  8 ++-
 bamboo-specs/release.yaml                 |  6 +-
 bamboo-specs/test.yaml                    |  2 +-
 client/src/__locales/fi.json              |  2 +-
 client/src/__locales/no.json              |  1 +
 client/src/helpers/filters/filters.js     |  2 +-
 client/src/helpers/trackers/trackers.json | 78 ++++++++++++++++++++++-
 internal/filtering/servicelist.go         | 12 +++-
 scripts/make/go-lint.sh                   |  2 +-
 11 files changed, 102 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 84d80f99..be43d704 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.19.6'
+  'GO_VERSION': '1.19.7'
   'NODE_VERSION': '14'
 
 'on':
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index cf94cb26..8313cfa8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.19.6'
+  'GO_VERSION': '1.19.7'
 
 'on':
   'push':
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2eb59ef4..e113b65a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,11 @@ See also the [v0.107.26 GitHub milestone][ms-v0.107.26].
 NOTE: Add new changes BELOW THIS COMMENT.
 -->
 
+### Security
+
+- Go version has been updated to prevent the possibility of exploiting the
+  CVE-2023-24532 Go vulnerability fixed in [Go 1.19.7][go-1.19.7].
+
 ### Added
 
 - The ability to set custom IP for EDNS Client Subnet by using the new
@@ -84,7 +89,8 @@ In this release, the schema version has changed from 16 to 17.
 [#5468]: https://github.com/AdguardTeam/AdGuardHome/issues/5468
 [#5515]: https://github.com/AdguardTeam/AdGuardHome/issues/5515
 
-[rfc3696]: https://datatracker.ietf.org/doc/html/rfc3696
+[go-1.19.7]: https://groups.google.com/g/golang-announce/c/3-TpUx48iQY
+[rfc3696]:   https://datatracker.ietf.org/doc/html/rfc3696
 
 <!--
 NOTE: Add new changes ABOVE THIS COMMENT.
diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
index f02431e0..0dce84b7 100644
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -7,7 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
   'channel': 'edge'
-  'dockerGo': 'adguard/golang-ubuntu:6.1'
+  'dockerGo': 'adguard/golang-ubuntu:6.2'
 
 'stages':
 - 'Build frontend':
@@ -331,7 +331,7 @@
     # need to build a few of these.
     'variables':
       'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:6.1'
+      'dockerGo': 'adguard/golang-ubuntu:6.2'
 # release-vX.Y.Z branches are the branches from which the actual final release
 # is built.
 - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -346,4 +346,4 @@
     # are the ones that actually get released.
     'variables':
       'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:6.1'
+      'dockerGo': 'adguard/golang-ubuntu:6.2'
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
index 4708bcc7..38579455 100644
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@
   'key': 'AHBRTSPECS'
   'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:6.1'
+  'dockerGo': 'adguard/golang-ubuntu:6.2'
 
 'stages':
 - 'Tests':
diff --git a/client/src/__locales/fi.json b/client/src/__locales/fi.json
index c60508b9..b04ad021 100644
--- a/client/src/__locales/fi.json
+++ b/client/src/__locales/fi.json
@@ -297,7 +297,7 @@
     "blocking_mode_refused": "REFUSED: Vastaa REFUSED-koodilla",
     "blocking_mode_nxdomain": "NXDOMAIN: Vastaa NXDOMAIN-koodilla",
     "blocking_mode_null_ip": "Tyhjä IP: Vastaa IP-nollaosoitteella (0.0.0.0 korvaa A; :: korvaa AAAA)",
-    "blocking_mode_custom_ip": "Mukautettu IP: Vastaa itse määritetyllä IP-osoitteella",
+    "blocking_mode_custom_ip": "Mukautettu IP: Vastaa manuaalisesti määritetyllä IP-osoitteella",
     "theme_auto": "Automaattinen",
     "theme_light": "Vaalea",
     "theme_dark": "Tumma",
diff --git a/client/src/__locales/no.json b/client/src/__locales/no.json
index 9756f88a..ca218d07 100644
--- a/client/src/__locales/no.json
+++ b/client/src/__locales/no.json
@@ -281,6 +281,7 @@
     "blocking_mode_nxdomain": "NXDOMAIN: Svar med NXDOMAIN-koden",
     "blocking_mode_null_ip": "Null IP: Svar med en 0-IP-adresse (0.0.0.0 for A; :: for AAAA)",
     "blocking_mode_custom_ip": "Tilpasset IP: Svar med en manuelt valgt IP-adresse",
+    "theme_auto": "Auto",
     "upstream_dns_client_desc": "Hvis dette feltet holdes tomt, vil AdGuard Home bruke tjenerne som er satt opp i <0>DNS-innstillingene</0>.",
     "tracker_source": "Sporerkilde",
     "source_label": "Kilde",
diff --git a/client/src/helpers/filters/filters.js b/client/src/helpers/filters/filters.js
index 5ace4d7c..68b3dd9c 100644
--- a/client/src/helpers/filters/filters.js
+++ b/client/src/helpers/filters/filters.js
@@ -235,7 +235,7 @@ export default {
         "urlhaus_filter_online": {
             "name": "Malicious URL Blocklist (URLHaus)",
             "categoryId": "security",
-            "homepage": "https://gitlab.com/malware-filter/urlhaus-filter",
+            "homepage": "https://urlhaus.abuse.ch/",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt"
         },
         "windowsspyblocker_hosts_spy_rules": {
diff --git a/client/src/helpers/trackers/trackers.json b/client/src/helpers/trackers/trackers.json
index 5e9cbd9c..8afb5aeb 100644
--- a/client/src/helpers/trackers/trackers.json
+++ b/client/src/helpers/trackers/trackers.json
@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-03-01T10:05:51.445Z",
+    "timeUpdated": "2023-03-08T00:09:48.692Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
@@ -19316,6 +19316,13 @@
             "companyId": null,
             "source": "AdGuard"
         },
+        "edgio": {
+            "name": "Edgio",
+            "categoryId": 9,
+            "url": "https://edg.io/",
+            "companyId": "edgio",
+            "source": "AdGuard"
+        },
         "element": {
             "name": "Element",
             "categoryId": 7,
@@ -19372,6 +19379,13 @@
             "companyId": "lets_encrypt",
             "source": "AdGuard"
         },
+        "lgtv": {
+            "name": "LG TV",
+            "categoryId": 8,
+            "url": "https://www.lg.com/",
+            "companyId": "lgcorp",
+            "source": "AdGuard"
+        },
         "matrix": {
             "name": "Matrix",
             "categoryId": 5,
@@ -19407,6 +19421,13 @@
             "companyId": "mozilla",
             "source": "AdGuard"
         },
+        "nab": {
+            "name": "National Australia Bank",
+            "categoryId": 8,
+            "url": "https://www.nab.com.au/",
+            "companyId": "nab",
+            "source": "AdGuard"
+        },
         "notion": {
             "name": "Notion",
             "categoryId": 8,
@@ -19456,6 +19477,13 @@
             "companyId": "qualcomm",
             "source": "AdGuard"
         },
+        "recaptcha": {
+            "name": "reCAPTCHA",
+            "categoryId": 8,
+            "url": "https://www.google.com/recaptcha/about/",
+            "companyId": "google",
+            "source": "AdGuard"
+        },
         "sectigo": {
             "name": "Sectigo Limited",
             "categoryId": 5,
@@ -23893,6 +23921,11 @@
         "adguardvpn.com": "adguard_vpn",
         "adguard-vpn.com": "adguard_vpn",
         "adguard-vpn.online": "adguard_vpn",
+        "adjust.net.in": "adjust",
+        "adj.st": "adjust",
+        "adjust.io": "adjust",
+        "adjust.world": "adjust",
+        "apptrace.com": "adjust",
         "akadns.net": "akamai_technologies",
         "akamaiedge.net": "akamai_technologies",
         "akaquill.net": "akamai_technologies",
@@ -23907,6 +23940,21 @@
         "aliyun.com": "alibaba_cloud",
         "ucweb.com": "alibaba_ucbrowser",
         "alipayobjects.com": "alipay.com",
+        "amazoncrl.com": "amazon",
+        "aamazoncognito.com": "amazon",
+        "amazonbrowserapp.es": "amazon",
+        "amazonbrowserapp.co.uk": "amazon",
+        "amazon.sa": "amazon",
+        "amazon.nl": "amazon",
+        "amazon.in": "amazon",
+        "amazon.com.mx": "amazon",
+        "amazon.com.au": "amazon",
+        "amazon-corp.com": "amazon",
+        "a2z.com": "amazon",
+        "amazontrust.com": "amazon_cdn",
+        "associates-amazon.com": "amazon_cdn",
+        "amazonpay.in": "amazon_payments",
+        "amazonvideo.com": "amazon_video",
         "taobao.com": "taobao",
         "appcenter.ms": "appcenter",
         "iadsdk.apple.com": "apple_ads",
@@ -23926,6 +23974,8 @@
         "apple-livephotoskit.com": "apple",
         "safebrowsing.apple": "apple",
         "safebrowsing.g.applimg.com": "apple",
+        "applvn.com": "applovin",
+        "applovin.com": "applovin",
         "blob.core.windows.net": "azure_blob_storage",
         "azure.com": "azure",
         "trafficmanager.net": "azure",
@@ -23935,12 +23985,21 @@
         "cloudflare-dns.com": "cloudflare",
         "crashlytics.com": "crashlytics",
         "phicdn.net": "digicert_trust_seal",
+        "alphacdn.net": "edgio",
+        "edg.io": "edgio",
+        "edgecast.com": "edgio",
+        "edgecastcdn.net": "edgio",
+        "edgecastdns.net": "edgio",
+        "sigmacdn.net": "edgio",
         "element.io": "element",
         "riot.im": "element",
         "app-measurement.com": "firebase",
         "flipboard.com": "flipboard",
         "flurry.com": "flurry",
+        "ghcr.io": "github",
+        "github.dev": "github",
         "gmail.com": "gmail",
+        "googlehosted.com": "google_appspot",
         "gvt1.com": "google_servers",
         "gvt2.com": "google_servers",
         "gvt3.com": "google_servers",
@@ -23949,10 +24008,15 @@
         "kik.com": "kik",
         "apikik.com": "kik",
         "kik-live.com": "kik",
-        "letsencrypt.org": "lets_encrypt",
         "slatic.net": "lazada",
         "lencr.org": "lets_encrypt",
-        "edgecastcdn.net": "markmonitor",
+        "letsencrypt.org": "lets_encrypt",
+        "lgsmartad.com": "lgtv",
+        "lgtvcommon.com": "lgtv",
+        "lgtvsdp.com": "lgtv",
+        "lge.com": "lgtv",
+        "lg.com": "lgtv",
+        "markmonitor.com": "markmonitor",
         "matrix.org": "matrix",
         "medialab.la": "medialab",
         "media-lab.ai": "medialab",
@@ -23968,6 +24032,13 @@
         "mozilla.net": "mozilla",
         "mozilla.org": "mozilla",
         "nflximg.com": "netflix",
+        "nab.com": "nab",
+        "nab.com.au": "nab",
+        "nab.net": "nab",
+        "nabgroup.com": "nab",
+        "national.com.au": "nab",
+        "nationalaustraliabank.com.au": "nab",
+        "nationalbank.com.au": "nab",
         "notion.so": "notion",
         "ntp.org": "ntppool",
         "ntppool.org": "ntppool",
@@ -23984,6 +24055,7 @@
         "plex.direct": "plex",
         "xtracloud.net": "qualcomm",
         "qualcomm.com": "qualcomm",
+        "recaptcha.net": "recaptcha",
         "sectigo.com": "sectigo",
         "showrss.info": "showrss",
         "similarweb.io": "similarweb",
diff --git a/internal/filtering/servicelist.go b/internal/filtering/servicelist.go
index 6e02536a..112db944 100644
--- a/internal/filtering/servicelist.go
+++ b/internal/filtering/servicelist.go
@@ -1370,6 +1370,7 @@ var blockedServices = []blockedService{{
 		"||mastodon.au^",
 		"||mastodon.bida.im^",
 		"||mastodon.com.tr^",
+		"||mastodon.eus^",
 		"||mastodon.green^",
 		"||mastodon.ie^",
 		"||mastodon.iriseden.eu^",
@@ -1397,7 +1398,6 @@ var blockedServices = []blockedService{{
 		"||mindly.social^",
 		"||mstdn.ca^",
 		"||mstdn.jp^",
-		"||mstdn.party^",
 		"||mstdn.social^",
 		"||muenchen.social^",
 		"||newsie.social^",
@@ -1435,11 +1435,11 @@ var blockedServices = []blockedService{{
 		"||toot.wales^",
 		"||troet.cafe^",
 		"||twingyeo.kr^",
-		"||uiuxdev.social^",
 		"||union.place^",
 		"||universeodon.com^",
 		"||urbanists.social^",
 		"||vocalodon.net^",
+		"||wien.rocks^",
 		"||wxw.moe^",
 	},
 }, {
@@ -1636,6 +1636,14 @@ var blockedServices = []blockedService{{
 		"||snapchat.com^",
 		"||snapkit.co",
 	},
+}, {
+	ID:      "soundcloud",
+	Name:    "SoundCloud",
+	IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 24 24\" fill-rule=\"evenodd\" clip-rule=\"evenodd\"><path d=\"M19 17.75c2.07 0 3.75-1.68 3.75-3.75 0-2.07-1.68-3.75-3.75-3.75-.173 0-.344.012-.511.035-.73-2.337-2.913-4.035-5.489-4.035-.818 0-1.596.171-2.301.48-.273.119-.449.389-.449.687l0 9.583c0 .414.336.75.75.75l8 0zM7.25 8l0 9c0 .414.336.75.75.75.414 0 .75-.336.75-.75l0-9c0-.414-.336-.75-.75-.75-.414 0-.75.336-.75.75zM4.25 10l0 7c0 .414.336.75.75.75.414 0 .75-.336.75-.75l0-7c0-.414-.336-.75-.75-.75-.414 0-.75.336-.75.75zM1.25 12l0 5c0 .414.336.75.75.75.414 0 .75-.336.75-.75l0-5c0-.414-.336-.75-.75-.75-.414 0-.75.336-.75.75z\"/></svg>"),
+	Rules: []string{
+		"||sndcdn.com^",
+		"||soundcloud.com^",
+	},
 }, {
 	ID:      "spotify",
 	Name:    "Spotify",
diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh
index b367153f..3216b40a 100644
--- a/scripts/make/go-lint.sh
+++ b/scripts/make/go-lint.sh
@@ -35,7 +35,7 @@ set -f -u
 go_version="$( "${GO:-go}" version )"
 readonly go_version
 
-go_min_version='go1.19.6'
+go_min_version='go1.19.7'
 go_version_msg="
 warning: your go version (${go_version}) is different from the recommended minimal one (${go_min_version}).
 if you have the version installed, please set the GO environment variable.