Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home into AG-21485

Login theme bugfix.
2023-04-18 14:27:28 +03:00 · 2023-04-18 14:11:28 +03:00
53 changed files with 298 additions and 548 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
 /snapcraft_login
 AdGuardHome*
 coverage.txt
+leases.db
 node_modules/

 !/build/gitkeep
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,39 +14,20 @@ and this project adheres to
 <!--
 ## [v0.108.0] - TBA

-## [v0.107.30] - 2023-04-26 (APPROX.)
+## [v0.107.29] - 2023-04-26 (APPROX.)

-See also the [v0.107.30 GitHub milestone][ms-v0.107.30].
+See also the [v0.107.29 GitHub milestone][ms-v0.107.29].

-[ms-v0.107.30]: https://github.com/AdguardTeam/AdGuardHome/milestone/66?closed=1
+[ms-v0.107.29]: https://github.com/AdguardTeam/AdGuardHome/milestone/65?closed=1

 NOTE: Add new changes BELOW THIS COMMENT.
 -->

-### Fixed
-
- Provided bootstrap servers are now used to resolve the hostnames of plain
-  UDP/TCP upstream servers.
-
-<!--
-NOTE: Add new changes ABOVE THIS COMMENT.
-->
-
-
-
-## [v0.107.29] - 2023-04-18
-
-See also the [v0.107.29 GitHub milestone][ms-v0.107.29].
-
 ### Added

 - The ability to exclude client activity from the query log or statistics by
-  editing client's settings on the respective page in the UI ([#1717], [#4299]).
-
-### Changed
-
- Stored DHCP leases moved from `leases.db` to `data/leases.json`.  The file
-  format has also been optimized.
+  editing client's settings on the Clients settings page in the UI  ([#1717],
+  [#4299]).

 ### Fixed

@@ -57,11 +38,14 @@ See also the [v0.107.29 GitHub milestone][ms-v0.107.29].
 - All Safe Search services being unchecked by default.
 - Panic when a DNSCrypt stamp is invalid ([#5721]).

-[#5712]: https://github.com/AdguardTeam/AdGuardHome/issues/5712
+[#1717]: https://github.com/AdguardTeam/AdGuardHome/issues/1717
+[#4299]: https://github.com/AdguardTeam/AdGuardHome/issues/4299
 [#5721]: https://github.com/AdguardTeam/AdGuardHome/issues/5721
 [#5725]: https://github.com/AdguardTeam/AdGuardHome/issues/5725

-[ms-v0.107.29]: https://github.com/AdguardTeam/AdGuardHome/milestone/65?closed=1
+<!--
+NOTE: Add new changes ABOVE THIS COMMENT.
+-->



@@ -186,9 +170,11 @@ In this release, the schema version has changed from 17 to 20.
 [#1163]: https://github.com/AdguardTeam/AdGuardHome/issues/1163
 [#1333]: https://github.com/AdguardTeam/AdGuardHome/issues/1333
 [#1472]: https://github.com/AdguardTeam/AdGuardHome/issues/1472
+[#1717]: https://github.com/AdguardTeam/AdGuardHome/issues/1717
 [#3290]: https://github.com/AdguardTeam/AdGuardHome/issues/3290
 [#3459]: https://github.com/AdguardTeam/AdGuardHome/issues/3459
 [#4262]: https://github.com/AdguardTeam/AdGuardHome/issues/4262
+[#4299]: https://github.com/AdguardTeam/AdGuardHome/issues/4299
 [#5567]: https://github.com/AdguardTeam/AdGuardHome/issues/5567
 [#5701]: https://github.com/AdguardTeam/AdGuardHome/issues/5701

@@ -1954,12 +1940,11 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].


 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.30...HEAD
-[v0.107.30]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.29...v0.107.30
-->
-
 [Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.29...HEAD
 [v0.107.29]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.28...v0.107.29
+-->
+
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.28...HEAD
 [v0.107.28]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.27...v0.107.28
 [v0.107.27]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.26...v0.107.27
 [v0.107.26]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.25...v0.107.26
--- a/client/src/__locales/ar.json
+++ b/client/src/__locales/ar.json
@@ -635,6 +635,5 @@
    "parental_control": "الرقابة الابويه",
    "safe_browsing": "تصفح آمن",
    "served_from_cache": "{{value}} <i>(يتم تقديمه من ذاكرة التخزين المؤقت)</i>",
-    "form_error_password_length": "يجب أن تتكون كلمة المرور من {{value}} من الأحرف على الأقل",
-    "protection_section_label": "الحماية"
+    "form_error_password_length": "يجب أن تتكون كلمة المرور من {{value}} من الأحرف على الأقل"
 }
--- a/client/src/__locales/be.json
+++ b/client/src/__locales/be.json
@@ -642,6 +642,5 @@
    "anonymizer_notification": "<0>Заўвага:</0> Ананімізацыя IP уключана. Вы можаце адключыць яе ў <1>Агульных наладах</1>.",
    "confirm_dns_cache_clear": "Вы ўпэўнены, што хочаце ачысціць кэш DNS?",
    "cache_cleared": "Кэш DNS паспяхова ачышчаны",
-    "clear_cache": "Ачысціць кэш",
-    "protection_section_label": "Ахова"
+    "clear_cache": "Ачысціць кэш"
 }
--- a/client/src/__locales/cs.json
+++ b/client/src/__locales/cs.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Protokol dotazů byl úspěšně vymazán",
    "query_log_updated": "Protokol dotazů byl úspěšně aktualizován",
    "query_log_clear": "Vymazat protokoly dotazů",
-    "query_log_retention": "Rotace protokolů dotazů",
+    "query_log_retention": "Uchování protokolů dotazů",
    "query_log_enable": "Povolit protokol",
    "query_log_configuration": "Konfigurace protokolů",
    "query_log_disabled": "Protokol dotazu je zakázán a lze jej nakonfigurovat v <0>nastavení</0>",
    "query_log_strict_search": "Pro striktní vyhledávání použijte dvojité uvozovky",
-    "query_log_retention_confirm": "Opravdu chcete změnit rotaci protokolu dotazů? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
+    "query_log_retention_confirm": "Opravdu chcete změnit uchovávání protokolu dotazů? Pokud snížíte hodnotu intervalu, některá data budou ztracena",
    "anonymize_client_ip": "Anonymizovat IP klienta",
    "anonymize_client_ip_desc": "Neukládat úplnou IP adresu klienta do protokolů a statistik",
    "dns_config": "Konfigurace DNS serveru",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Vypnout ochranu na {{count}} hod.",
    "disable_notify_for_hours_plural": "Vypnout ochranu na {{count}} hod.",
    "disable_notify_until_tomorrow": "Vypnout ochranu do zítřka",
-    "enable_protection_timer": "Ochrana bude zapnuta za {{time}}",
-    "custom_retention_input": "Zadejte retenci v hodinách",
-    "custom_rotation_input": "Zadejte rotaci v hodinách",
-    "protection_section_label": "Ochrana",
-    "log_and_stats_section_label": "Protokol dotazů a statistiky",
-    "ignore_query_log": "Ignorovat tohoto klienta v protokolu dotazů",
-    "ignore_statistics": "Ignorovat tohoto klienta ve statistikách"
+    "enable_protection_timer": "Ochrana bude zapnuta za {{time}}"
 }
--- a/client/src/__locales/da.json
+++ b/client/src/__locales/da.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Forespørgselsloggen er blevet ryddet",
    "query_log_updated": "Forespørgselsloggen er blevet opdateret",
    "query_log_clear": "Ryd forespørgselslogfiler",
-    "query_log_retention": "Rotation af forespørgselslog",
+    "query_log_retention": "Opbevar forespørgselslogger i",
    "query_log_enable": "Aktivér log",
    "query_log_configuration": "Opsætning af logger",
    "query_log_disabled": "Forespørgselsloggen er deaktiveret og kan opsættes i <0>indstillingerne</0>",
    "query_log_strict_search": "Brug dobbelt anførselstegn til stringent søgning",
-    "query_log_retention_confirm": "Sikker på, at forespørgselsloggens rotationstid skal ændres? Mindskes intervalværdien, mistes nogle data",
+    "query_log_retention_confirm": "Sikker på, at du vil ændre forespørgselsloggens opbevaringperiode? Mindskes intervalværdien, mistes data",
    "anonymize_client_ip": "Anonymisér klient-IP",
    "anonymize_client_ip_desc": "Gem ikke fuld klient IP-adresse i logfiler eller statistikker",
    "dns_config": "DNS-serveropsætning",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Deaktivere beskyttelse i {{count}} time",
    "disable_notify_for_hours_plural": "Deaktivere beskyttelse i {{count}} timer",
    "disable_notify_until_tomorrow": "Deaktiver beskyttelse indtil i morgen",
-    "enable_protection_timer": "Beskyttelse deaktiveres om {{time}}",
-    "custom_retention_input": "Angiv opbevaringstid i timer",
-    "custom_rotation_input": "Angiv rotationstid i timer",
-    "protection_section_label": "Beskyttelse",
-    "log_and_stats_section_label": "Forespørgselslog og statistik",
-    "ignore_query_log": "Ignorér denne klient i forespørgselslog",
-    "ignore_statistics": "Ignorér denne klient i statistik"
+    "enable_protection_timer": "Beskyttelse deaktiveres om {{time}}"
 }
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Das Abfrageprotokoll wurde erfolgreich gelöscht",
    "query_log_updated": "Das Abfrageprotokoll wurde erfolgreich aktualisiert",
    "query_log_clear": "Abfrageprotokolle leeren",
-    "query_log_retention": "Rotation der Abfrageprotokolle",
+    "query_log_retention": "Abfrageprotokolle aufbewahren",
    "query_log_enable": "Protokoll aktivieren",
    "query_log_configuration": "Konfiguration der Protokolle",
    "query_log_disabled": "Das Abfrageprotokoll ist deaktiviert und kann in den <0>Einstellungen</0> konfiguriert werden.",
    "query_log_strict_search": "Doppelte Anführungszeichen für die strikte Suche verwenden",
-    "query_log_retention_confirm": "Möchten Sie die Abfrageprotokollrotation wirklich ändern? Wenn Sie den Intervallwert verringern, gehen einige Daten verloren",
+    "query_log_retention_confirm": "Möchten Sie die Aufbewahrung des Abfrageprotokolls wirklich ändern? Wenn Sie den Zeitabstand verringern, gehen einige Daten verloren.",
    "anonymize_client_ip": "Client-IP anonymisieren",
    "anonymize_client_ip_desc": "Vollständige IP-Adresse des Clients nicht in Protokollen und Statistiken speichern",
    "dns_config": "DNS-Serverkonfiguration",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Schutz für {{count}} Stunde deaktivieren",
    "disable_notify_for_hours_plural": "Schutz für {{count}} Stunden deaktivieren",
    "disable_notify_until_tomorrow": "Schutz bis morgen deaktivieren",
-    "enable_protection_timer": "Der Schutz wird in {{time}} wieder aktiviert",
-    "custom_retention_input": "Rückhaltezeit in Stunden eingeben",
-    "custom_rotation_input": "Rotation in Stunden eingeben",
-    "protection_section_label": "Schutz",
-    "log_and_stats_section_label": "Abfrageprotokoll und Statistik",
-    "ignore_query_log": "Diesen Client im Abfrageprotokoll ignorieren",
-    "ignore_statistics": "Diesen Client in der Statistik ignorieren"
+    "enable_protection_timer": "Der Schutz wird in {{time}} wieder aktiviert"
 }
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "El registro de consultas se ha borrado correctamente",
    "query_log_updated": "El registro de consultas se ha actualizado correctamente",
    "query_log_clear": "Borrar registros de consultas",
-    "query_log_retention": "Rotanción de registros de consultas",
+    "query_log_retention": "Retención de registros de consultas",
    "query_log_enable": "Habilitar registro",
    "query_log_configuration": "Configuración de registros",
    "query_log_disabled": "El registro de consultas está deshabilitado y se puede configurar en la <0>configuración</0>",
    "query_log_strict_search": "Usar comillas dobles para una búsqueda estricta",
-    "query_log_retention_confirm": "¿Está seguro de que deseas cambiar la rotación del registro de consultas? Si reduces el valor del intervalo, se perderán algunos datos",
+    "query_log_retention_confirm": "¿Estás seguro de que deseas cambiar la retención del registro de consultas? Si disminuye el valor del intervalo, se perderán algunos datos",
    "anonymize_client_ip": "Anonimizar IP del cliente",
    "anonymize_client_ip_desc": "No guarda la dirección IP completa del cliente en registros o estadísticas",
    "dns_config": "Configuración del servidor DNS",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Desactivar la protección por {{count}} hora",
    "disable_notify_for_hours_plural": "Desactivar la protección por {{count}} horas",
    "disable_notify_until_tomorrow": "Desactivar la protección hasta mañana",
-    "enable_protection_timer": "La protección se activará en {{time}}",
-    "custom_retention_input": "Ingresa la retención en horas",
-    "custom_rotation_input": "Ingresa la rotación en horas",
-    "protection_section_label": "Protección",
-    "log_and_stats_section_label": "Registro de consultas y estadísticas",
-    "ignore_query_log": "Ignorar este cliente en el registro de consultas",
-    "ignore_statistics": "Ignorar este cliente en las estadísticas"
+    "enable_protection_timer": "La protección se activará en {{time}}"
 }
--- a/client/src/__locales/fi.json
+++ b/client/src/__locales/fi.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Pyyntöhistorian tyhjennys onnistui",
    "query_log_updated": "Pyyntöhistorian päivitys onnistui",
    "query_log_clear": "Tyhjennä pyyntöhistoria",
-    "query_log_retention": "Kyselylokien kierto",
+    "query_log_retention": "Pyyntöhistorian säilytys",
    "query_log_enable": "Käytä historiaa",
    "query_log_configuration": "Historian määritys",
    "query_log_disabled": "Pyyntöhistoria ei ole käytössä. Voit ottaa sen käyttöön <0>asetuksissa</0>",
    "query_log_strict_search": "Käytä tarkalle haulle lainausmerkkejä",
-    "query_log_retention_confirm": "Haluatko varmasti muuttaa kyselylokin kiertoa? Jos pienennät intervalliarvoa, osa tiedoista menetetään",
+    "query_log_retention_confirm": "Haluatko varmasti muuttaa pyyntöhistoriasi säilytysaikaa? Jos lyhennät aikaa, joitakin tietoja menetetään",
    "anonymize_client_ip": "Piilota päätelaitteen IP-osoite",
    "anonymize_client_ip_desc": "Älä tallenna päätelaitteen täydellistä IP-osoitetta historiaan ja tilastoihin.",
    "dns_config": "DNS-palvelimen määritys",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Poista suojaus käytöstä {{count}} tunniksi",
    "disable_notify_for_hours_plural": "Poista suojaus käytöstä {{count}} tunniksi",
    "disable_notify_until_tomorrow": "Poista suojaus käytöstä huomiseen asti",
-    "enable_protection_timer": "Suojaus otetaan käyttöön {{time}} kuluttua",
-    "custom_retention_input": "Syötä säilytysaika tunteina",
-    "custom_rotation_input": "Syötä uudistusaika tunteina",
-    "protection_section_label": "Suojaus",
-    "log_and_stats_section_label": "Kyselyhistoria ja tilastot",
-    "ignore_query_log": "Älä huomioi tätä päätettä kyselyhistoriassa",
-    "ignore_statistics": "Älä huomioi tätä päätettä tilastoissa"
+    "enable_protection_timer": "Suojaus otetaan käyttöön {{time}} kuluttua"
 }
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Le journal des requêtes a été effacé",
    "query_log_updated": "Le journal des requêtes a été mis à jour",
    "query_log_clear": "Effacer journal des requêtes",
-    "query_log_retention": "Rotation des journaux de requêtes",
+    "query_log_retention": "Rétention du journal des requêtes",
    "query_log_enable": "Activer le journal",
    "query_log_configuration": "Configuration du journal",
    "query_log_disabled": "Le journal des requêtes est désactivé et peut être configuré dans les <0>paramètres</0>",
    "query_log_strict_search": "Utilisez les doubles guillemets pour une recherche stricte",
-    "query_log_retention_confirm": "Êtes-vous sûr de souhaiter modifier la rotation des journaux de requêtes ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
+    "query_log_retention_confirm": "Êtes-vous sûr de vouloir modifier la rétention des journaux de requêtes ? Si vous diminuez la valeur de l'intervalle, certaines données seront perdues",
    "anonymize_client_ip": "Anonymiser l’IP du client",
    "anonymize_client_ip_desc": "Ne pas enregistrer l’adresse IP complète du client dans les journaux et statistiques",
    "dns_config": "Configuration du serveur DNS",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Désactiver la protection pendant {{count}} heure",
    "disable_notify_for_hours_plural": "Désactiver la protection pendant {{count}} heures",
    "disable_notify_until_tomorrow": "Désactiver la protection jusqu'à demain",
-    "enable_protection_timer": "La protection sera activée dans {{time}}",
-    "custom_retention_input": "Saisir la rétention en heures",
-    "custom_rotation_input": "Saisir la rotation en heures",
-    "protection_section_label": "Protection",
-    "log_and_stats_section_label": "Journal des requêtes et statistiques",
-    "ignore_query_log": "Ignorer ce client dans le journal des requêtes",
-    "ignore_statistics": "Ignorer ce client dans les statistiques"
+    "enable_protection_timer": "La protection sera activée dans {{time}}"
 }
--- a/client/src/__locales/hr.json
+++ b/client/src/__locales/hr.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Zapisnik upita je uspješno uklonjen",
    "query_log_updated": "Zapisnik upita je uspješno ažuriran",
    "query_log_clear": "Očisti zapisnik upita",
-    "query_log_retention": "Rotacija dnevnika upita",
+    "query_log_retention": "Spremanje zapisnika upita",
    "query_log_enable": "Omogući zapise",
    "query_log_configuration": "Postavke zapisa",
    "query_log_disabled": "Zapisnik upita je onemogućen i može se postaviti u <0>postavkama</0>",
    "query_log_strict_search": "Koristite dvostruke navodnike za strogo pretraživanje",
-    "query_log_retention_confirm": "Jeste li sigurni da želite promijeniti rotaciju dnevnika upita? Ako smanjite vrijednost intervala, neki će se podaci izgubiti",
+    "query_log_retention_confirm": "Jeste li sigurni da želite promijeniti zadržavanje zapisnika upita? Ako smanjite vrijednost intervala, neki će podaci biti izgubljeni",
    "anonymize_client_ip": "Anonimiraj IP klijenta",
    "anonymize_client_ip_desc": "Ne spremajte cijelu IP adresu klijenta u zapisnike i statistike",
    "dns_config": "DNS postavke poslužitelja",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Isključi zaštitu na {{count}} sati",
    "disable_notify_for_hours_plural": "Isključi zaštitu na {{count}} sati",
    "disable_notify_until_tomorrow": "Isključi zaštitu do sutra",
-    "enable_protection_timer": "Zaštita će biti omogućena u {{time}}",
-    "custom_retention_input": "Unesite zadržavanje u satima",
-    "custom_rotation_input": "Unesite rotaciju u satima",
-    "protection_section_label": "Zaštita",
-    "log_and_stats_section_label": "Zapisnik upita i statistika",
-    "ignore_query_log": "Zanemari ovog klijenta u zapisniku upita",
-    "ignore_statistics": "Ignorirajte ovog klijenta u statistici"
+    "enable_protection_timer": "Zaštita će biti omogućena u {{time}}"
 }
--- a/client/src/__locales/hu.json
+++ b/client/src/__locales/hu.json
@@ -642,6 +642,5 @@
    "anonymizer_notification": "<0>Megjegyzés:</0> Az IP anonimizálás engedélyezve van. Az <1>Általános beállításoknál letilthatja</1> .",
    "confirm_dns_cache_clear": "Biztos benne, hogy törölni szeretné a DNS-gyorsítótárat?",
    "cache_cleared": "A DNS gyorsítótár sikeresen törlődött",
-    "clear_cache": "Gyorsítótár törlése",
-    "protection_section_label": "Védelem"
+    "clear_cache": "Gyorsítótár törlése"
 }
--- a/client/src/__locales/id.json
+++ b/client/src/__locales/id.json
@@ -641,6 +641,5 @@
    "anonymizer_notification": "<0>Catatan:</0> Anonimisasi IP diaktifkan. Anda dapat menonaktifkannya di <1>Pengaturan umum</1> .",
    "confirm_dns_cache_clear": "Apakah Anda yakin ingin menghapus cache DNS?",
    "cache_cleared": "Cache DNS berhasil dibersihkan",
-    "clear_cache": "Hapus cache",
-    "protection_section_label": "Perlindungan"
+    "clear_cache": "Hapus cache"
 }
--- a/client/src/__locales/it.json
+++ b/client/src/__locales/it.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Il registro richieste è stato correttamente cancellato",
    "query_log_updated": "Il registro richieste è stato correttamente aggiornato",
    "query_log_clear": "Cancella registri richieste",
-    "query_log_retention": "Rotazione dei registri richieste",
+    "query_log_retention": "Conservazione dei registri richieste",
    "query_log_enable": "Attiva registro",
    "query_log_configuration": "Configurazione registri",
    "query_log_disabled": "Il registro richieste è stato disattivato e può essere configurata dalle <0>impostazioni</0>",
    "query_log_strict_search": "Utilizzare le doppie virgolette per una ricerca precisa",
-    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro delle richieste? Se si riduce il valore dell'intervallo, alcuni dati andranno persi",
+    "query_log_retention_confirm": "Sei sicuro di voler modificare il registro delle richieste? Se il valore di intervallo dovesse diminuire, alcuni dati andranno persi",
    "anonymize_client_ip": "Anonimizza client IP",
    "anonymize_client_ip_desc": "Non salvare l'indirizzo IP completo del client nel registro o nelle statistiche",
    "dns_config": "Configurazione server DNS",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Disattiva la protezione per {{count}} ora",
    "disable_notify_for_hours_plural": "Disattiva la protezione per {{count}} ore",
    "disable_notify_until_tomorrow": "Disattiva la protezione fino a domani",
-    "enable_protection_timer": "La protezione verrà attivata in {{time}}",
-    "custom_retention_input": "Inserisci la conservazione in ore",
-    "custom_rotation_input": "Inserisci la rotazione in ore",
-    "protection_section_label": "Protezione",
-    "log_and_stats_section_label": "Registro richieste e statistiche",
-    "ignore_query_log": "Ignora questo client nel registro delle richieste",
-    "ignore_statistics": "Ignora questo cliente nelle statistiche"
+    "enable_protection_timer": "La protezione verrà attivata in {{time}}"
 }
--- a/client/src/__locales/ja.json
+++ b/client/src/__locales/ja.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "クエリ・ログの消去に成功しました",
    "query_log_updated": "クエリ・ログの更新が成功しました",
    "query_log_clear": "クエリ・ログを消去する",
-    "query_log_retention": "クエリ・ログのローテーション",
+    "query_log_retention": "クエリ・ログの保持",
    "query_log_enable": "ログを有効にする",
    "query_log_configuration": "ログ設定",
    "query_log_disabled": "クエリ・ログは無効になっており、<0>設定</0>で構成できます",
    "query_log_strict_search": "完全一致検索には二重引用符を使用します",
-    "query_log_retention_confirm": "クエリ・ログのローテーションを変更してもよろしいですか？ 間隔の値を減らすと、一部のデータが失われます",
+    "query_log_retention_confirm": "クエリ・ログの保持を変更してもよろしいですか？ 期間を短くすると、一部のデータが失われます",
    "anonymize_client_ip": "クライアントIPを匿名化する",
    "anonymize_client_ip_desc": "ログと統計にクライアントのフルIPアドレスを保存しないようにします。",
    "dns_config": "DNSサーバ設定",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "保護を {{count}} 時間無効にする",
    "disable_notify_for_hours_plural": "保護を {{count}} 時間無効にする",
    "disable_notify_until_tomorrow": "明日まで保護を無効にする",
-    "enable_protection_timer": "保護は後 {{time}} で有効になります",
-    "custom_retention_input": "保持期間を入力してください（時間単位）",
-    "custom_rotation_input": "ローテーションを入力してください（時間単位）",
-    "protection_section_label": "AdGuardによる保護",
-    "log_and_stats_section_label": "クエリ・ログと統計情報",
-    "ignore_query_log": "クエリ・ログでこのクライアントを無視する",
-    "ignore_statistics": "統計でこのクライアントを無視する"
+    "enable_protection_timer": "保護は後 {{time}} で有効になります"
 }
--- a/client/src/__locales/ko.json
+++ b/client/src/__locales/ko.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "쿼리 로그를 성공적으로 초기화했습니다",
    "query_log_updated": "질의 로그가 성공적으로 업데이트되었습니다",
    "query_log_clear": "쿼리 로그 비우기",
-    "query_log_retention": "쿼리 로그 로테이션",
+    "query_log_retention": "쿼리 로그 저장 기간",
    "query_log_enable": "로그 활성화",
    "query_log_configuration": "로그 구성",
    "query_log_disabled": "쿼리 로그가 비활성화되어 있으며 <0>설정</0>에서 설정할 수 있습니다",
    "query_log_strict_search": "검색을 제한하려면 쌍따옴표를 사용해주세요",
-    "query_log_retention_confirm": "쿼리 로그 로테이션을 변경하시겠습니까? 간격 값을 줄이면 일부 데이터가 손실됩니다.",
+    "query_log_retention_confirm": "정말로 쿼리 로그 저장 기간을 변경하시겠습니까? 저장 주기를 낮출 경우, 일부 데이터가 손실됩니다",
    "anonymize_client_ip": "클라이언트 IP 익명화",
    "anonymize_client_ip_desc": "클라이언트의 전체 IP 주소를 로그와 통계에 저장하저장하지 마세요",
    "dns_config": "DNS 서버 설정",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "{{count}}시간 동안 보호 기능 비활성화",
    "disable_notify_for_hours_plural": "{{count}}시간 동안 보호 기능 비활성화",
    "disable_notify_until_tomorrow": "내일까지 보호 기능 비활성화",
-    "enable_protection_timer": "{{time}}에 보호 기능이 활성화됩니다.",
-    "custom_retention_input": "시간 단위로 보존 기간 입력",
-    "custom_rotation_input": "시간 단위로 로테이션 입력",
-    "protection_section_label": "보호",
-    "log_and_stats_section_label": "쿼리 로그 및 통계",
-    "ignore_query_log": "쿼리 로그에서 이 클라이언트 무시",
-    "ignore_statistics": "통계에서 이 클라이언트 무시"
+    "enable_protection_timer": "{{time}}에 보호 기능이 활성화됩니다."
 }
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Het query logboek is succesvol geleegd",
    "query_log_updated": "Het query logboek is succesvol bijgewerkt",
    "query_log_clear": "Leeg query logs",
-    "query_log_retention": "Query logs rotatie",
+    "query_log_retention": "Query logs bewaartermijn",
    "query_log_enable": "Log bestanden inschakelen",
    "query_log_configuration": "Logbestanden instellingen",
    "query_log_disabled": "Het query logboek is uitgeschakeld en kan worden geconfigureerd in de <0>instellingen</0>",
    "query_log_strict_search": "Gebruik dubbele aanhalingstekens voor strikt zoeken",
-    "query_log_retention_confirm": "Weet u zeker dat u de rotatie van het querylogboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
+    "query_log_retention_confirm": "Weet u zeker dat u de bewaartermijn van het query logboek wilt wijzigen? Als u de intervalwaarde verlaagt, gaan sommige gegevens verloren",
    "anonymize_client_ip": "Cliënt IP anonimiseren",
    "anonymize_client_ip_desc": "Het volledige IP-adres van de cliënt niet opnemen in logboeken en statistiekbestanden",
    "dns_config": "DNS-server configuratie",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Beveiliging uitschakelen voor {{count}} uur",
    "disable_notify_for_hours_plural": "Beveiliging uitschakelen voor {{count}} uren",
    "disable_notify_until_tomorrow": "Beveiliging uitschakelen tot morgen",
-    "enable_protection_timer": "Bescherming wordt ingeschakeld over {{time}}",
-    "custom_retention_input": "Voer retentie in uren in",
-    "custom_rotation_input": "Voer rotatie in uren in",
-    "protection_section_label": "Bescherming",
-    "log_and_stats_section_label": "Aanvragenlogboek en statistieken",
-    "ignore_query_log": "Deze client negeren in het aanvragenlogboek",
-    "ignore_statistics": "Deze client negeren in de statistieken"
+    "enable_protection_timer": "Bescherming wordt ingeschakeld over {{time}}"
 }
--- a/client/src/__locales/no.json
+++ b/client/src/__locales/no.json
@@ -614,6 +614,5 @@
    "use_saved_key": "Bruk den tidligere lagrede nøkkelen",
    "parental_control": "Foreldrekontroll",
    "safe_browsing": "Sikker surfing",
-    "served_from_cache": "{{value}} <i>(formidlet fra mellomlageret)</i>",
-    "protection_section_label": "Beskyttelse"
+    "served_from_cache": "{{value}} <i>(formidlet fra mellomlageret)</i>"
 }
--- a/client/src/__locales/pl.json
+++ b/client/src/__locales/pl.json
@@ -167,7 +167,6 @@
    "enabled_parental_toast": "Włączona Kontrola Rodzicielska",
    "disabled_safe_search_toast": "Wyłączone bezpieczne wyszukiwanie",
    "enabled_save_search_toast": "Włączone bezpieczne wyszukiwanie",
-    "updated_save_search_toast": "Zaktualizowano ustawienia bezpiecznego wyszukiwania",
    "enabled_table_header": "Włączone",
    "name_table_header": "Nazwa",
    "list_url_table_header": "Adres URL listy",
@@ -257,12 +256,12 @@
    "query_log_cleared": "Dziennik zapytań został pomyślnie wyczyszczony",
    "query_log_updated": "Dziennik zapytań został zaktualizowany",
    "query_log_clear": "Wyczyść dzienniki zapytań",
-    "query_log_retention": "Rotacja dzienników zapytań",
+    "query_log_retention": "Przechowywanie dzienników zapytań",
    "query_log_enable": "Włącz dziennik",
    "query_log_configuration": "Konfiguracja dzienników",
    "query_log_disabled": "Dziennik zapytań jest wyłączony i można go skonfigurować w <0>ustawieniach</0>",
    "query_log_strict_search": "Używaj podwójnych cudzysłowów do ścisłego wyszukiwania",
-    "query_log_retention_confirm": "Czy na pewno chcesz zmienić rotację dziennika zapytań? Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
+    "query_log_retention_confirm": "Czy na pewno chcesz zmienić sposób przechowywania dziennika zapytań? Jeśli zmniejszysz wartość interwału, niektóre dane zostaną utracone",
    "anonymize_client_ip": "Anonimizuj adres IP klienta",
    "anonymize_client_ip_desc": "Nie zapisuj pełnego adresu IP w dziennikach i statystykach",
    "dns_config": "Konfiguracja serwera DNS",
@@ -291,8 +290,6 @@
    "rate_limit": "Limit ilościowy",
    "edns_enable": "Włącz podsieć klienta EDNS",
    "edns_cs_desc": "Dodaj opcję podsieci klienta EDNS (ECS) do żądań nadrzędnych i rejestruj wartości wysyłane przez klientów w dzienniku zapytań.",
-    "edns_use_custom_ip": "Użyj niestandardowego adresu IP dla EDNS",
-    "edns_use_custom_ip_desc": "Zezwól na użycie niestandardowego adresu IP dla EDNS",
    "rate_limit_desc": "Liczba żądań na sekundę dozwolona na klienta. Ustawienie wartości 0 oznacza brak ograniczeń.",
    "blocking_ipv4_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania A",
    "blocking_ipv6_desc": "Adres IP, który ma zostać zwrócony w przypadku zablokowanego żądania AAAA",
@@ -526,10 +523,6 @@
    "statistics_retention_confirm": "Czy chcesz zmienić sposób przechowania statystyk? Jeżeli obniżysz wartość interwału, niektóre dane będą utracone",
    "statistics_cleared": "Statystyki zostały pomyślnie wyczyszczone",
    "statistics_enable": "Włącz statystyki",
-    "ignore_domains": "Ignorowane domeny (każda w nowym wierszu)",
-    "ignore_domains_title": "Ignorowane domeny",
-    "ignore_domains_desc_stats": "Zapytania dla tych domen nie są zapisywane do statystyk",
-    "ignore_domains_desc_query": "Zapytania dla tych domen nie są zapisywane do dziennika",
    "interval_hours": "{{count}} godzina",
    "interval_hours_plural": "{{count}} godziny",
    "filters_configuration": "Konfiguracja filtrów",
@@ -649,30 +642,5 @@
    "anonymizer_notification": "<0>Uwaga:</0> Anonimizacja IP jest włączona. Możesz ją wyłączyć w <1>Ustawieniach ogólnych</1>.",
    "confirm_dns_cache_clear": "Czy na pewno chcesz wyczyścić pamięć podręczną DNS?",
    "cache_cleared": "Pamięć podręczna DNS została pomyślnie wyczyszczona",
-    "clear_cache": "Wyczyść pamięć podręczną",
-    "make_static": "Ustaw adres statyczny",
-    "theme_auto_desc": "Automatycznie (na podstawie schematu kolorów Twojego urządzenia)",
-    "theme_dark_desc": "Ciemny motyw",
-    "theme_light_desc": "Jasny motyw",
-    "disable_for_seconds": "Na {{count}} sekundę",
-    "disable_for_seconds_plural": "Na {{count}} sekund",
-    "disable_for_minutes": "Na {{count}} minutę",
-    "disable_for_minutes_plural": "Na {{count}} minut",
-    "disable_for_hours": "Na {{count}} godzinę",
-    "disable_for_hours_plural": "Na {{count}} godziny",
-    "disable_until_tomorrow": "Do jutra",
-    "disable_notify_for_seconds": "Wyłącz ochronę na {{count}} sekundę",
-    "disable_notify_for_seconds_plural": "Wyłącz ochronę na {{count}} sekund",
-    "disable_notify_for_minutes": "Wyłącz ochronę na {{count}} minutę",
-    "disable_notify_for_minutes_plural": "Wyłącz ochronę na {{count}} minut",
-    "disable_notify_for_hours": "Wyłącz ochronę na {{count}} godzinę",
-    "disable_notify_for_hours_plural": "Wyłącz ochronę na {{count}} godziny",
-    "disable_notify_until_tomorrow": "Wyłącz ochronę do jutra",
-    "enable_protection_timer": "Ochrona zostanie włączona za {{time}}",
-    "custom_retention_input": "Wprowadź retencję w godzinach",
-    "custom_rotation_input": "Wprowadź rotację w godzinach",
-    "protection_section_label": "Ochrona",
-    "log_and_stats_section_label": "Dziennik zapytań i statystyki",
-    "ignore_query_log": "Zignoruj tego klienta w dzienniku zapytań",
-    "ignore_statistics": "Ignoruj tego klienta w statystykach"
+    "clear_cache": "Wyczyść pamięć podręczną"
 }
--- a/client/src/__locales/pt-br.json
+++ b/client/src/__locales/pt-br.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "O registro de consulta foi limpo com sucesso",
    "query_log_updated": "O registro da consulta foi atualizado com sucesso",
    "query_log_clear": "Limpar registros de consulta",
-    "query_log_retention": "Rotação de registros de consulta",
+    "query_log_retention": "Arquivamento de registros de consultas",
    "query_log_enable": "Ativar registro",
    "query_log_configuration": "Configuração de registros",
    "query_log_disabled": "O registro de consulta está desativado e pode ser configurado em <0>configurações</0>",
    "query_log_strict_search": "Use aspas duplas para uma pesquisa mais criteriosa",
-    "query_log_retention_confirm": "Tem a certeza de que quer alterar a rotação do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
+    "query_log_retention_confirm": "Você tem certeza de que deseja alterar o arquivamento do registro de consulta? Se diminuir o valor de intervalo, alguns dados serão perdidos",
    "anonymize_client_ip": "Tornar anônimo o IP do cliente",
    "anonymize_client_ip_desc": "Não salva o endereço de IP completo do cliente em registros ou estatísticas",
    "dns_config": "Configuração do servidor DNS",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Desativar proteção por {{count}} hora",
    "disable_notify_for_hours_plural": "Desativar proteção por {{count}} horas",
    "disable_notify_until_tomorrow": "Desativar a proteção até amanhã",
-    "enable_protection_timer": "A proteção será ativada em {{time}}",
-    "custom_retention_input": "Insira a retenção em horas",
-    "custom_rotation_input": "Insira a rotação em horas",
-    "protection_section_label": "Proteção",
-    "log_and_stats_section_label": "Registro de consultas e estatísticas",
-    "ignore_query_log": "Ignorar este cliente no registo de consultas",
-    "ignore_statistics": "Ignorar este cliente nas estatísticas"
+    "enable_protection_timer": "A proteção será ativada em {{time}}"
 }
--- a/client/src/__locales/pt-pt.json
+++ b/client/src/__locales/pt-pt.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "O registo de consulta foi limpo com sucesso",
    "query_log_updated": "O registo da consulta foi atualizado com sucesso",
    "query_log_clear": "Limpar registos de consulta",
-    "query_log_retention": "Rotação de registros de consulta",
+    "query_log_retention": "Retenção de registos de consulta",
    "query_log_enable": "Ativar registo",
    "query_log_configuration": "Definições do registo",
    "query_log_disabled": "O registo de consulta está desativado e pode ser configurado em <0>definições</0>",
    "query_log_strict_search": "Usar aspas duplas para uma pesquisa rigorosa",
-    "query_log_retention_confirm": "Tem a certeza de que quer alterar a rotação do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
+    "query_log_retention_confirm": "Tem a certeza de que deseja alterar a retenção do registo de consulta? Se diminuir o valor do intervalo, alguns dados serão perdidos",
    "anonymize_client_ip": "Tornar anónimo o IP do cliente",
    "anonymize_client_ip_desc": "Não gurda o endereço de IP completo do cliente em registo ou estatísticas",
    "dns_config": "Definição do servidor DNS",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Desativar proteção por {{count}} hora",
    "disable_notify_for_hours_plural": "Desativar proteção por {{count}} horas",
    "disable_notify_until_tomorrow": "Desativar a proteção até amanhã",
-    "enable_protection_timer": "A proteção será habilitada em {{time}}",
-    "custom_retention_input": "Insira a retenção em horas",
-    "custom_rotation_input": "Insira a rotação em horas",
-    "protection_section_label": "Proteção",
-    "log_and_stats_section_label": "Log de consulta e estatísticas",
-    "ignore_query_log": "Ignorar este cliente no log de consulta",
-    "ignore_statistics": "Ignorar este cliente nas estatísticas"
+    "enable_protection_timer": "A proteção será habilitada em {{time}}"
 }
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -642,6 +642,5 @@
    "anonymizer_notification": "<0>Nota:</0> Anonimizarea IP este activată. Puteți să o dezactivați în <1>Setări generale</1>.",
    "confirm_dns_cache_clear": "Sunteți sigur că doriți să ștergeți memoria cache DNS?",
    "cache_cleared": "Cache-ul DNS a fost golit cu succes",
-    "clear_cache": "Goliți memoria cache",
-    "protection_section_label": "Protecție"
+    "clear_cache": "Goliți memoria cache"
 }
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Журнал запросов успешно очищен",
    "query_log_updated": "Журнал запросов успешно обновлён",
    "query_log_clear": "Очистить журнал запросов",
-    "query_log_retention": "Частота ротации журнала запросов",
+    "query_log_retention": "Сохранение журнала запросов",
    "query_log_enable": "Включить журнал",
    "query_log_configuration": "Настройка журнала",
    "query_log_disabled": "Журнал запросов выключен, его можно включить в <0>настройках</0>",
    "query_log_strict_search": "Используйте двойные кавычки для строгого поиска",
-    "query_log_retention_confirm": "Вы уверены, что хотите изменить частоту ротации журнала запросов? При сокращении срока данные могут быть утеряны",
+    "query_log_retention_confirm": "Вы уверены, что хотите изменить срок хранения запросов? При сокращении интервала данные могут быть утеряны",
    "anonymize_client_ip": "Анонимизировать IP-адрес клиента",
    "anonymize_client_ip_desc": "Не сохранять полный IP-адрес клиента в журналах и статистике",
    "dns_config": "Настройки DNS-сервера",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Отключить защиту на {{count}} час",
    "disable_notify_for_hours_plural": "Отключить защиту на {{count}} часов",
    "disable_notify_until_tomorrow": "Отключить защиту до завтра",
-    "enable_protection_timer": "Защита будет включена в {{time}}",
-    "custom_retention_input": "Введите срок хранения в часах",
-    "custom_rotation_input": "Введите частоту ротации в часах",
-    "protection_section_label": "Защита",
-    "log_and_stats_section_label": "Журнал запросов и статистика",
-    "ignore_query_log": "Игнорировать этого клиента в журнале запросов",
-    "ignore_statistics": "Игнорировать этого клиента в статистике"
+    "enable_protection_timer": "Защита будет включена в {{time}}"
 }
--- a/client/src/__locales/sk.json
+++ b/client/src/__locales/sk.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Denník dopytov bol úspešne vymazaný",
    "query_log_updated": "Denník dopytov bol úspešne aktualizovaný",
    "query_log_clear": "Vymazať denníky dopytov",
-    "query_log_retention": "Rotácia denníkov dopytov",
+    "query_log_retention": "Obdobie záznamu denníka dopytov",
    "query_log_enable": "Zapnúť denník",
    "query_log_configuration": "Konfigurácia denníka",
    "query_log_disabled": "Protokol dopytov je vypnutý a možno ho nakonfigurovať v <0>nastaveniach</0>",
    "query_log_strict_search": "Na prísne vyhľadávanie použite dvojité úvodzovky",
-    "query_log_retention_confirm": "Naozaj chcete zmeniť rotáciu denníka dopytov? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
+    "query_log_retention_confirm": "Naozaj chcete zmeniť uchovávanie denníku dopytov? Ak znížite hodnotu intervalu, niektoré údaje sa stratia",
    "anonymize_client_ip": "Anonymizujte IP klienta",
    "anonymize_client_ip_desc": "Neukladať úplnú IP adresu klienta do protokolov a štatistík",
    "dns_config": "Konfigurácia DNS servera",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Vypnite ochranu na {{count}} hodinu",
    "disable_notify_for_hours_plural": "Vypnite ochranu na {{count}} hodín",
    "disable_notify_until_tomorrow": "Vypnúť ochranu do zajtra",
-    "enable_protection_timer": "Ochrana bude zapnutá o {{time}}",
-    "custom_retention_input": "Zadajte retenciu v hodinách",
-    "custom_rotation_input": "Zadajte rotáciu v hodinách",
-    "protection_section_label": "Ochrana",
-    "log_and_stats_section_label": "Protokol dopytov a štatistiky",
-    "ignore_query_log": "Ignorovať tohto klienta v denníku dopytov",
-    "ignore_statistics": "Ignorovanie tohto klienta v štatistikách"
+    "enable_protection_timer": "Ochrana bude zapnutá o {{time}}"
 }
--- a/client/src/__locales/sl.json
+++ b/client/src/__locales/sl.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Dnevnik poizvedb je uspešno izbrisan",
    "query_log_updated": "Dnevnik poizvedb je bil uspešno posodobljen",
    "query_log_clear": "Počisti dnevnike poizvedb",
-    "query_log_retention": "Rotacija dnevnikov poizvedb",
+    "query_log_retention": "Zadrževanje dnevnikov poizvedb",
    "query_log_enable": "Omogoči dnevni",
    "query_log_configuration": "Konfiguracija dnevnikov",
    "query_log_disabled": "Dnevnik poizvedb je onemogočen in ga je mogoče konfigurirati v <0>nastavitvah</0>",
    "query_log_strict_search": "Za strogo iskanje uporabite dvojne narekovaje",
-    "query_log_retention_confirm": "Ali ste prepričani, da želite spremeniti rotacijo dnevnika poizvedb? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
+    "query_log_retention_confirm": "Ali ste prepričani, da želite spremeniti zadrževanje dnevnika poizvedb? Če zmanjšate vrednost intervala, bodo nekateri podatki izgubljeni",
    "anonymize_client_ip": "Anonimiziraj odjemalca IP",
    "anonymize_client_ip_desc": "Ne shrani celotnega naslova IP odjemalca v dnevnikih ali statistiki",
    "dns_config": "Konfiguracija strežnika DNS",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Onemogoči zaščito za {{count}} uro",
    "disable_notify_for_hours_plural": "Onemogoči zaščito za {{count}} ur",
    "disable_notify_until_tomorrow": "Onemogoči zaščito do jutri",
-    "enable_protection_timer": "Zaščita bo omogočena ob {{time}}",
-    "custom_retention_input": "Vnesite zadrževanje v urah",
-    "custom_rotation_input": "Vnesite rotacijo v urah",
-    "protection_section_label": "Zaščita",
-    "log_and_stats_section_label": "Dnevnik poizvedb in statistika",
-    "ignore_query_log": "Ignorirajte tega odjemalca v dnevniku poizvedb",
-    "ignore_statistics": "Ignoriranje tega odjemalca v statistiki"
+    "enable_protection_timer": "Zaščita bo omogočena ob {{time}}"
 }
--- a/client/src/__locales/sr-cs.json
+++ b/client/src/__locales/sr-cs.json
@@ -642,6 +642,5 @@
    "anonymizer_notification": "<0>Nota:</0> IP prepoznavanje je omogućeno. Možete ga onemogućiti u opštim <1>postavkama</1>.",
    "confirm_dns_cache_clear": "Želite li zaista da obrišite DNS keš?",
    "cache_cleared": "DNS keš je uspešno očišćen",
-    "clear_cache": "Obriši keš memoriju",
-    "protection_section_label": "Zaštita"
+    "clear_cache": "Obriši keš memoriju"
 }
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "Sorgu günlüğü başarıyla temizlendi",
    "query_log_updated": "Sorgu günlüğü başarıyla güncellendi",
    "query_log_clear": "Sorgu günlüklerini temizle",
-    "query_log_retention": "Sorgu günlükleri rotasyonu",
+    "query_log_retention": "Sorgu günlüklerini sakla",
    "query_log_enable": "Günlüğü etkinleştir",
    "query_log_configuration": "Günlük yapılandırması",
    "query_log_disabled": "Sorgu günlüğü devre dışı bırakıldı, bunu <0>ayarlar</0> kısmından yapılandırılabilirsiniz",
    "query_log_strict_search": "Tam arama için çift tırnak işareti kullanın",
-    "query_log_retention_confirm": "Sorgu günlüğü rotasyonunu değiştirmek istediğinizden emin misiniz? Aralık değerini düşürürseniz, bazı veriler kaybolacaktır.",
+    "query_log_retention_confirm": "Sorgu günlüğü saklama süresini değiştirmek istediğinize emin misiniz? Aralık değerini azaltırsanız, bazı veriler kaybolacaktır",
    "anonymize_client_ip": "İstemcinin IP adresini gizle",
    "anonymize_client_ip_desc": "İstemcinin tam IP adresini günlüklere veya istatistiklere kaydetmeyin",
    "dns_config": "DNS sunucu yapılandırması",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "Korumayı {{count}} saatliğine devre dışı bırak",
    "disable_notify_for_hours_plural": "Korumayı {{count}} saatliğine devre dışı bırak",
    "disable_notify_until_tomorrow": "Korumayı yarına kadar devre dışı bırak",
-    "enable_protection_timer": "Koruma {{time}} içinde etkinleştirilecektir",
-    "custom_retention_input": "Saklama süresini saat olarak girin",
-    "custom_rotation_input": "Rotasyonu saat cinsinden girin",
-    "protection_section_label": "Koruma",
-    "log_and_stats_section_label": "Sorgu günlüğü ve istatistikler",
-    "ignore_query_log": "Sorgu günlüğünde bu istemciyi yoksay",
-    "ignore_statistics": "İstatistiklerde bu istemciyi yoksay"
+    "enable_protection_timer": "Koruma {{time}} içinde etkinleştirilecektir"
 }
--- a/client/src/__locales/uk.json
+++ b/client/src/__locales/uk.json
@@ -642,6 +642,5 @@
    "anonymizer_notification": "<0>Примітка:</0> IP-анонімізацію ввімкнено. Ви можете вимкнути його в <1>Загальні налаштування</1> .",
    "confirm_dns_cache_clear": "Ви впевнені, що бажаєте очистити кеш DNS?",
    "cache_cleared": "Кеш DNS успішно очищено",
-    "clear_cache": "Очистити кеш",
-    "protection_section_label": "Захист"
+    "clear_cache": "Очистити кеш"
 }
--- a/client/src/__locales/vi.json
+++ b/client/src/__locales/vi.json
@@ -642,6 +642,5 @@
    "anonymizer_notification": "<0> Lưu ý:</0> Tính năng ẩn danh IP được bật. Bạn có thể tắt nó trong <1> Cài đặt chung</1>.",
    "confirm_dns_cache_clear": "Bạn có chắc chắn muốn xóa bộ đệm ẩn DNS không?",
    "cache_cleared": "Đã xóa thành công bộ đệm DNS",
-    "clear_cache": "Xóa bộ nhớ cache",
-    "protection_section_label": "Sự bảo vệ"
+    "clear_cache": "Xóa bộ nhớ cache"
 }
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "查询日志已成功清除",
    "query_log_updated": "已成功更新查询日志",
    "query_log_clear": "清除查询日志",
-    "query_log_retention": "查询日志保留时间",
+    "query_log_retention": "查询记录保留时间",
    "query_log_enable": "启用日志",
    "query_log_configuration": "日志配置",
    "query_log_disabled": "查询日志已禁用，在<0>这些设置</0>中能配置它们",
    "query_log_strict_search": "使用双引号进行严谨搜索",
-    "query_log_retention_confirm": "您确定要更改查询记录保留时间吗？如果减少时间间隔数值，某些数据可能会丢失",
+    "query_log_retention_confirm": "您确定要更改查询记录保留时间吗？ 如果您减少间隔时间的值， 某些数据可能会丢失。",
    "anonymize_client_ip": "匿名化客户端IP",
    "anonymize_client_ip_desc": "不要在日志和统计信息中保存客户端的完整 IP 地址",
    "dns_config": "DNS 服务配置",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "禁用保护 {{count}} 小时",
    "disable_notify_for_hours_plural": "禁用保护 {{count}} 小时",
    "disable_notify_until_tomorrow": "禁用保护直到明天",
-    "enable_protection_timer": "保护将于 {{time}} 启用",
-    "custom_retention_input": "输入保留时间（小时）",
-    "custom_rotation_input": "输入旋转时间（小时）",
-    "protection_section_label": "防护",
-    "log_and_stats_section_label": "查询日志和统计数据",
-    "ignore_query_log": "在查询日志中忽略此客户端",
-    "ignore_statistics": "在统计数据中忽略此客户端"
+    "enable_protection_timer": "保护将于 {{time}} 启用"
 }
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -257,12 +257,12 @@
    "query_log_cleared": "該查詢記錄已被成功地清除",
    "query_log_updated": "該查詢記錄已被成功地更新",
    "query_log_clear": "清除查詢記錄",
-    "query_log_retention": "查詢記錄保留時間",
+    "query_log_retention": "查詢記錄保留",
    "query_log_enable": "啟用記錄",
    "query_log_configuration": "記錄配置",
    "query_log_disabled": "查詢記錄被禁用並可在<0>設定</0>中被配置",
    "query_log_strict_search": "使用雙引號於嚴謹的搜尋",
-    "query_log_retention_confirm": "您確定要更改記錄檔保存期限嗎？如果您縮短期限部分資料可能將會遺失",
+    "query_log_retention_confirm": "您確定您想要更改查詢記錄保留嗎？如果您減少該間隔值，某些資料將被丟失",
    "anonymize_client_ip": "將用戶端 IP 匿名",
    "anonymize_client_ip_desc": "不要儲存用戶端之完整的 IP 位址到記錄或統計資料裡",
    "dns_config": "DNS 伺服器配置",
@@ -668,11 +668,5 @@
    "disable_notify_for_hours": "計 {{count}} 小時禁用防護",
    "disable_notify_for_hours_plural": "計 {{count}} 小時禁用防護",
    "disable_notify_until_tomorrow": "禁用防護直到明天",
-    "enable_protection_timer": "防護將於 {{time}} 被啟用",
-    "custom_retention_input": "輸入保留時間（小時）",
-    "custom_rotation_input": "輸入旋轉時間（小時）",
-    "protection_section_label": "防護",
-    "log_and_stats_section_label": "查詢記錄和統計資料",
-    "ignore_query_log": "在查詢記錄中忽略此用戶端",
-    "ignore_statistics": "在統計資料中忽略此用戶端"
+    "enable_protection_timer": "防護將於 {{time}} 被啟用"
 }
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.19

 require (
-	github.com/AdguardTeam/dnsproxy v0.49.1
+	github.com/AdguardTeam/dnsproxy v0.48.3
 	github.com/AdguardTeam/golibs v0.13.2
 	github.com/AdguardTeam/urlfilter v0.16.1
 	github.com/NYTimes/gziphandler v1.1.1
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-github.com/AdguardTeam/dnsproxy v0.49.1 h1:JpStBK05uCgA3ldleaNLRmIwE9V7vRg7/kVJQSdnQYg=
-github.com/AdguardTeam/dnsproxy v0.49.1/go.mod h1:Y7g7jRTd/u7+KJ/QvnGI2PCE8vnisp6EsW47/Sz0DZw=
+github.com/AdguardTeam/dnsproxy v0.48.3 h1:h9xgDSmd1MqsPFNApyaPVXolmSTtzOWOcfWvPeDEP6s=
+github.com/AdguardTeam/dnsproxy v0.48.3/go.mod h1:Y7g7jRTd/u7+KJ/QvnGI2PCE8vnisp6EsW47/Sz0DZw=
 github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
 github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
 github.com/AdguardTeam/golibs v0.13.2 h1:BPASsyQKmb+b8VnvsNOHp7bKfcZl9Z+Z2UhPjOiupSc=
--- a/internal/dhcpd/config.go
+++ b/internal/dhcpd/config.go
@@ -31,16 +31,8 @@ type ServerConfig struct {
 	Conf4 V4ServerConf `yaml:"dhcpv4"`
 	Conf6 V6ServerConf `yaml:"dhcpv6"`

-	// WorkDir is used to store DHCP leases.
-	//
-	// Deprecated:  Remove it when migration of DHCP leases will not be needed.
-	WorkDir string `yaml:"-"`
-
-	// DataDir is used to store DHCP leases.
-	DataDir string `yaml:"-"`
-
-	// dbFilePath is the path to the file with stored DHCP leases.
-	dbFilePath string `yaml:"-"`
+	WorkDir    string `yaml:"-"`
+	DBFilePath string `yaml:"-"`
 }

 // DHCPServer - DHCP server interface
--- a/internal/dhcpd/db.go
+++ b/internal/dhcpd/db.go
@@ -5,34 +5,43 @@ package dhcpd
 import (
 	"encoding/json"
 	"fmt"
+	"net"
+	"net/netip"
 	"os"
+	"time"

 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/google/renameio/maybe"
-	"golang.org/x/exp/slices"
 )

-const (
-	// dataFilename contains saved leases.
-	dataFilename = "leases.json"
+const dbFilename = "leases.db"

-	// dataVersion is the current version of the stored DHCP leases structure.
-	dataVersion = 1
-)
-
-// dataLeases is the structure of the stored DHCP leases.
-type dataLeases struct {
-	// Version is the current version of the structure.
-	Version int `json:"version"`
-
-	// Leases is the list containing stored DHCP leases.
-	Leases []*Lease `json:"leases"`
+type leaseJSON struct {
+	HWAddr   []byte `json:"mac"`
+	IP       []byte `json:"ip"`
+	Hostname string `json:"host"`
+	Expiry   int64  `json:"exp"`
 }

-// dbLoad loads stored leases.
+func normalizeIP(ip net.IP) net.IP {
+	ip4 := ip.To4()
+	if ip4 != nil {
+		return ip4
+	}
+	return ip
+}
+
+// Load lease table from DB
+//
+// TODO(s.chzhen):  Decrease complexity.
 func (s *server) dbLoad() (err error) {
-	data, err := os.ReadFile(s.conf.dbFilePath)
+	dynLeases := []*Lease{}
+	staticLeases := []*Lease{}
+	v6StaticLeases := []*Lease{}
+	v6DynLeases := []*Lease{}
+
+	data, err := os.ReadFile(s.conf.DBFilePath)
 	if err != nil {
 		if !errors.Is(err, os.ErrNotExist) {
 			return fmt.Errorf("reading db: %w", err)
@@ -41,30 +50,52 @@ func (s *server) dbLoad() (err error) {
 		return nil
 	}

-	dl := &dataLeases{}
-	err = json.Unmarshal(data, dl)
+	obj := []leaseJSON{}
+	err = json.Unmarshal(data, &obj)
 	if err != nil {
 		return fmt.Errorf("decoding db: %w", err)
 	}

-	leases := dl.Leases
+	numLeases := len(obj)
+	for i := range obj {
+		obj[i].IP = normalizeIP(obj[i].IP)

-	leases4 := []*Lease{}
-	leases6 := []*Lease{}
+		ip, ok := netip.AddrFromSlice(obj[i].IP)
+		if !ok {
+			log.Info("dhcp: invalid IP: %s", obj[i].IP)
+			continue
+		}

-	for _, l := range leases {
-		if l.IP.Is4() {
-			leases4 = append(leases4, l)
+		lease := Lease{
+			HWAddr:   obj[i].HWAddr,
+			IP:       ip,
+			Hostname: obj[i].Hostname,
+			Expiry:   time.Unix(obj[i].Expiry, 0),
+			IsStatic: obj[i].Expiry == leaseExpireStatic,
+		}
+
+		if len(obj[i].IP) == 16 {
+			if lease.IsStatic {
+				v6StaticLeases = append(v6StaticLeases, &lease)
+			} else {
+				v6DynLeases = append(v6DynLeases, &lease)
+			}
 		} else {
-			leases6 = append(leases6, l)
+			if lease.IsStatic {
+				staticLeases = append(staticLeases, &lease)
+			} else {
+				dynLeases = append(dynLeases, &lease)
+			}
 		}
 	}

+	leases4 := normalizeLeases(staticLeases, dynLeases)
 	err = s.srv4.ResetLeases(leases4)
 	if err != nil {
 		return fmt.Errorf("resetting dhcpv4 leases: %w", err)
 	}

+	leases6 := normalizeLeases(v6StaticLeases, v6DynLeases)
 	if s.srv6 != nil {
 		err = s.srv6.ResetLeases(leases6)
 		if err != nil {
@@ -73,54 +104,90 @@ func (s *server) dbLoad() (err error) {
 	}

 	log.Info("dhcp: loaded leases v4:%d  v6:%d  total-read:%d from DB",
-		len(leases4), len(leases6), len(leases))
+		len(leases4), len(leases6), numLeases)

 	return nil
 }

-// dbStore stores DHCP leases.
+// Skip duplicate leases
+// Static leases have a priority over dynamic leases
+func normalizeLeases(staticLeases, dynLeases []*Lease) []*Lease {
+	leases := []*Lease{}
+	index := map[string]int{}
+
+	for i, lease := range staticLeases {
+		_, ok := index[lease.HWAddr.String()]
+		if ok {
+			continue // skip the lease with the same HW address
+		}
+		index[lease.HWAddr.String()] = i
+		leases = append(leases, lease)
+	}
+
+	for i, lease := range dynLeases {
+		_, ok := index[lease.HWAddr.String()]
+		if ok {
+			continue // skip the lease with the same HW address
+		}
+		index[lease.HWAddr.String()] = i
+		leases = append(leases, lease)
+	}
+
+	return leases
+}
+
+// Store lease table in DB
 func (s *server) dbStore() (err error) {
 	// Use an empty slice here as opposed to nil so that it doesn't write
 	// "null" into the database file if leases are empty.
-	leases := []*Lease{}
+	leases := []leaseJSON{}

 	leases4 := s.srv4.getLeasesRef()
-	leases = append(leases, leases4...)
+	for _, l := range leases4 {
+		if l.Expiry.Unix() == 0 {
+			continue
+		}
+
+		lease := leaseJSON{
+			HWAddr:   l.HWAddr,
+			IP:       l.IP.AsSlice(),
+			Hostname: l.Hostname,
+			Expiry:   l.Expiry.Unix(),
+		}
+
+		leases = append(leases, lease)
+	}

 	if s.srv6 != nil {
 		leases6 := s.srv6.getLeasesRef()
-		leases = append(leases, leases6...)
+		for _, l := range leases6 {
+			if l.Expiry.Unix() == 0 {
+				continue
+			}
+
+			lease := leaseJSON{
+				HWAddr:   l.HWAddr,
+				IP:       l.IP.AsSlice(),
+				Hostname: l.Hostname,
+				Expiry:   l.Expiry.Unix(),
+			}
+
+			leases = append(leases, lease)
+		}
 	}

-	return writeDB(s.conf.dbFilePath, leases)
-}
-
-// writeDB writes leases to file at path.
-func writeDB(path string, leases []*Lease) (err error) {
-	defer func() { err = errors.Annotate(err, "writing db: %w") }()
-
-	slices.SortFunc(leases, func(a, b *Lease) bool {
-		return a.Hostname < b.Hostname
-	})
-
-	dl := &dataLeases{
-		Version: dataVersion,
-		Leases:  leases,
-	}
-
-	buf, err := json.Marshal(dl)
+	var data []byte
+	data, err = json.Marshal(leases)
 	if err != nil {
-		// Don't wrap the error since it's informative enough as is.
-		return err
+		return fmt.Errorf("encoding db: %w", err)
 	}

-	err = maybe.WriteFile(path, buf, 0o644)
+	err = maybe.WriteFile(s.conf.DBFilePath, data, 0o644)
 	if err != nil {
-		// Don't wrap the error since it's informative enough as is.
-		return err
+		return fmt.Errorf("writing db: %w", err)
 	}

-	log.Info("dhcp: stored %d leases in %q", len(leases), path)
+	log.Info("dhcp: stored %d leases in db", len(leases))

 	return nil
 }
--- a/internal/dhcpd/dhcpd.go
+++ b/internal/dhcpd/dhcpd.go
@@ -15,6 +15,13 @@ import (
 )

 const (
+	// leaseExpireStatic is used to define the Expiry field for static
+	// leases.
+	//
+	// TODO(e.burkov): Remove it when static leases determining mechanism
+	// will be improved.
+	leaseExpireStatic = 1
+
 	// DefaultDHCPLeaseTTL is the default time-to-live for leases.
 	DefaultDHCPLeaseTTL = uint32(timeutil.Day / time.Second)

@@ -28,10 +35,10 @@ const (
 	defaultBackoff     time.Duration = 500 * time.Millisecond
 )

-// Lease contains the necessary information about a DHCP lease.  It's used in
-// various places.  So don't change it without good reason.
+// Lease contains the necessary information about a DHCP lease
 type Lease struct {
-	// Expiry is the expiration time of the lease.
+	// Expiry is the expiration time of the lease.  The unix timestamp value
+	// of 1 means that this is a static lease.
 	Expiry time.Time `json:"expires"`

 	// Hostname of the client.
@@ -231,7 +238,7 @@ func Create(conf *ServerConfig) (s *server, err error) {

 			LocalDomainName: conf.LocalDomainName,

-			dbFilePath: filepath.Join(conf.DataDir, dataFilename),
+			DBFilePath: filepath.Join(conf.WorkDir, dbFilename),
 		},
 	}

@@ -272,13 +279,6 @@ func Create(conf *ServerConfig) (s *server, err error) {
 		return nil, fmt.Errorf("neither dhcpv4 nor dhcpv6 srv is configured")
 	}

-	// Migrate leases db if needed.
-	err = migrateDB(conf)
-	if err != nil {
-		// Don't wrap the error since it's informative enough as is.
-		return nil, err
-	}
-
 	// Don't delay database loading until the DHCP server is started,
 	// because we need static leases functionality available beforehand.
 	err = s.dbLoad()
--- a/internal/dhcpd/dhcpd_unix_test.go
+++ b/internal/dhcpd/dhcpd_unix_test.go
@@ -5,7 +5,7 @@ package dhcpd
 import (
 	"net"
 	"net/netip"
-	"path/filepath"
+	"os"
 	"testing"
 	"time"

@@ -27,7 +27,7 @@ func TestDB(t *testing.T) {
 	var err error
 	s := server{
 		conf: &ServerConfig{
-			dbFilePath: filepath.Join(t.TempDir(), dataFilename),
+			DBFilePath: dbFilename,
 		},
 	}

@@ -67,6 +67,8 @@ func TestDB(t *testing.T) {
 	err = s.dbStore()
 	require.NoError(t, err)

+	testutil.CleanupAndRequireSuccess(t, func() (err error) { return os.Remove(dbFilename) })
+
 	err = s.srv4.ResetLeases(nil)
 	require.NoError(t, err)

@@ -76,13 +78,36 @@ func TestDB(t *testing.T) {
 	ll := s.srv4.GetLeases(LeasesAll)
 	require.Len(t, ll, len(leases))

-	assert.Equal(t, leases[0].HWAddr, ll[0].HWAddr)
-	assert.Equal(t, leases[0].IP, ll[0].IP)
-	assert.Equal(t, leases[0].Expiry.Unix(), ll[0].Expiry.Unix())
+	assert.Equal(t, leases[1].HWAddr, ll[0].HWAddr)
+	assert.Equal(t, leases[1].IP, ll[0].IP)
+	assert.True(t, ll[0].IsStatic)

-	assert.Equal(t, leases[1].HWAddr, ll[1].HWAddr)
-	assert.Equal(t, leases[1].IP, ll[1].IP)
-	assert.True(t, ll[1].IsStatic)
+	assert.Equal(t, leases[0].HWAddr, ll[1].HWAddr)
+	assert.Equal(t, leases[0].IP, ll[1].IP)
+	assert.Equal(t, leases[0].Expiry.Unix(), ll[1].Expiry.Unix())
+}
+
+func TestNormalizeLeases(t *testing.T) {
+	dynLeases := []*Lease{{
+		HWAddr: net.HardwareAddr{1, 2, 3, 4},
+	}, {
+		HWAddr: net.HardwareAddr{1, 2, 3, 5},
+	}}
+
+	staticLeases := []*Lease{{
+		HWAddr: net.HardwareAddr{1, 2, 3, 4},
+		IP:     netip.MustParseAddr("0.2.3.4"),
+	}, {
+		HWAddr: net.HardwareAddr{2, 2, 3, 4},
+	}}
+
+	leases := normalizeLeases(staticLeases, dynLeases)
+	require.Len(t, leases, 3)
+
+	assert.Equal(t, leases[0].HWAddr, dynLeases[0].HWAddr)
+	assert.Equal(t, leases[0].IP, staticLeases[0].IP)
+	assert.Equal(t, leases[1].HWAddr, staticLeases[1].HWAddr)
+	assert.Equal(t, leases[2].HWAddr, dynLeases[1].HWAddr)
 }

 func TestV4Server_badRange(t *testing.T) {
--- a/internal/dhcpd/http_unix.go
+++ b/internal/dhcpd/http_unix.go
@@ -639,7 +639,7 @@ func (s *server) handleReset(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	err = os.Remove(s.conf.dbFilePath)
+	err = os.Remove(s.conf.DBFilePath)
 	if err != nil && !errors.Is(err, os.ErrNotExist) {
 		log.Error("dhcp: removing db: %s", err)
 	}
@@ -651,8 +651,8 @@ func (s *server) handleReset(w http.ResponseWriter, r *http.Request) {

 		LocalDomainName: s.conf.LocalDomainName,

-		DataDir:    s.conf.DataDir,
-		dbFilePath: s.conf.dbFilePath,
+		WorkDir:    s.conf.WorkDir,
+		DBFilePath: s.conf.DBFilePath,
 	}

 	v4conf := &V4ServerConf{
--- a/internal/dhcpd/http_unix_test.go
+++ b/internal/dhcpd/http_unix_test.go
@@ -31,7 +31,8 @@ func TestServer_handleDHCPStatus(t *testing.T) {
 	s, err := Create(&ServerConfig{
 		Enabled:        true,
 		Conf4:          *defaultV4ServerConf(),
-		DataDir:        t.TempDir(),
+		WorkDir:        t.TempDir(),
+		DBFilePath:     dbFilename,
 		ConfigModified: func() {},
 	})
 	require.NoError(t, err)
--- a/internal/dhcpd/migrate.go
+++ b/internal/dhcpd/migrate.go
@@ -1,106 +0,0 @@
-package dhcpd
-
-import (
-	"encoding/json"
-	"net"
-	"net/netip"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/log"
-)
-
-const (
-	// leaseExpireStatic is used to define the Expiry field for static
-	// leases.
-	//
-	// Deprecated:  Remove it when migration of DHCP leases will be not needed.
-	leaseExpireStatic = 1
-
-	// dbFilename contains saved leases.
-	//
-	// Deprecated:  Use dataFilename.
-	dbFilename = "leases.db"
-)
-
-// leaseJSON is the structure of stored lease.
-//
-// Deprecated:  Use [Lease].
-type leaseJSON struct {
-	HWAddr   []byte `json:"mac"`
-	IP       []byte `json:"ip"`
-	Hostname string `json:"host"`
-	Expiry   int64  `json:"exp"`
-}
-
-func normalizeIP(ip net.IP) net.IP {
-	ip4 := ip.To4()
-	if ip4 != nil {
-		return ip4
-	}
-
-	return ip
-}
-
-// migrateDB migrates stored leases if necessary.
-func migrateDB(conf *ServerConfig) (err error) {
-	defer func() { err = errors.Annotate(err, "migrating db: %w") }()
-
-	oldLeasesPath := filepath.Join(conf.WorkDir, dbFilename)
-	dataDirPath := filepath.Join(conf.DataDir, dataFilename)
-
-	file, err := os.Open(oldLeasesPath)
-	if errors.Is(err, os.ErrNotExist) {
-		// Nothing to migrate.
-		return nil
-	} else if err != nil {
-		// Don't wrap the error since it's informative enough as is.
-		return err
-	}
-
-	ljs := []leaseJSON{}
-	err = json.NewDecoder(file).Decode(&ljs)
-	if err != nil {
-		// Don't wrap the error since it's informative enough as is.
-		return err
-	}
-
-	err = file.Close()
-	if err != nil {
-		// Don't wrap the error since it's informative enough as is.
-		return err
-	}
-
-	leases := []*Lease{}
-
-	for _, lj := range ljs {
-		lj.IP = normalizeIP(lj.IP)
-
-		ip, ok := netip.AddrFromSlice(lj.IP)
-		if !ok {
-			log.Info("dhcp: invalid IP: %s", lj.IP)
-
-			continue
-		}
-
-		lease := &Lease{
-			Expiry:   time.Unix(lj.Expiry, 0),
-			Hostname: lj.Hostname,
-			HWAddr:   lj.HWAddr,
-			IP:       ip,
-			IsStatic: lj.Expiry == leaseExpireStatic,
-		}
-
-		leases = append(leases, lease)
-	}
-
-	err = writeDB(dataDirPath, leases)
-	if err != nil {
-		// Don't wrap the error since it's informative enough as is.
-		return err
-	}
-
-	return os.Remove(oldLeasesPath)
-}
--- a/internal/dhcpd/migrate_internal_test.go
+++ b/internal/dhcpd/migrate_internal_test.go
@@ -1,73 +0,0 @@
-package dhcpd
-
-import (
-	"encoding/json"
-	"net"
-	"net/netip"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const testData = `[
-{"mac":"ESIzRFVm","ip":"AQIDBA==","host":"test1","exp":1},
-{"mac":"ZlVEMyIR","ip":"BAMCAQ==","host":"test2","exp":1231231231}
-]`
-
-func TestMigrateDB(t *testing.T) {
-	dir := t.TempDir()
-
-	oldLeasesPath := filepath.Join(dir, dbFilename)
-	dataDirPath := filepath.Join(dir, dataFilename)
-
-	err := os.WriteFile(oldLeasesPath, []byte(testData), 0o644)
-	require.NoError(t, err)
-
-	wantLeases := []*Lease{{
-		Expiry:   time.Time{},
-		Hostname: "test1",
-		HWAddr:   net.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
-		IP:       netip.MustParseAddr("1.2.3.4"),
-		IsStatic: true,
-	}, {
-		Expiry:   time.Unix(1231231231, 0),
-		Hostname: "test2",
-		HWAddr:   net.HardwareAddr{0x66, 0x55, 0x44, 0x33, 0x22, 0x11},
-		IP:       netip.MustParseAddr("4.3.2.1"),
-		IsStatic: false,
-	}}
-
-	conf := &ServerConfig{
-		WorkDir: dir,
-		DataDir: dir,
-	}
-
-	err = migrateDB(conf)
-	require.NoError(t, err)
-
-	_, err = os.Stat(oldLeasesPath)
-	require.ErrorIs(t, err, os.ErrNotExist)
-
-	var data []byte
-	data, err = os.ReadFile(dataDirPath)
-	require.NoError(t, err)
-
-	dl := &dataLeases{}
-	err = json.Unmarshal(data, dl)
-	require.NoError(t, err)
-
-	leases := dl.Leases
-
-	for i, wl := range wantLeases {
-		assert.Equal(t, wl.Hostname, leases[i].Hostname)
-		assert.Equal(t, wl.HWAddr, leases[i].HWAddr)
-		assert.Equal(t, wl.IP, leases[i].IP)
-		assert.Equal(t, wl.IsStatic, leases[i].IsStatic)
-
-		require.True(t, wl.Expiry.Equal(leases[i].Expiry))
-	}
-}
--- a/internal/dhcpd/v4_unix.go
+++ b/internal/dhcpd/v4_unix.go
@@ -256,8 +256,6 @@ func (s *v4Server) rmLeaseByIndex(i int) {

 // Remove a dynamic lease with the same properties
 // Return error if a static lease is found
-//
-// TODO(s.chzhen):  Refactor the code.
 func (s *v4Server) rmDynamicLease(lease *Lease) (err error) {
 	for i, l := range s.leases {
 		isStatic := l.IsStatic
@@ -359,6 +357,7 @@ func (s *v4Server) AddStaticLease(l *Lease) (err error) {
 		return fmt.Errorf("can't assign the gateway IP %s to the lease", gwIP)
 	}

+	l.Expiry = time.Unix(leaseExpireStatic, 0)
 	l.IsStatic = true

 	err = netutil.ValidateMAC(l.HWAddr)
--- a/internal/dhcpd/v4_unix_test.go
+++ b/internal/dhcpd/v4_unix_test.go
@@ -68,6 +68,7 @@ func TestV4Server_leasing(t *testing.T) {

 	t.Run("add_static", func(t *testing.T) {
 		err := s.AddStaticLease(&Lease{
+			Expiry:   time.Unix(leaseExpireStatic, 0),
 			Hostname: staticName,
 			HWAddr:   staticMAC,
 			IP:       staticIP,
@@ -77,6 +78,7 @@ func TestV4Server_leasing(t *testing.T) {

 		t.Run("same_name", func(t *testing.T) {
 			err = s.AddStaticLease(&Lease{
+				Expiry:   time.Unix(leaseExpireStatic, 0),
 				Hostname: staticName,
 				HWAddr:   anotherMAC,
 				IP:       anotherIP,
@@ -91,6 +93,7 @@ func TestV4Server_leasing(t *testing.T) {
 				" (" + staticMAC.String() + "): static lease already exists"

 			err = s.AddStaticLease(&Lease{
+				Expiry:   time.Unix(leaseExpireStatic, 0),
 				Hostname: anotherName,
 				HWAddr:   staticMAC,
 				IP:       anotherIP,
@@ -105,6 +108,7 @@ func TestV4Server_leasing(t *testing.T) {
 				" (" + anotherMAC.String() + "): static lease already exists"

 			err = s.AddStaticLease(&Lease{
+				Expiry:   time.Unix(leaseExpireStatic, 0),
 				Hostname: anotherName,
 				HWAddr:   anotherMAC,
 				IP:       staticIP,
@@ -780,6 +784,7 @@ func TestV4Server_FindMACbyIP(t *testing.T) {

 	s := &v4Server{
 		leases: []*Lease{{
+			Expiry:   time.Unix(leaseExpireStatic, 0),
 			Hostname: staticName,
 			HWAddr:   staticMAC,
 			IP:       staticIP,
--- a/internal/dhcpd/v6_unix.go
+++ b/internal/dhcpd/v6_unix.go
@@ -66,7 +66,8 @@ func (s *v6Server) ResetLeases(leases []*Lease) (err error) {
 	s.leases = nil
 	for _, l := range leases {
 		ip := net.IP(l.IP.AsSlice())
-		if !l.IsStatic && !ip6InRange(s.conf.ipStart, ip) {
+		if l.Expiry.Unix() != leaseExpireStatic &&
+			!ip6InRange(s.conf.ipStart, ip) {

 			log.Debug("dhcpv6: skipping a lease with IP %v: not within current IP range", l.IP)

@@ -88,7 +89,7 @@ func (s *v6Server) GetLeases(flags GetLeasesFlags) (leases []*Lease) {
 	leases = []*Lease{}
 	s.leasesLock.Lock()
 	for _, l := range s.leases {
-		if l.IsStatic {
+		if l.Expiry.Unix() == leaseExpireStatic {
 			if (flags & LeasesStatic) != 0 {
 				leases = append(leases, l.Clone())
 			}
@@ -149,7 +150,7 @@ func (s *v6Server) rmDynamicLease(lease *Lease) (err error) {
 		l := s.leases[i]

 		if bytes.Equal(l.HWAddr, lease.HWAddr) {
-			if l.IsStatic {
+			if l.Expiry.Unix() == leaseExpireStatic {
 				return fmt.Errorf("static lease already exists")
 			}

@@ -162,7 +163,7 @@ func (s *v6Server) rmDynamicLease(lease *Lease) (err error) {
 		}

 		if l.IP == lease.IP {
-			if l.IsStatic {
+			if l.Expiry.Unix() == leaseExpireStatic {
 				return fmt.Errorf("static lease already exists")
 			}

@@ -186,7 +187,7 @@ func (s *v6Server) AddStaticLease(l *Lease) (err error) {
 		return fmt.Errorf("validating lease: %w", err)
 	}

-	l.IsStatic = true
+	l.Expiry = time.Unix(leaseExpireStatic, 0)

 	s.leasesLock.Lock()
 	err = s.rmDynamicLease(l)
@@ -273,7 +274,8 @@ func (s *v6Server) findLease(mac net.HardwareAddr) *Lease {
 func (s *v6Server) findExpiredLease() int {
 	now := time.Now().Unix()
 	for i, lease := range s.leases {
-		if !lease.IsStatic && lease.Expiry.Unix() <= now {
+		if lease.Expiry.Unix() != leaseExpireStatic &&
+			lease.Expiry.Unix() <= now {
 			return i
 		}
 	}
@@ -419,7 +421,7 @@ func (s *v6Server) commitLease(msg *dhcpv6.Message, lease *Lease) time.Duration
 		dhcpv6.MessageTypeRenew,
 		dhcpv6.MessageTypeRebind:

-		if !lease.IsStatic {
+		if lease.Expiry.Unix() != leaseExpireStatic {
 			s.commitDynamicLease(lease)
 		}
 	}
--- a/internal/dhcpd/v6_unix_test.go
+++ b/internal/dhcpd/v6_unix_test.go
@@ -44,7 +44,7 @@ func TestV6_AddRemove_static(t *testing.T) {

 	assert.Equal(t, l.IP, ls[0].IP)
 	assert.Equal(t, l.HWAddr, ls[0].HWAddr)
-	assert.True(t, ls[0].IsStatic)
+	assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix())

 	// Try to remove non-existent static lease.
 	err = s.RemoveStaticLease(&Lease{
@@ -103,7 +103,7 @@ func TestV6_AddReplace(t *testing.T) {
 	for i, l := range ls {
 		assert.Equal(t, stLeases[i].IP, l.IP)
 		assert.Equal(t, stLeases[i].HWAddr, l.HWAddr)
-		assert.True(t, l.IsStatic)
+		assert.EqualValues(t, leaseExpireStatic, l.Expiry.Unix())
 	}
 }

@@ -327,6 +327,7 @@ func TestV6_FindMACbyIP(t *testing.T) {

 	s := &v6Server{
 		leases: []*Lease{{
+			Expiry:   time.Unix(leaseExpireStatic, 0),
 			Hostname: staticName,
 			HWAddr:   staticMAC,
 			IP:       staticIP,
@@ -340,6 +341,7 @@ func TestV6_FindMACbyIP(t *testing.T) {
 	}

 	s.leases = []*Lease{{
+		Expiry:   time.Unix(leaseExpireStatic, 0),
 		Hostname: staticName,
 		HWAddr:   staticMAC,
 		IP:       staticIP,
--- a/internal/dnsforward/http_test.go
+++ b/internal/dnsforward/http_test.go
@@ -205,8 +205,8 @@ func TestDNSForwardHTTP_handleSetConfig(t *testing.T) {
 		wantSet: `validating upstream servers: validating upstream "!!!": not an ip:port`,
 	}, {
 		name: "bootstraps_bad",
-		wantSet: `checking bootstrap a: invalid address: bootstrap a:53: ` +
-			`ParseAddr("a"): unable to parse IP`,
+		wantSet: `checking bootstrap a: invalid address: ` +
+			`Resolver a is not eligible to be a bootstrap DNS server`,
 	}, {
 		name:    "cache_bad_ttl",
 		wantSet: `cache_ttl_min must be less or equal than cache_ttl_max`,
--- a/internal/filtering/servicelist.go
+++ b/internal/filtering/servicelist.go
@@ -1438,8 +1438,6 @@ var blockedServices = []blockedService{{
 		"||mindly.social^",
 		"||mstdn.ca^",
 		"||mstdn.jp^",
-		"||mstdn.party^",
-		"||mstdn.plus^",
 		"||mstdn.social^",
 		"||muenchen.social^",
 		"||muenster.im^",
@@ -1449,6 +1447,7 @@ var blockedServices = []blockedService{{
 		"||nrw.social^",
 		"||o3o.ca^",
 		"||ohai.social^",
+		"||pewtix.com^",
 		"||piaille.fr^",
 		"||pol.social^",
 		"||ravenation.club^",
@@ -1470,6 +1469,7 @@ var blockedServices = []blockedService{{
 		"||techhub.social^",
 		"||theblower.au^",
 		"||tkz.one^",
+		"||todon.eu^",
 		"||toot.aquilenet.fr^",
 		"||toot.community^",
 		"||toot.funami.tech^",
--- a/internal/home/clients_test.go
+++ b/internal/home/clients_test.go
@@ -3,12 +3,14 @@ package home
 import (
 	"net"
 	"net/netip"
+	"os"
 	"runtime"
 	"testing"
 	"time"

 	"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
+	"github.com/AdguardTeam/golibs/testutil"

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -281,8 +283,8 @@ func TestClientsAddExisting(t *testing.T) {

 		// First, init a DHCP server with a single static lease.
 		config := &dhcpd.ServerConfig{
-			Enabled: true,
-			DataDir: t.TempDir(),
+			Enabled:    true,
+			DBFilePath: "leases.db",
 			Conf4: dhcpd.V4ServerConf{
 				Enabled:    true,
 				GatewayIP:  netip.MustParseAddr("1.2.3.1"),
@@ -294,6 +296,9 @@ func TestClientsAddExisting(t *testing.T) {

 		dhcpServer, err := dhcpd.Create(config)
 		require.NoError(t, err)
+		testutil.CleanupAndRequireSuccess(t, func() (err error) {
+			return os.Remove("leases.db")
+		})

 		clients.dhcpServer = dhcpServer

--- a/internal/home/home.go
+++ b/internal/home/home.go
@@ -306,9 +306,7 @@ func setupConfig(opts options) (err error) {
 		return fmt.Errorf("initializing safesearch: %w", err)
 	}

-	//lint:ignore SA1019  Migration is not over.
 	config.DHCP.WorkDir = Context.workDir
-	config.DHCP.DataDir = Context.getDataDir()
 	config.DHCP.HTTPRegister = httpRegister
 	config.DHCP.ConfigModified = onConfigModified

--- a/internal/querylog/decode_test.go
+++ b/internal/querylog/decode_test.go
@@ -182,7 +182,8 @@ func TestDecodeLogEntry(t *testing.T) {
 			if tc.want == "" {
 				assert.Empty(t, s)
 			} else {
-				assert.True(t, strings.HasSuffix(s, tc.want), "got %q", s)
+				assert.True(t, strings.HasSuffix(s, tc.want),
+					"got %q", s)
 			}

 			logOutput.Reset()
--- a/internal/querylog/qlog_test.go
+++ b/internal/querylog/qlog_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"

 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
+	"github.com/AdguardTeam/dnsproxy/proxyutil"
 	"github.com/AdguardTeam/golibs/stringutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/AdguardTeam/golibs/timeutil"
@@ -366,6 +367,6 @@ func assertLogEntry(t *testing.T, entry *logEntry, host string, answer, client n
 	require.NoError(t, msg.Unpack(entry.Answer))
 	require.Len(t, msg.Answer, 1)

-	a := testutil.RequireTypeAssert[*dns.A](t, msg.Answer[0])
-	assert.Equal(t, answer, a.A.To16())
+	ip := proxyutil.IPFromRR(msg.Answer[0]).To16()
+	assert.Equal(t, answer, ip)
 }
--- 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.15.0
 	golang.org/x/tools v0.8.0
-	golang.org/x/vuln v0.0.0-20230418010118-28ba02ac73db
+	golang.org/x/vuln v0.0.0-20230412133542-76c53851972b
 	honnef.co/go/tools v0.4.3
 	mvdan.cc/gofumpt v0.5.0
 	mvdan.cc/unparam v0.0.0-20230312165513-e84e2d14e3b8
--- a/internal/tools/go.sum
+++ b/internal/tools/go.sum
@@ -92,8 +92,8 @@ 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.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
 golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
-golang.org/x/vuln v0.0.0-20230418010118-28ba02ac73db h1:tLxfII6jPR3mfwEMkyOakawu+Lldo9hIA7vliXnDZYg=
-golang.org/x/vuln v0.0.0-20230418010118-28ba02ac73db/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
+golang.org/x/vuln v0.0.0-20230412133542-76c53851972b h1:o/Q5x3MPiGccB6ViFm9Df21OWQz5qAUtEVsFaNXFR6o=
+golang.org/x/vuln v0.0.0-20230412133542-76c53851972b/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Author	SHA1	Message	Date
Artem Krisanov	521aedc5bc	Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home into AG-21485	2023-04-18 14:27:28 +03:00
Artem Krisanov	40ff26ea21	Login theme bugfix.	2023-04-18 14:11:28 +03:00