Merge branch 'master' into 2145-optimistic-cache

CHANGELOG.md

@@ -10,7 +10,7 @@ and this project adheres to
 ## [Unreleased]
 
 <!--
-## [v0.107.0] - 2021-06-28 (APPROX.)
+## [v0.107.0] - 2021-08-03 (APPROX.)
 -->
 
 ### Added
@@ -54,15 +54,13 @@ and this project adheres to
 
 ### Deprecated
 
-<!--
-TODO(a.garipov): Remove the Go 1.16 deprecation message if Go 1.17 is not
-released by then.
--->
-
 - Go 1.16 support.  v0.108.0 will require at least Go 1.17 to build.
 
 ### Fixed
 
+- Domain name letter case mismatches in DNS rewrites ([#3351]).
+- Conflicts between IPv4 and IPv6 DNS rewrites ([#3343]).
+- Letter case mismatches in `CNAME` filtering ([#3335]).
 - Occasional breakages on network errors with DNS-over-HTTP upstreams ([#3217]).
 - Errors when setting static IP on Linux ([#3257]).
 - Treatment of domain names and FQDNs in custom rules with `$dnsrewrite` that
@@ -103,6 +101,9 @@ released by then.
 [#3217]: https://github.com/AdguardTeam/AdGuardHome/issues/3217
 [#3256]: https://github.com/AdguardTeam/AdGuardHome/issues/3256
 [#3257]: https://github.com/AdguardTeam/AdGuardHome/issues/3257
+[#3335]: https://github.com/AdguardTeam/AdGuardHome/issues/3335
+[#3343]: https://github.com/AdguardTeam/AdGuardHome/issues/3343
+[#3351]: https://github.com/AdguardTeam/AdGuardHome/issues/3351
 
 
 

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:3.1'
+  'dockerGo': 'adguard/golang-ubuntu:3.3'
 
 'stages':
 - 'Make release':
@@ -266,7 +266,7 @@
     # need to build a few of these.
     'variables':
       'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:3.1'
+      'dockerGo': 'adguard/golang-ubuntu:3.3'
 # release-vX.Y.Z branches are the branches from which the actual final release
 # is built.
 - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -276,4 +276,4 @@
     # are the ones that actually get released.
     'variables':
       'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:3.1'
+      'dockerGo': 'adguard/golang-ubuntu:3.3'

bamboo-specs/test.yaml

@@ -5,7 +5,7 @@
   'key': 'AHBRTSPECS'
   'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:3.1'
+  'dockerGo': 'adguard/golang-ubuntu:3.3'
 
 'stages':
 - 'Tests':

client/src/__locales/be.json

@@ -68,6 +68,9 @@
     "dhcp_new_static_lease": "Новая статычная арэнда",
     "dhcp_static_leases_not_found": "Не знойдзена статычных арэнд DHCP",
     "dhcp_add_static_lease": "Дадаць статычную арэнду",
+    "dhcp_reset_leases": "Скінуць усё арэнды",
+    "dhcp_reset_leases_confirm": "Вы ўпэўнены, што хочаце выдаліць усё арэнды?",
+    "dhcp_reset_leases_success": "Арэнды DHCP паспяхова выдалены",
     "dhcp_reset": "Вы ўпэўнены, што хочаце скінуць налады DHCP?",
     "country": "Краіна",
     "city": "Горад",
@@ -481,10 +484,12 @@
     "encryption_key_source_content": "Уставіць змесціва зачыненага ключа",
     "stats_params": "Канфігурацыя статыстыкі",
     "config_successfully_saved": "Канфігурацыя паспяхова захавана",
+    "interval_6_hour": "6 гадзін",
     "interval_24_hour": "24 гадзіны",
     "interval_days": "{{count}} дзень",
     "interval_days_plural": "{{count}} дзён",
     "domain": "Дамен",
+    "punycode": "Punycode",
     "answer": "Адказ",
     "filter_added_successfully": "Спіс паспяхова дададзены",
     "filter_removed_successfully": "Спіс паспяхова выдалены",

client/src/__locales/cs.json

@@ -426,9 +426,9 @@
     "access_title": "Nastavení přístupu",
     "access_desc": "Zde můžete konfigurovat pravidla přístupu pro server DNS AdGuard Home.",
     "access_allowed_title": "Povolení klienti",
-    "access_allowed_desc": "Seznam adres CIDR nebo IP. Pokud je nakonfigurován, AdGuard Home bude přijímat požadavky pouze z těchto IP adres.",
+    "access_allowed_desc": "Seznam CIDR, IP adres nebo ID klientů. Pokud je nakonfigurován, AdGuard Home bude přijímat požadavky pouze od těchto klientů.",
     "access_disallowed_title": "Blokovaní klienti",
-    "access_disallowed_desc": "Seznam adres CIDR nebo IP. Pokud je nakonfigurován, AdGuard Home bude odmítat požadavky pouze z těchto IP adres.",
+    "access_disallowed_desc": "Seznam CIDR, IP adres nebo ID klientů. Pokud je nakonfigurován, AdGuard Home bude odmítat požadavky od těchto klientů. Pokud jsou povolení klienti nakonfigurováni, je toto pole ignorováno.",
     "access_blocked_title": "Blokované domény",
     "access_blocked_desc": "Nezaměňujte to s filtry. AdGuard Home zruší dotazy DNS odpovídající těmto doménám a tyto dotazy se neobjeví ani v protokolu dotazů. Zde můžete určit přesné názvy domén, zástupné znaky a pravidla filtrování URL adres, např. \"example.org\", \"*.example.org\" nebo \"||example.org^\".",
     "access_settings_saved": "Nastavení přístupu bylo úspěšně uloženo",
@@ -484,10 +484,12 @@
     "encryption_key_source_content": "Vložte obsahy soukromého klíče",
     "stats_params": "Konfigurace statistik",
     "config_successfully_saved": "Konfigurace byla úspěšně uložena",
+    "interval_6_hour": "6 hodin",
     "interval_24_hour": "24 hodin",
     "interval_days": "Dny: {{count}}",
     "interval_days_plural": "Dny: {{count}}",
     "domain": "Doména",
+    "punycode": "Punycode",
     "answer": "Odpověď",
     "filter_added_successfully": "Seznam byl úspěšně přidán",
     "filter_removed_successfully": "Seznam byl úspěšně odstraněn",

client/src/__locales/da.json

@@ -426,9 +426,9 @@
     "access_title": "Adgangsindstillinger",
     "access_desc": "Her kan du opsætte adgangsregler for AdGuard Home DNS-serveren.",
     "access_allowed_title": "Tilladte klienter",
-    "access_allowed_desc": "En liste over CIDR- eller IP-adresser. Hvis opsat, accepterer AdGuard Home kun forespørgsler fra disse IP-adresser.",
+    "access_allowed_desc": "En liste over CIDR-, IP-adresser eller klient-ID'er. Hvis opsat, accepterer AdGuard Home kun forespørgsler fra disse klienter.",
     "access_disallowed_title": "Ikke tilladte klienter",
-    "access_disallowed_desc": "En liste over CIDR- eller IP-adresser. Hvis opsat, dropper AdGuard Home forespørgsler fra disse IP-adresser.",
+    "access_disallowed_desc": "En liste over CIDR-, IP-adresser eller klient-ID'er. Hvis opsat, dropper AdGuard Home forespørgsler fra disse klienter. Opsættes tilladte klienter, ignoreres dette felt.",
     "access_blocked_title": "Ikke tilladte domæner",
     "access_blocked_desc": "Ikke at forveksle med filtre. AdGuard Home dropper DNS-forespørgsler matchende disse domæner, ej heller vil forespørgslerne optræde i forespørgselsloggen. Der kan angives præcise domænenavne, jokertegn eller URL-filterregler, f.eks. \"eksempel.org\", \"*.eksempel.org\", \"||eksempel.org^\" eller tilsvarende.",
     "access_settings_saved": "Adgangsindstillinger gemt",
@@ -484,10 +484,12 @@
     "encryption_key_source_content": "Indsæt indholdet af den private nøgle",
     "stats_params": "Statistikopsætning",
     "config_successfully_saved": "Opsætning er gemt",
+    "interval_6_hour": "6 timer",
     "interval_24_hour": "24 timer",
     "interval_days": "{{count}} dag",
     "interval_days_plural": "{{count}} dage",
     "domain": "Domæne",
+    "punycode": "Punycode",
     "answer": "Svar",
     "filter_added_successfully": "Listen er tilføjet",
     "filter_removed_successfully": "Listen er blevet fjernet",

client/src/__locales/de.json

@@ -426,9 +426,9 @@
     "access_title": "Zugriffsrechte",
     "access_desc": "Hier können Sie die Zugriffsregeln für den AdGuard Home DNS-Server konfigurieren.",
     "access_allowed_title": "Zugelassene Clients",
-    "access_allowed_desc": "Eine Liste von CIDR- oder IP-Adressen. Wenn konfiguriert, akzeptiert AdGuard Home nur Anfragen von diesen IP-Adressen.",
+    "access_allowed_desc": "Eine Liste von CIDRs, IP-Adressen oder Client-IDs. Wenn konfiguriert, akzeptiert AdGuard Home Anfragen von diesen Clients.",
     "access_disallowed_title": "Nicht zugelassene Clients",
-    "access_disallowed_desc": "Eine Liste von CIDR- oder IP-Adressen. Wenn konfiguriert, löscht AdGuard Home Anfragen von diesen IP-Adressen.",
+    "access_disallowed_desc": "Eine Liste von CIDRs, IP-Adressen oder Client-IDs. Wenn konfiguriert, löscht AdGuard Home Anfragen von diesen Clients. Wenn erlaubte Clients konfiguriert sind, wird dieses Feld ignoriert.",
     "access_blocked_title": "Nicht zugelassene Domains",
     "access_blocked_desc": "Verwechseln Sie dies nicht mit Filtern. AdGuard Home verwirft DNS-Abfragen, die mit diesen Domänen übereinstimmen, und diese Abfragen erscheinen nicht einmal im Abfrageprotokoll. Hier können Sie die genauen Domain-Namen, Wildcards und URL-Filter-Regeln angeben, z.B. 'beispiel.org', '*.beispiel.org' oder '||beispiel.org^'.",
     "access_settings_saved": "Zugriffseinstellungen erfolgreich gespeichert",
@@ -488,6 +488,7 @@
     "interval_days": "{{count}} Tag",
     "interval_days_plural": "{{count}} Tage",
     "domain": "Domain",
+    "punycode": "Punycode",
     "answer": "Antwort",
     "filter_added_successfully": "Der Filter wurde erfolgreich hinzugefügt",
     "filter_removed_successfully": "Der Filter wurde erfolgreich entfernt",

client/src/__locales/en.json

@@ -112,6 +112,8 @@
     "for_last_24_hours": "for the last 24 hours",
     "for_last_days": "for the last {{count}} day",
     "for_last_days_plural": "for the last {{count}} days",
+    "stats_disabled": "The statistics have been disabled. You can turn it on from the <0>settings page</0>.",
+    "stats_disabled_short": "The statistics have been disabled",
     "no_domains_found": "No domains found",
     "requests_count": "Requests count",
     "top_blocked_domains": "Top blocked domains",

client/src/__locales/es.json

@@ -426,9 +426,9 @@
     "access_title": "Configuración de acceso",
     "access_desc": "Aquí puedes configurar las reglas de acceso para el servidor DNS de AdGuard Home.",
     "access_allowed_title": "Clientes permitidos",
-    "access_allowed_desc": "Lista de CIDR o direcciones IP. Si está configurado, AdGuard Home solo aceptará peticiones de estas direcciones IP.",
+    "access_allowed_desc": "Lista de CIDR, direcciones IP o ID de clientes. Si está configurado, AdGuard Home aceptará peticiones solo de estos clientes.",
     "access_disallowed_title": "Clientes no permitidos",
-    "access_disallowed_desc": "Lista de CIDR o direcciones IP. Si está configurado, AdGuard Home descartará las peticiones de estas direcciones IP.",
+    "access_disallowed_desc": "Lista de CIDR, direcciones IP o ID de clientes. Si está configurado, AdGuard Home descartará las peticiones de estos clientes. Si se configuran clientes permitidos, este campo será ignorado.",
     "access_blocked_title": "Dominios no permitidos",
     "access_blocked_desc": "No debe confundirse con filtros. AdGuard Home descartará las consultas DNS que coincidan con estos dominios, y estas consultas ni siquiera aparecerán en el registro de consultas. Puedes especificar nombres de dominio exactos, comodines o reglas de filtrado de URL, por ejemplo: \"ejemplo.org\", \"*.ejemplo.org\" o \"||ejemplo.org^\" correspondientemente.",
     "access_settings_saved": "Configuración de acceso guardado correctamente",
@@ -484,10 +484,12 @@
     "encryption_key_source_content": "Pegar el contenido de la clave privada",
     "stats_params": "Configuración de estadísticas",
     "config_successfully_saved": "Configuración guardada correctamente",
+    "interval_6_hour": "6 horas",
     "interval_24_hour": "24 horas",
     "interval_days": "{{count}} día",
     "interval_days_plural": "{{count}} días",
     "domain": "Dominio",
+    "punycode": "Punycode",
     "answer": "Respuesta",
     "filter_added_successfully": "La lista ha sido añadida correctamente",
     "filter_removed_successfully": "La lista ha sido eliminada correctamente",
@@ -547,7 +549,7 @@
     "filtered_custom_rules": "Filtrado por reglas de filtrado personalizado",
     "choose_from_list": "Elegir de la lista",
     "add_custom_list": "Añadir lista personalizada",
-    "host_whitelisted": "El host está en la lista blanca",
+    "host_whitelisted": "El host está permitido",
     "check_ip": "Direcciones IP: {{ip}}",
     "check_cname": "CNAME: {{cname}}",
     "check_reason": "Razón: {{reason}}",
@@ -572,7 +574,7 @@
     "validated_with_dnssec": "Validado con DNSSEC",
     "all_queries": "Todas las consultas",
     "show_blocked_responses": "Bloqueado",
-    "show_whitelisted_responses": "En lista blanca",
+    "show_whitelisted_responses": "Permitido",
     "show_processed_responses": "Procesado",
     "blocked_safebrowsing": "Bloqueado por navegación segura",
     "blocked_adult_websites": "Sitios web para adultos bloqueado",

client/src/__locales/it.json

@@ -426,9 +426,9 @@
     "access_title": "Impostazioni di accesso",
     "access_desc": "Qui puoi configurare le regole d'accesso per il server DNS di AdGuard Home.",
     "access_allowed_title": "Client permessi",
-    "access_allowed_desc": "Una lista in CIDR o indirizzi IP. Se configurata AdGuard Home accetterà richieste solo da questi indirizzi ip.",
+    "access_allowed_desc": "Una lista di CIDR, indirizzi IP o ID client. Se configurata AdGuard Home accetterà richieste solo da questi client.",
     "access_disallowed_title": "Client non permessi",
-    "access_disallowed_desc": "Una lista in CIDR o indirizzi IP. Se configurata AdGuard Home non accetterà richieste da questi indirizzi ip.",
+    "access_disallowed_desc": "Una lista di CIDR, indirizzi IP o ID client. Se configurata, AdGuard Home rifiuterà richieste da questi client. Se i client consentiti risulteranno configurati, questo campo verrà ignorato.",
     "access_blocked_title": "Domini bloccati",
     "access_blocked_desc": "Da non confondere con i filtri. AdGuard Home eliminerà le richieste DNS corrispondenti a questi domini e queste richieste non verranno visualizzate nel relativo registro. Puoi specificare nomi di dominio esatti, caratteri jolly o regole di filtraggio URL, ad esempio \"esempio.org\", \"*.esempio.org\" o \"||esempio.org^\".",
     "access_settings_saved": "Impostazioni di accesso salvate correttamente",
@@ -484,10 +484,12 @@
     "encryption_key_source_content": "Incolla i contenuti della chiave privata",
     "stats_params": "Configurazione delle statistiche",
     "config_successfully_saved": "Configurazione salvata correttamente",
+    "interval_6_hour": "6 ore",
     "interval_24_hour": "24 ore",
     "interval_days": "{{count}} giorni",
     "interval_days_plural": "{{count}} giorni",
     "domain": "Dominio",
+    "punycode": "Punycode",
     "answer": "Risposta",
     "filter_added_successfully": "Il filtro è stato aggiunto correttamente",
     "filter_removed_successfully": "La lista è stata correttamente rimossa",

client/src/__locales/ja.json

@@ -68,6 +68,9 @@
     "dhcp_new_static_lease": "新規静的割り当て",
     "dhcp_static_leases_not_found": "DHCP静的割り当てはありません",
     "dhcp_add_static_lease": "静的割り当てを追加する",
+    "dhcp_reset_leases": "すべてのリースをリセットする",
+    "dhcp_reset_leases_confirm": "すべてのリース（割り当て）をリセットしてもよろしいですか？",
+    "dhcp_reset_leases_success": "すべてのDHCPリース（割り当て）がリセット完了しました。",
     "dhcp_reset": "DHCP構成をリセットしてよろしいですか？",
     "country": "国",
     "city": "街",
@@ -423,9 +426,9 @@
     "access_title": "アクセス設定",
     "access_desc": "ここで、AdGuard Home DNSサーバのアクセスルールを設定できます。",
     "access_allowed_title": "許可されたクライアント",
-    "access_allowed_desc": "CIDRまたはIPアドレスのリスト。設定されると、AdGuard HomeはこれらのIPアドレスからのリクエストのみを許可します。",
+    "access_allowed_desc": "CIDR、IPアドレス、またはクライアントIDのリスト。設定されている場合、AdGuard HomeはこれらのIPアドレスからのリクエストのみを受け入れます。",
     "access_disallowed_title": "拒否するクライアント",
-    "access_disallowed_desc": "CIDRまたはIPアドレスのリスト。設定されると、AdGuard HomeはこれらのIPアドレスからのリクエストを破棄します。",
+    "access_disallowed_desc": "CIDR、IPアドレス、またはクライアントIDのリスト。設定されている場合、AdGuard HomeはこれらのIPアドレスからのリクエストを破棄します。「許可されたクライアント」欄が設定されている場合、この欄は無視されます。",
     "access_blocked_title": "拒否するドメイン",
     "access_blocked_desc": "こちらをフィルタと混同しないでください。AdGuard Homeは、ここで入力されたドメインに一致するDNSクエリをドロップし、そういったクエリはクエリログにも表示されません。ここでは、「example.org」、「*.example.org」、「 ||example.org^ 」など、特定のドメイン名、ワイルドカード、URLフィルタルールを入力できます。",
     "access_settings_saved": "アクセス設定の保存に成功しました",
@@ -481,10 +484,12 @@
     "encryption_key_source_content": "秘密鍵の内容をペーストする",
     "stats_params": "統計設定",
     "config_successfully_saved": "設定の保存に成功しました",
+    "interval_6_hour": "6時間",
     "interval_24_hour": "24時間",
     "interval_days": "{{count}}日",
     "interval_days_plural": "{{count}}日",
     "domain": "ドメイン",
+    "punycode": "Punycode",
     "answer": "応答",
     "filter_added_successfully": "フィルタの追加に成功しました",
     "filter_removed_successfully": "リストの削除に成功しました。",