From a3be6a9c19de358112a73c23588d4db9956af4fa Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Wed, 6 Dec 2023 17:56:12 +0300 Subject: [PATCH] Pull request 2098: upd-go Squashed commit of the following: commit 83b798475b6d31dde44d2ce3aaa1ef2fc42f7446 Author: Ainar Garipov Date: Wed Dec 6 17:35:26 2023 +0300 all: upd gen, go, i18n, tools --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- CHANGELOG.md | 8 +++++ bamboo-specs/release.yaml | 6 ++-- bamboo-specs/snapcraft.yaml | 6 ++-- bamboo-specs/test.yaml | 2 +- client/src/__locales/be.json | 17 ++++++++- client/src/__locales/cs.json | 5 ++- client/src/__locales/da.json | 5 ++- client/src/__locales/de.json | 5 ++- client/src/__locales/es.json | 5 ++- client/src/__locales/fi.json | 5 ++- client/src/__locales/fr.json | 14 +++++++- client/src/__locales/hr.json | 14 +++++++- client/src/__locales/hu.json | 5 ++- client/src/__locales/id.json | 5 ++- client/src/__locales/it.json | 14 +++++++- client/src/__locales/ja.json | 5 ++- client/src/__locales/ko.json | 14 +++++++- client/src/__locales/nl.json | 5 ++- client/src/__locales/pl.json | 5 ++- client/src/__locales/pt-br.json | 5 ++- client/src/__locales/pt-pt.json | 5 ++- client/src/__locales/ro.json | 14 +++++++- client/src/__locales/ru.json | 5 ++- client/src/__locales/sk.json | 5 ++- client/src/__locales/sl.json | 5 ++- client/src/__locales/sr-cs.json | 5 ++- client/src/__locales/sv.json | 13 ++++++- client/src/__locales/tr.json | 7 ++-- client/src/__locales/uk.json | 5 ++- client/src/__locales/vi.json | 5 ++- client/src/__locales/zh-cn.json | 5 ++- client/src/__locales/zh-tw.json | 5 ++- client/src/helpers/trackers/trackers.json | 42 +++++++++++++++++------ internal/tools/go.mod | 6 ++-- internal/tools/go.sum | 14 ++++---- scripts/make/go-lint.sh | 2 +- 38 files changed, 237 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1c35913..8a3af2fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ 'name': 'build' 'env': - 'GO_VERSION': '1.20.11' + 'GO_VERSION': '1.20.12' 'NODE_VERSION': '16' 'on': diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 144cc3f4..1ba27d28 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ 'name': 'lint' 'env': - 'GO_VERSION': '1.20.11' + 'GO_VERSION': '1.20.12' 'on': 'push': diff --git a/CHANGELOG.md b/CHANGELOG.md index 309140ff..abfd46b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,12 @@ See also the [v0.107.42 GitHub milestone][ms-v0.107.42]. NOTE: Add new changes BELOW THIS COMMENT. --> +### Security + +- Go version has been updated to prevent the possibility of exploiting the + CVE-2023-39326, CVE-2023-45283, and CVE-2023-45285 Go vulnerabilities fixed in + [Go 1.20.12][go-1.20.12]. + ### Added - Ability to set client's custom DNS cache ([#6362]). @@ -54,6 +60,8 @@ NOTE: Add new changes BELOW THIS COMMENT. [#6402]: https://github.com/AdguardTeam/AdGuardHome/issues/6402 [#6420]: https://github.com/AdguardTeam/AdGuardHome/issues/6420 +[go-1.20.12]: https://groups.google.com/g/golang-announce/c/iLGK3x6yuNo/m/z6MJ-eB0AQAJ + diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index 8743a21a..e7004570 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:7.5' + 'dockerGo': 'adguard/golang-ubuntu:7.6' 'stages': - 'Build frontend': @@ -272,7 +272,7 @@ # need to build a few of these. 'variables': 'channel': 'beta' - 'dockerGo': 'adguard/golang-ubuntu:7.5' + 'dockerGo': 'adguard/golang-ubuntu:7.6' # release-vX.Y.Z branches are the branches from which the actual final # release is built. - '^release-v[0-9]+\.[0-9]+\.[0-9]+': @@ -287,4 +287,4 @@ # are the ones that actually get released. 'variables': 'channel': 'release' - 'dockerGo': 'adguard/golang-ubuntu:7.5' + 'dockerGo': 'adguard/golang-ubuntu:7.6' diff --git a/bamboo-specs/snapcraft.yaml b/bamboo-specs/snapcraft.yaml index d802dba0..77948f13 100644 --- a/bamboo-specs/snapcraft.yaml +++ b/bamboo-specs/snapcraft.yaml @@ -10,7 +10,7 @@ # Make sure to sync any changes with the branch overrides below. 'variables': 'channel': 'edge' - 'dockerGo': 'adguard/golang-ubuntu:7.5' + 'dockerGo': 'adguard/golang-ubuntu:7.6' 'snapcraftChannel': 'edge' 'stages': @@ -191,7 +191,7 @@ # need to build a few of these. 'variables': 'channel': 'beta' - 'dockerGo': 'adguard/golang-ubuntu:7.5' + 'dockerGo': 'adguard/golang-ubuntu:7.6' 'snapcraftChannel': 'beta' # release-vX.Y.Z branches are the branches from which the actual final # release is built. @@ -207,5 +207,5 @@ # are the ones that actually get released. 'variables': 'channel': 'release' - 'dockerGo': 'adguard/golang-ubuntu:7.5' + 'dockerGo': 'adguard/golang-ubuntu:7.6' 'snapcraftChannel': 'candidate' diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index 746b599d..86e08cc4 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:7.5' + 'dockerGo': 'adguard/golang-ubuntu:7.6' 'stages': - 'Tests': diff --git a/client/src/__locales/be.json b/client/src/__locales/be.json index 359712fd..ad13bfac 100644 --- a/client/src/__locales/be.json +++ b/client/src/__locales/be.json @@ -1,6 +1,7 @@ { "client_settings": "Налады кліентаў", "example_upstream_reserved": "upstream <0>для канкрэтных даменаў;", + "example_multiple_upstreams_reserved": "некалькі DNS-сервераў <0>для канкрэтных даменаў;", "example_upstream_comment": "каментар.", "upstream_parallel": "Ужыць адначасныя запыты да ўсіх сервераў для паскарэння апрацоўкі запыту", "parallel_requests": "Паралельныя запыты", @@ -143,6 +144,8 @@ "enforced_save_search": "Ужыты бяспечны пошук", "number_of_dns_query_to_safe_search": "Колькасць запытаў DNS для пошукавых сістэм, для якіх быў ужыты Бяспечны пошук", "average_processing_time": "Сярэдні час апрацоўкі запыту", + "average_upstream_response_time": "Сярэдні час водгуку upstream-сервера", + "response_time": "Час водгуку", "average_processing_time_hint": "Сярэдні час для апрацоўкі запыту DNS у мілісекундах", "block_domain_use_filters_and_hosts": "Блакаваць дамены з выкарыстаннем фільтраў і файлаў хастоў", "filters_block_toggle_hint": "Вы можаце наладзіць правілы блакавання ў «Фільтрах».", @@ -307,6 +310,15 @@ "edns_use_custom_ip": "Выкарыстоўваць указаны IP для DNS", "edns_use_custom_ip_desc": "Дазволіць выкарыстоўваць уласны IP для DNS", "rate_limit_desc": "Абмежаванне на колькасць запытаў у секунду для кожнага кліента (0 — неабмежавана)", + "rate_limit_subnet_len_ipv4": "Даўжыня прэфікса падсеткі для адрасоў IPv4", + "rate_limit_subnet_len_ipv4_desc": "Даўжыня прэфікса падсеткі для адрасоў IPv4, якія выкарыстоўваюцца для абмежавання хуткасці. Значэнне па змаўчанні 24", + "rate_limit_subnet_len_ipv4_error": "Даўжыня прэфікса падсеткі IPv4 павінна быць ад 0 да 32", + "rate_limit_subnet_len_ipv6": "Даўжыня прэфікса падсеткі для адрасоў IPv6", + "rate_limit_subnet_len_ipv6_desc": "Даўжыня прэфікса падсеткі для адрасоў IPv6, якія выкарыстоўваюцца для абмежавання хуткасці. Значэнне па змаўчанні 56", + "rate_limit_subnet_len_ipv6_error": "Даўжыня прэфікса падсеткі IPv6 павінна быць ад 0 да 128", + "form_enter_rate_limit_subnet_len": "Увядзіце даўжыню прэфікса падсеткі для абмежавання хуткасці", + "rate_limit_whitelist": "Белы спіс з абмежаваннем хуткасці", + "rate_limit_whitelist_desc": "IP-адрасы выключаны з абмежавання хуткасці", "rate_limit_whitelist_placeholder": "Увядзіце па адным адрасе на радок", "blocking_ipv4_desc": "IP-адрас, што вяртаецца пры блакаванню A-запыту", "blocking_ipv6_desc": "IP-адрас, што вяртаецца пры блакаванню AAAA-запыту", @@ -722,5 +734,8 @@ "wednesday_short": "Ср.", "thursday_short": "Чц.", "friday_short": "Пт.", - "saturday_short": "Сб." + "saturday_short": "Сб.", + "upstream_dns_cache_configuration": "Канфігурацыя кэша upstream DNS-сервераў", + "enable_upstream_dns_cache": "Ўключыць кэшаванне для карыстацкай канфігурацыі upstream-сервераў гэтага кліента", + "dns_cache_size": "Памер кэша DNS, у байтах" } diff --git a/client/src/__locales/cs.json b/client/src/__locales/cs.json index 390aafcb..5d02697f 100644 --- a/client/src/__locales/cs.json +++ b/client/src/__locales/cs.json @@ -734,5 +734,8 @@ "wednesday_short": "Středa", "thursday_short": "Čtvrtek", "friday_short": "Pátek", - "saturday_short": "Sobota" + "saturday_short": "Sobota", + "upstream_dns_cache_configuration": "Konfigurace mezipaměti odchozího DNS", + "enable_upstream_dns_cache": "Povolit ukládání do mezipaměti DNS pro vlastní konfiguraci odchozího připojení tohoto klienta", + "dns_cache_size": "Velikost mezipaměti DNS v bajtech" } diff --git a/client/src/__locales/da.json b/client/src/__locales/da.json index da8dad42..005e60d7 100644 --- a/client/src/__locales/da.json +++ b/client/src/__locales/da.json @@ -734,5 +734,8 @@ "wednesday_short": "Ons", "thursday_short": "Tors", "friday_short": "Fre", - "saturday_short": "Lør" + "saturday_short": "Lør", + "upstream_dns_cache_configuration": "Upstream DNS-cacheopsætning", + "enable_upstream_dns_cache": "Aktivér DNS-cachelagring for denne klients tilpassede upstream-opsætning", + "dns_cache_size": "DNS-cachestørrelse i bytes" } diff --git a/client/src/__locales/de.json b/client/src/__locales/de.json index a495e39e..bf104daf 100644 --- a/client/src/__locales/de.json +++ b/client/src/__locales/de.json @@ -734,5 +734,8 @@ "wednesday_short": "Mi", "thursday_short": "Do", "friday_short": "Fr", - "saturday_short": "Sa" + "saturday_short": "Sa", + "upstream_dns_cache_configuration": "Konfiguration des Upstream-DNS-Cache", + "enable_upstream_dns_cache": "Caching für die benutzerdefinierte Upstream-Server-Konfiguration dieses Clients aktivieren", + "dns_cache_size": "Größe des DNS-Cache, in Bytes" } diff --git a/client/src/__locales/es.json b/client/src/__locales/es.json index a3ea63e5..c2f56ad3 100644 --- a/client/src/__locales/es.json +++ b/client/src/__locales/es.json @@ -734,5 +734,8 @@ "wednesday_short": "Mié.", "thursday_short": "Jue.", "friday_short": "Vie.", - "saturday_short": "Sáb." + "saturday_short": "Sáb.", + "upstream_dns_cache_configuration": "Configuración de la caché DNS upstream", + "enable_upstream_dns_cache": "Habilitar el almacenamiento en caché de DNS para la configuración personalizada de este cliente", + "dns_cache_size": "Tamaño de la caché DNS, en bytes" } diff --git a/client/src/__locales/fi.json b/client/src/__locales/fi.json index dd09ccb9..3aa68ca5 100644 --- a/client/src/__locales/fi.json +++ b/client/src/__locales/fi.json @@ -734,5 +734,8 @@ "wednesday_short": "Ke", "thursday_short": "To", "friday_short": "Pe", - "saturday_short": "La" + "saturday_short": "La", + "upstream_dns_cache_configuration": "Ylävirran DNS-välimuistin määritykset", + "enable_upstream_dns_cache": "Käytä DNS-välimuistia tämän päätelaitteen mukautetuissa ylävirtamäärityksissä", + "dns_cache_size": "DNS-välimuistin koko tavuina" } diff --git a/client/src/__locales/fr.json b/client/src/__locales/fr.json index 842b7148..eb09b830 100644 --- a/client/src/__locales/fr.json +++ b/client/src/__locales/fr.json @@ -310,6 +310,15 @@ "edns_use_custom_ip": "Utiliser une IP personnalisée pour EDNS", "edns_use_custom_ip_desc": "Autoriser l'utilisation d'une adresse IP personnalisée pour EDNS", "rate_limit_desc": "Le nombre de requêtes par seconde qu’un seul client est autorisé à faire. Le réglage 0 fait illimité.", + "rate_limit_subnet_len_ipv4": "Longueur du préfixe de sous-réseau pour les adresses IPv4", + "rate_limit_subnet_len_ipv4_desc": "Longueur du préfixe de sous-réseau pour les adresses IPv4 utilisé pour la limitation de vitesse. La valeur par défaut est 24", + "rate_limit_subnet_len_ipv4_error": "La longueur du préfixe du sous-réseau IPv4 doit être entre 0 et 32", + "rate_limit_subnet_len_ipv6": "Longueur du préfixe de sous-réseau pour les adresses IPv6", + "rate_limit_subnet_len_ipv6_desc": "Longueur du préfixe de sous-réseau pour les adresses IPv6 utilisé pour la limitation de débit. La valeur par défaut est 56", + "rate_limit_subnet_len_ipv6_error": "La longueur du préfixe du sous-réseau IPv6 doit être entre 0 et 128", + "form_enter_rate_limit_subnet_len": "Saisissez la longueur du préfixe de sous-réseau pour la limitation de débit", + "rate_limit_whitelist": "Liste d'autorisation de limitation de débit", + "rate_limit_whitelist_desc": "Adresses IP exclues de la limitation du débit", "rate_limit_whitelist_placeholder": "Saisissez une adresse IP par ligne", "blocking_ipv4_desc": "Adresse IP à renvoyer pour une demande A bloquée", "blocking_ipv6_desc": "Adresse IP à renvoyer pour une demande AAAA bloquée", @@ -725,5 +734,8 @@ "wednesday_short": "Mer.", "thursday_short": "Jeu.", "friday_short": "Ven.", - "saturday_short": "Sam." + "saturday_short": "Sam.", + "upstream_dns_cache_configuration": "Configuration du cache DNS en amont", + "enable_upstream_dns_cache": "Activer la mise en cache pour la configuration personnalisée du serveur en amont de ce client", + "dns_cache_size": "Taille du cache DNS, en bytes" } diff --git a/client/src/__locales/hr.json b/client/src/__locales/hr.json index f92ede4e..7fe2c68a 100644 --- a/client/src/__locales/hr.json +++ b/client/src/__locales/hr.json @@ -310,6 +310,15 @@ "edns_use_custom_ip": "Koristi prilagođeni IP za EDNS", "edns_use_custom_ip_desc": "Dopusti korištenje prilagođenog IP-a za EDNS", "rate_limit_desc": "Broj zahtjeva u sekundi koji su dopušteni po jednom klijentu. Postavljanje na 0 znači neograničeno.", + "rate_limit_subnet_len_ipv4": "Duljina prefiksa podmreže za IPv4 adrese", + "rate_limit_subnet_len_ipv4_desc": "Duljina prefiksa podmreže za IPv4 adrese koje se koriste za ograničavanje brzine. Zadana vrijednost je 24", + "rate_limit_subnet_len_ipv4_error": "Dužina IPv4 prefiksa podmreže trebala bi biti između 0 i 32", + "rate_limit_subnet_len_ipv6": "Duljina prefiksa podmreže za IPv6 adrese", + "rate_limit_subnet_len_ipv6_desc": "Duljina prefiksa podmreže za IPv6 adrese koje se koriste za ograničavanje brzine. Zadana vrijednost je 56", + "rate_limit_subnet_len_ipv6_error": "Dužina IPv6 prefiksa podmreže trebala bi biti između 0 i 128", + "form_enter_rate_limit_subnet_len": "Unesite duljinu prefiksa podmreže za ograničenje brzine", + "rate_limit_whitelist": "Popis dopuštenih za ograničavanje brzine", + "rate_limit_whitelist_desc": "IP adrese isključene iz ograničenja brzine", "rate_limit_whitelist_placeholder": "Unesite jednu adresu poslužitelja po retku", "blocking_ipv4_desc": "Povratna IP adresa za blokirane A zahtjeve", "blocking_ipv6_desc": "Povratna IP adresa za blokirane AAAA zahtjeve", @@ -725,5 +734,8 @@ "wednesday_short": "Sri", "thursday_short": "Čet", "friday_short": "Pet", - "saturday_short": "Sub" + "saturday_short": "Sub", + "upstream_dns_cache_configuration": "Konfiguracija predmemoriranja upstream DNS poslužitelja", + "enable_upstream_dns_cache": "Uključite keširanje za korisničku konfiguraciju upstream servera ovog klijenta", + "dns_cache_size": "Veličina DNS predmemorije, u bajtovima" } diff --git a/client/src/__locales/hu.json b/client/src/__locales/hu.json index e9a36123..40bf8512 100644 --- a/client/src/__locales/hu.json +++ b/client/src/__locales/hu.json @@ -734,5 +734,8 @@ "wednesday_short": "Szer", "thursday_short": "Csüt", "friday_short": "Pén", - "saturday_short": "Szom" + "saturday_short": "Szom", + "upstream_dns_cache_configuration": "Upstream DNS gyorsítótár konfigurációja", + "enable_upstream_dns_cache": "A DNS gyorsítótárazásának engedélyezése az ügyfél egyéni upstream konfigurációjához", + "dns_cache_size": "DNS gyorsítótár mérete, bájtokban" } diff --git a/client/src/__locales/id.json b/client/src/__locales/id.json index 0bea8a8a..a8671452 100644 --- a/client/src/__locales/id.json +++ b/client/src/__locales/id.json @@ -734,5 +734,8 @@ "wednesday_short": "Rab", "thursday_short": "Kam", "friday_short": "Jum", - "saturday_short": "Sab" + "saturday_short": "Sab", + "upstream_dns_cache_configuration": "Konfigurasi cache DNS upstream", + "enable_upstream_dns_cache": "Aktifkan cache DNS untuk konfigurasi upstream kustom klien ini", + "dns_cache_size": "Ukuran cache DNS, dalam byte" } diff --git a/client/src/__locales/it.json b/client/src/__locales/it.json index 7b9abc5f..fca0d970 100644 --- a/client/src/__locales/it.json +++ b/client/src/__locales/it.json @@ -310,6 +310,15 @@ "edns_use_custom_ip": "Usa IP personalizzato per EDNS", "edns_use_custom_ip_desc": "Consentire l'uso di un IP personalizzato per EDNS", "rate_limit_desc": "Il numero di richieste al secondo consentite da un singolo client. Impostare questo valore a 0 rimuove le limitazioni.", + "rate_limit_subnet_len_ipv4": "Lunghezza prefisso di sottorete per indirizzi IPv4", + "rate_limit_subnet_len_ipv4_desc": "Lunghezza prefisso sottorete per indirizzi IPv4 usati per la limitazione della velocità. Valore predefinito 24", + "rate_limit_subnet_len_ipv4_error": "La lunghezza del prefisso di sottorete IPv4 deve essere compresa tra 0 e 32", + "rate_limit_subnet_len_ipv6": "Lunghezza prefisso di sottorete per indirizzi IPv6", + "rate_limit_subnet_len_ipv6_desc": "Lunghezza prefisso di sottorete per indirizzi IPv6 usati per la limitazione della velocità. Valore predefinito 56", + "rate_limit_subnet_len_ipv6_error": "La lunghezza del prefisso di sottorete IPv6 deve essere compresa tra 0 e 128", + "form_enter_rate_limit_subnet_len": "Inserisci lunghezza prefisso di sottorete per limitazione velocità", + "rate_limit_whitelist": "Lista consentita per limitazione velocità", + "rate_limit_whitelist_desc": "Indirizzi IP esclusi dalla limitazione della velocità", "rate_limit_whitelist_placeholder": "Inserisci un indirizzo IP per riga", "blocking_ipv4_desc": "Indirizzo IP per una richiesta DNS IPv4 bloccata", "blocking_ipv6_desc": "Indirizzo IP restituito per una richiesta DNS IPv6 bloccata", @@ -725,5 +734,8 @@ "wednesday_short": "Mer", "thursday_short": "Gio", "friday_short": "Ven", - "saturday_short": "Sab" + "saturday_short": "Sab", + "upstream_dns_cache_configuration": "Configurazione cache DNS upstream", + "enable_upstream_dns_cache": "Abilita cache DNS per la configurazione upstream personalizzata del client", + "dns_cache_size": "Dimensioni cache DNS (in byte)" } diff --git a/client/src/__locales/ja.json b/client/src/__locales/ja.json index cfcb502b..63cd3c3f 100644 --- a/client/src/__locales/ja.json +++ b/client/src/__locales/ja.json @@ -734,5 +734,8 @@ "wednesday_short": "水", "thursday_short": "木", "friday_short": "金", - "saturday_short": "土" + "saturday_short": "土", + "upstream_dns_cache_configuration": "Upstream DNS cache configuration（アップストリームDNSキャッシュの構成）", + "enable_upstream_dns_cache": "このクライアントのカスタムアップストリーム構成に対してDNSキャッシュを有効にする", + "dns_cache_size": "DNSキャッシュサイズ（バイト単位）" } diff --git a/client/src/__locales/ko.json b/client/src/__locales/ko.json index 6df30031..e39ca472 100644 --- a/client/src/__locales/ko.json +++ b/client/src/__locales/ko.json @@ -310,6 +310,15 @@ "edns_use_custom_ip": "EDNS에 사용자 지정 IP 사용", "edns_use_custom_ip_desc": "EDNS에 사용자 지정 IP 사용하도록 허용합니다.", "rate_limit_desc": "단일 클라이언트에서 허용 가능한 초 당 요청 생성 숫자 (0: 무제한)", + "rate_limit_subnet_len_ipv4": "IPv4 주소의 서브넷 접두사 길이", + "rate_limit_subnet_len_ipv4_desc": "속도 제한에 사용되는 IPv4 주소의 서브넷 접두사 길이입니다. 기본값은 24입니다.", + "rate_limit_subnet_len_ipv4_error": "IPv4 서브넷 접두사 길이는 0에서 32 사이여야 합니다.", + "rate_limit_subnet_len_ipv6": "IPv6 주소의 서브넷 접두사 길이", + "rate_limit_subnet_len_ipv6_desc": "속도 제한에 사용되는 IPv6 주소의 서브넷 접두사 길이입니다. 기본값은 56입니다.", + "rate_limit_subnet_len_ipv6_error": "IPv6 서브넷 접두사 길이는 0에서 128 사이여야 합니다.", + "form_enter_rate_limit_subnet_len": "속도 제한을 위한 서브넷 접두사 길이를 입력하세요", + "rate_limit_whitelist": "속도 제한 허용 목록", + "rate_limit_whitelist_desc": "속도 제한에서 제외되는 IP 주소", "rate_limit_whitelist_placeholder": "한 줄에 하나씩 IP 주소를 입력하세요.", "blocking_ipv4_desc": "차단된 A 요청에 대해서 반환할 IP 주소", "blocking_ipv6_desc": "차단된 AAAA 요청에 대해서 반환할 IP 주소", @@ -725,5 +734,8 @@ "wednesday_short": "수", "thursday_short": "목", "friday_short": "금", - "saturday_short": "토" + "saturday_short": "토", + "upstream_dns_cache_configuration": "업스트림 DNS 캐시 설정", + "enable_upstream_dns_cache": "이 클라이언트의 사용자 지정 업스트림 설정에서 DNS 캐싱 사용", + "dns_cache_size": "DNS 캐시 크기(바이트)" } diff --git a/client/src/__locales/nl.json b/client/src/__locales/nl.json index 645e0fda..2fc0f1ee 100644 --- a/client/src/__locales/nl.json +++ b/client/src/__locales/nl.json @@ -734,5 +734,8 @@ "wednesday_short": "wo", "thursday_short": "do", "friday_short": "vr", - "saturday_short": "za" + "saturday_short": "za", + "upstream_dns_cache_configuration": "Upstream DNS-cacheconfiguratie", + "enable_upstream_dns_cache": "DNS-caching inschakelen voor de aangepaste upstream-configuratie van deze client", + "dns_cache_size": "DNS-cachegrootte, in bytes" } diff --git a/client/src/__locales/pl.json b/client/src/__locales/pl.json index 66230c89..d657eb06 100644 --- a/client/src/__locales/pl.json +++ b/client/src/__locales/pl.json @@ -734,5 +734,8 @@ "wednesday_short": "Śro", "thursday_short": "Czw", "friday_short": "Pt", - "saturday_short": "Sob" + "saturday_short": "Sob", + "upstream_dns_cache_configuration": "Konfiguracja pamięci podręcznej upstream serwerów DNS", + "enable_upstream_dns_cache": "Włącz pamięć podręczną dla niestandardowej konfiguracji serwera upstream tego klienta", + "dns_cache_size": "Rozmiar pamięci podręcznej DNS, w bajtach" } diff --git a/client/src/__locales/pt-br.json b/client/src/__locales/pt-br.json index 1fd38dac..83a6d9a0 100644 --- a/client/src/__locales/pt-br.json +++ b/client/src/__locales/pt-br.json @@ -734,5 +734,8 @@ "wednesday_short": "Quar", "thursday_short": "Qui", "friday_short": "Sex", - "saturday_short": "Sab" + "saturday_short": "Sab", + "upstream_dns_cache_configuration": "Configuração do cache de DNS upstream", + "enable_upstream_dns_cache": "Ativar o armazenamento em cache do DNS para a configuração de upstream personalizada deste cliente", + "dns_cache_size": "Tamanho do cache do DNS, em bytes" } diff --git a/client/src/__locales/pt-pt.json b/client/src/__locales/pt-pt.json index 20dda61c..8f6e6fcf 100644 --- a/client/src/__locales/pt-pt.json +++ b/client/src/__locales/pt-pt.json @@ -734,5 +734,8 @@ "wednesday_short": "Quarta", "thursday_short": "Quinta", "friday_short": "Sexta", - "saturday_short": "Sábado" + "saturday_short": "Sábado", + "upstream_dns_cache_configuration": "Configuração da cache do DNS upstream", + "enable_upstream_dns_cache": "Ativar o armazenamento em cache do DNS para a configuração de upstream personalizada deste cliente", + "dns_cache_size": "Tamanho da cache DNS, em bytes" } diff --git a/client/src/__locales/ro.json b/client/src/__locales/ro.json index f49a6085..03331064 100644 --- a/client/src/__locales/ro.json +++ b/client/src/__locales/ro.json @@ -310,6 +310,15 @@ "edns_use_custom_ip": "Utilizați IP personalizat pentru EDNS", "edns_use_custom_ip_desc": "Permiteți utilizarea IP-ului personalizat pentru EDNS", "rate_limit_desc": "Numărul de interogări pe secundă permise pe client. Setarea la 0 înseamnă că nu există limită.", + "rate_limit_subnet_len_ipv4": "Lungimea prefixului de subrețea pentru adrese IPv4", + "rate_limit_subnet_len_ipv4_desc": "Lungimea prefixului de subrețea pentru adresele IPv4 utilizate pentru limitarea ratei. Valoarea implicită este 24", + "rate_limit_subnet_len_ipv4_error": "Lungimea prefixului de subrețea IPv4 ar trebui să fie între 0 și 32", + "rate_limit_subnet_len_ipv6": "Lungimea prefixului de subrețea pentru adrese IPv6", + "rate_limit_subnet_len_ipv6_desc": "Lungimea prefixului de subrețea pentru adresele IPv6 utilizate pentru limitarea ratei. Valoarea implicită este 56", + "rate_limit_subnet_len_ipv6_error": "Lungimea prefixului de subrețea IPv6 ar trebui să fie între 0 și 128", + "form_enter_rate_limit_subnet_len": "Introduceți lungimea prefixului de subrețea pentru limitarea ratei", + "rate_limit_whitelist": "Lista permisă pentru limitarea ratei", + "rate_limit_whitelist_desc": "Adresele IP excluse de la limitarea ratei", "rate_limit_whitelist_placeholder": "Introduceți o adresă IP per linie", "blocking_ipv4_desc": "Adresa IP de returnat pentru o cerere A de blocare", "blocking_ipv6_desc": "Adresa IP de returnat pentru o cerere AAAA de blocare", @@ -725,5 +734,8 @@ "wednesday_short": "mi", "thursday_short": "jo", "friday_short": "vi", - "saturday_short": "sa" + "saturday_short": "sa", + "upstream_dns_cache_configuration": "Configurarea cache-ului DNS în amonte", + "enable_upstream_dns_cache": "Activați memoria cache DNS pentru configurația personalizată în amonte a acestui client", + "dns_cache_size": "Dimensiunea cache-ului DNS, în octeți" } diff --git a/client/src/__locales/ru.json b/client/src/__locales/ru.json index d5b6da4d..42ee4eb6 100644 --- a/client/src/__locales/ru.json +++ b/client/src/__locales/ru.json @@ -734,5 +734,8 @@ "wednesday_short": "Ср", "thursday_short": "Чт", "friday_short": "Пт", - "saturday_short": "Сб" + "saturday_short": "Сб", + "upstream_dns_cache_configuration": "Конфигурация кеша upstream DNS-серверов", + "enable_upstream_dns_cache": "Включить кеширование для пользовательской конфигурации upstream-серверов этого клиента", + "dns_cache_size": "Размер DNS-кеша в байтах" } diff --git a/client/src/__locales/sk.json b/client/src/__locales/sk.json index 5e32186f..d368fe3d 100644 --- a/client/src/__locales/sk.json +++ b/client/src/__locales/sk.json @@ -734,5 +734,8 @@ "wednesday_short": "Str", "thursday_short": "Štr", "friday_short": "Pia", - "saturday_short": "Sob" + "saturday_short": "Sob", + "upstream_dns_cache_configuration": "Konfigurácia cache pamäte DNS pre upstream", + "enable_upstream_dns_cache": "Zapnúť ukladanie DNS do cache pamäte pre vlastnú konfiguráciu odosielania tohto klienta", + "dns_cache_size": "Veľkosť cache pamäte DNS v bajtoch" } diff --git a/client/src/__locales/sl.json b/client/src/__locales/sl.json index b881039c..70e4eb93 100644 --- a/client/src/__locales/sl.json +++ b/client/src/__locales/sl.json @@ -734,5 +734,8 @@ "wednesday_short": "Sre", "thursday_short": "Čet", "friday_short": "Pet", - "saturday_short": "Sob" + "saturday_short": "Sob", + "upstream_dns_cache_configuration": "Nastavitve predpomnilnika gorvodnega DNS", + "enable_upstream_dns_cache": "Omogoči predpomnjenje nastavitev gorvodnega DNS po meri tega odjemalca", + "dns_cache_size": "Velikost predpomnilnika DNS, v bajtih" } diff --git a/client/src/__locales/sr-cs.json b/client/src/__locales/sr-cs.json index b07b34bb..583822e7 100644 --- a/client/src/__locales/sr-cs.json +++ b/client/src/__locales/sr-cs.json @@ -734,5 +734,8 @@ "wednesday_short": "Sre", "thursday_short": "Čet", "friday_short": "Pet", - "saturday_short": "Sub" + "saturday_short": "Sub", + "upstream_dns_cache_configuration": "Konfiguracija keša upstream DNS servera", + "enable_upstream_dns_cache": "Uključite keširanje za korisničku konfiguraciju upstream servera ovog klijenta", + "dns_cache_size": "Veličina DNS keša, u bajtovima" } diff --git a/client/src/__locales/sv.json b/client/src/__locales/sv.json index d656500d..a1a11a6f 100644 --- a/client/src/__locales/sv.json +++ b/client/src/__locales/sv.json @@ -310,6 +310,14 @@ "edns_use_custom_ip": "Använd anpassad IP för EDNS", "edns_use_custom_ip_desc": "Tillåt att använda anpassad IP för EDNS", "rate_limit_desc": "Antalet förfrågningar per sekund som tillåts per klient. Att sätta den till 0 innebär ingen gräns.", + "rate_limit_subnet_len_ipv4": "Prefixlängd för subnät för IPv4-adresser", + "rate_limit_subnet_len_ipv4_desc": "Subnätprefixlängd för IPv4-adresser som används för hastighetsbegränsning. Standard är 24", + "rate_limit_subnet_len_ipv4_error": "IPv4-subnätets prefixlängd ska vara mellan 0 och 32", + "rate_limit_subnet_len_ipv6": "Prefixlängd för subnät för IPv6-adresser", + "rate_limit_subnet_len_ipv6_desc": "Subnätprefixlängd för IPv6-adresser som används för hastighetsbegränsning. Standard är 56", + "rate_limit_subnet_len_ipv6_error": "IPv6-subnätets prefixlängd ska vara mellan 0 och 128", + "form_enter_rate_limit_subnet_len": "Ange subnätprefixlängd för hastighetsbegränsning", + "rate_limit_whitelist_desc": "IP-adresser uteslutna från hastighetsbegränsning", "rate_limit_whitelist_placeholder": "Ange en IP-adress per rad", "blocking_ipv4_desc": "IP adress som ska returneras för en blockerad A förfrågan", "blocking_ipv6_desc": "IP adress som ska returneras för en blockerad AAAA förfrågan", @@ -725,5 +733,8 @@ "wednesday_short": "Ons", "thursday_short": "Tor", "friday_short": "Fre", - "saturday_short": "Lör" + "saturday_short": "Lör", + "upstream_dns_cache_configuration": "Konfiguration av uppströms DNS-cache", + "enable_upstream_dns_cache": "Aktivera DNS-cachelagring för den här klientens anpassade uppströmskonfiguration", + "dns_cache_size": "DNS-cachestorlek, i byte" } diff --git a/client/src/__locales/tr.json b/client/src/__locales/tr.json index c0ecab73..3e0008ce 100644 --- a/client/src/__locales/tr.json +++ b/client/src/__locales/tr.json @@ -322,7 +322,7 @@ "rate_limit_whitelist_placeholder": "Her satıra bir IP adresi girin", "blocking_ipv4_desc": "Engellenen bir A isteği için geri döndürülecek IP adresi", "blocking_ipv6_desc": "Engellenen bir AAAA isteği için geri döndürülecek IP adresi", - "blocking_mode_default": "Varsayılan: Reklam engelleme tarzı kural tarafından engellendiğinde sıfır IP adresiyle (A için 0.0.0.0; :: AAAA için) yanıt verin; /etc/hosts-tarzı kural tarafından engellendiğinde, kuralda belirtilen IP adresiyle yanıt verin", + "blocking_mode_default": "Varsayılan: Reklam engelleme stili kuralı tarafından engellendiğinde sıfır IP adresiyle (A için 0.0.0.0; :: AAAA için) yanıt verin; /etc/hosts-tarzı kural tarafından engellendiğinde, kuralda belirtilen IP adresiyle yanıt verin", "blocking_mode_refused": "REFUSED: REFUSED koduyla yanıt verin", "blocking_mode_nxdomain": "NXDOMAIN: NXDOMAIN koduyla yanıt verin", "blocking_mode_null_ip": "Boş IP: Sıfır IP adresiyle yanıt verin (A için 0.0.0.0; :: AAAA için)", @@ -734,5 +734,8 @@ "wednesday_short": "Çar", "thursday_short": "Per", "friday_short": "Cum", - "saturday_short": "Cmt" + "saturday_short": "Cmt", + "upstream_dns_cache_configuration": "Üst kaynak DNS önbellek yapılandırması", + "enable_upstream_dns_cache": "Bu istemcinin özel üst kaynak yapılandırması için DNS önbelleğe almayı etkinleştir", + "dns_cache_size": "DNS önbellek boyutu, bayt cinsinden" } diff --git a/client/src/__locales/uk.json b/client/src/__locales/uk.json index 30b3864f..98a63085 100644 --- a/client/src/__locales/uk.json +++ b/client/src/__locales/uk.json @@ -734,5 +734,8 @@ "wednesday_short": "СР", "thursday_short": "ЧТ", "friday_short": "ПТ", - "saturday_short": "СБ" + "saturday_short": "СБ", + "upstream_dns_cache_configuration": "Конфігурація кешу upstream DNS-серверів", + "enable_upstream_dns_cache": "Увімкнути кешування для користувацької конфігурації upstream-серверів цього клієнта", + "dns_cache_size": "Розмір кешу DNS, у байтах" } diff --git a/client/src/__locales/vi.json b/client/src/__locales/vi.json index a58a509b..fb68549f 100644 --- a/client/src/__locales/vi.json +++ b/client/src/__locales/vi.json @@ -734,5 +734,8 @@ "wednesday_short": "Thứ 4", "thursday_short": "Thứ 5", "friday_short": "Thứ 6", - "saturday_short": "Thứ 7" + "saturday_short": "Thứ 7", + "upstream_dns_cache_configuration": "Cấu hình bộ nhớ đệm upstream của các máy chủ DNS", + "enable_upstream_dns_cache": "Bật bộ nhớ cache cho cấu hình ngược dòng của máy chủ upstream của khách hàng này", + "dns_cache_size": "Kích thước bộ nhớ cache DNS, tính bằng byte" } diff --git a/client/src/__locales/zh-cn.json b/client/src/__locales/zh-cn.json index 472a4fa5..8080c8db 100644 --- a/client/src/__locales/zh-cn.json +++ b/client/src/__locales/zh-cn.json @@ -734,5 +734,8 @@ "wednesday_short": "周三", "thursday_short": "周四", "friday_short": "周五", - "saturday_short": "周六" + "saturday_short": "周六", + "upstream_dns_cache_configuration": "上游 DNS 缓存配置", + "enable_upstream_dns_cache": "为该客户端的自定义上游配置启用 DNS 缓存", + "dns_cache_size": "DNS 缓存大小，单位：字节" } diff --git a/client/src/__locales/zh-tw.json b/client/src/__locales/zh-tw.json index 99bea7e7..def8ed3d 100644 --- a/client/src/__locales/zh-tw.json +++ b/client/src/__locales/zh-tw.json @@ -734,5 +734,8 @@ "wednesday_short": "週三", "thursday_short": "週四", "friday_short": "週五", - "saturday_short": "週六" + "saturday_short": "週六", + "upstream_dns_cache_configuration": "上游 DNS 快取設定", + "enable_upstream_dns_cache": "啟用本用戶端自訂上游配置的 DNS 快取", + "dns_cache_size": "DNS 快取大小，單位：位元" } diff --git a/client/src/helpers/trackers/trackers.json b/client/src/helpers/trackers/trackers.json index 8f32d0ee..b5016dfb 100644 --- a/client/src/helpers/trackers/trackers.json +++ b/client/src/helpers/trackers/trackers.json @@ -1,5 +1,5 @@ { - "timeUpdated": "2023-11-10T12:55:56.663Z", + "timeUpdated": "2023-12-01T15:24:07.522Z", "categories": { "0": "audio_video_player", "1": "comments", @@ -640,7 +640,8 @@ "name": "AdChina", "categoryId": 4, "url": "http://www.adchina.com/", - "companyId": "alibaba" + "companyId": null, + "source": "AdGuard" }, "adcito": { "name": "Adcito", @@ -1321,6 +1322,13 @@ "companyId": "adobe", "source": "AdGuard" }, + "adobe_experience_league": { + "name": "Adobe Experience League", + "categoryId": 6, + "url": "https://experienceleague.adobe.com/", + "companyId": "adobe", + "source": "AdGuard" + }, "adobe_login": { "name": "Adobe Login", "categoryId": 2, @@ -2281,27 +2289,29 @@ "name": "Alibaba", "categoryId": 8, "url": "http://www.alibaba.com/", - "companyId": "alibaba" + "companyId": "softbank", + "source": "AdGuard" }, "alibaba_cloud": { "name": "Alibaba Cloud", "categoryId": 10, "url": "https://www.alibabacloud.com/", - "companyId": "alibaba", + "companyId": "softbank", "source": "AdGuard" }, "alibaba_ucbrowser": { "name": "UC Browser", "categoryId": 8, "url": "https://ucweb.com/", - "companyId": "alibaba", + "companyId": "softbank", "source": "AdGuard" }, "alipay.com": { "name": "Alipay", "categoryId": 2, - "url": "https://www.alipay.com/", - "companyId": "alibaba" + "url": "https://global.alipay.com/", + "companyId": "softbank", + "source": "AdGuard" }, "alivechat": { "name": "AliveChat", @@ -3767,10 +3777,11 @@ "companyId": "branica" }, "braze": { - "name": "Braze", + "name": "Braze, Inc.", "categoryId": 6, "url": "https://www.braze.com/", - "companyId": "braze_inc" + "companyId": "braze", + "source": "AdGuard" }, "brealtime": { "name": "EMX Digital", @@ -12534,7 +12545,7 @@ "name": "Network Time Protocol", "categoryId": 5, "url": "https://ntp.org/", - "companyId": "ntppool", + "companyId": "network_time_foundation", "source": "AdGuard" }, "nttcom_online_marketing_solutions": { @@ -17062,7 +17073,8 @@ "name": "Taobao", "categoryId": 4, "url": "https://world.taobao.com/", - "companyId": "alibaba" + "companyId": "softbank", + "source": "AdGuard" }, "tapad": { "name": "Tapad", @@ -20431,6 +20443,7 @@ "nedstat.com": "adobe_experience_cloud", "omtrdc.net": "adobe_experience_cloud", "sitestat.com": "adobe_experience_cloud", + "adobedc.net": "adobe_experience_league", "adobelogin.com": "adobe_login", "adobetag.com": "adobe_tagmanager", "typekit.com": "adobe_typekit", @@ -21046,6 +21059,7 @@ "brandwire.tv": "brandwire.tv", "branica.com": "branica", "appboycdn.com": "braze", + "braze.com": "braze", "brealtime.com": "brealtime", "bridgetrack.com": "bridgetrack", "brightcove.com": "brightcove", @@ -23140,8 +23154,11 @@ "s-microsoft.com": "microsoft", "trouter.io": "microsoft", "windows.net": "microsoft", + "aka.ms": "microsoft", + "microsoftazuread-sso.com": "microsoft", "bingapis.com": "microsoft", "msauth.net": "microsoft", + "msauthimages.net": "microsoft", "msftauth.net": "microsoft", "msftstatic.com": "microsoft", "msidentity.com": "microsoft", @@ -23232,10 +23249,13 @@ "mrpdata.net": "mrpdata", "mrskincash.com": "mrskincash", "a-msedge.net": "msedge", + "b-msedge.net": "msedge", "e-msedge.net": "msedge", + "k-msedge.net": "msedge", "l-msedge.net": "msedge", "s-msedge.net": "msedge", "t-msedge.net": "msedge", + "wac-msedge.net": "msedge", "msn.com": "msn", "s-msn.com": "msn", "musculahq.appspot.com": "muscula", diff --git a/internal/tools/go.mod b/internal/tools/go.mod index a2e3bc9a..36e339fa 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -10,7 +10,7 @@ require ( github.com/kyoh86/looppointer v0.2.1 github.com/securego/gosec/v2 v2.18.2 github.com/uudashr/gocognit v1.1.2 - golang.org/x/tools v0.15.0 + golang.org/x/tools v0.16.0 golang.org/x/vuln v1.0.1 honnef.co/go/tools v0.4.6 mvdan.cc/gofumpt v0.5.0 @@ -26,9 +26,9 @@ require ( github.com/kyoh86/nolint v0.0.1 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect - golang.org/x/exp/typeparams v0.0.0-20231110203233-9a3e6036ecaa // indirect + golang.org/x/exp/typeparams v0.0.0-20231127185646-65229373498e // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/tools/go.sum b/internal/tools/go.sum index e9284b47..82c69078 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -49,8 +49,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/exp/typeparams v0.0.0-20231110203233-9a3e6036ecaa h1:wJBD77KpXKOckDJT0rqU5EwZDmxcmTh6aXVpU6s6GBg= -golang.org/x/exp/typeparams v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20231127185646-65229373498e h1:Iel2aGgaO80fSb1N54L7SE6XMeVvYy6caKt8u/5LvR8= +golang.org/x/exp/typeparams v0.0.0-20231127185646-65229373498e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= @@ -63,7 +63,7 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -79,8 +79,8 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -93,8 +93,8 @@ golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4X golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= +golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/vuln v1.0.1 h1:KUas02EjQK5LTuIx1OylBQdKKZ9jeugs+HiqO5HormU= golang.org/x/vuln v1.0.1/go.mod h1:bb2hMwln/tqxg32BNY4CcxHWtHXuYa3SbIBmtsyjxtM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh index 6571d90d..c04499a1 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.20.11' +go_min_version='go1.20.12' 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.