Merge remote-tracking branch 'origin/master' into 3389-querylog-export

# Conflicts: # CHANGELOG.md
2023-06-22 13:28:17 +04:00 · 2023-06-15 14:40:06 +04:00 · 2023-06-15 14:38:44 +04:00 · 2023-06-14 12:07:16 +04:00 · 2023-06-14 10:51:17 +04:00 · 2023-06-14 10:08:11 +04:00
166 changed files with 3593 additions and 6854 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 'name': 'build'

 'env':
-  'GO_VERSION': '1.19.11'
+  'GO_VERSION': '1.19.10'
  'NODE_VERSION': '14'

 'on':
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 'name': 'lint'

 'env':
-  'GO_VERSION': '1.19.11'
+  'GO_VERSION': '1.19.10'

 'on':
  'push':
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@
 *.db
 *.log
 *.snap
-*.test
 /agh-backup/
 /bin/
 /build/*
@@ -17,13 +16,10 @@
 /dist/
 /filtering/tests/filtering.TestLotsOfRules*.pprof
 /filtering/tests/top-1m.csv
-/internal/next/AdGuardHome.yaml
 /launchpad_credentials
 /querylog.json*
 /snapcraft_login
-AdGuardHome
-AdGuardHome.exe
-AdGuardHome.yaml*
+AdGuardHome*
 coverage.txt
 node_modules/

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

-## [v0.107.35] - 2023-08-02 (APPROX.)
+## [v0.107.33] - 2023-06-28 (APPROX.)

-See also the [v0.107.35 GitHub milestone][ms-v0.107.35].
+See also the [v0.107.33 GitHub milestone][ms-v0.107.33].

-[ms-v0.107.35]: https://github.com/AdguardTeam/AdGuardHome/milestone/70?closed=1
+[ms-v0.107.33]: https://github.com/AdguardTeam/AdGuardHome/milestone/68?closed=1

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

-### Fixed
-
- Occasional client information lookup failures that could lead to the DNS
-  server getting stuck ([#6006]).
- `bufio.Scanner: token too long` errors when trying to add filtering-rule lists
-  with lines over 1024 bytes long ([#6003]).
-
-### Removed
-
- Default exposure of the non-standard ports 784 and 8853 for DNS-over-QUIC in
-  the `Dockerfile`.
-
-[#6003]: https://github.com/AdguardTeam/AdGuardHome/issues/6003
-[#6006]: https://github.com/AdguardTeam/AdGuardHome/issues/6006
-
-<!--
-NOTE: Add new changes ABOVE THIS COMMENT.
-->
-
-
-
-## [v0.107.34] - 2023-07-12
-
-See also the [v0.107.34 GitHub milestone][ms-v0.107.34].
-
-### Security
-
- Go version has been updated to prevent the possibility of exploiting the
-  CVE-2023-29406 Go vulnerability fixed in [Go 1.19.11][go-1.19.11].
-
 ### Added

- Ability to ignore queries for the root domain, such as `NS .` queries
-  ([#5990]).
-
-### Changed
-
- Improved CPU and RAM consumption during updates of filtering-rule lists.
-
-#### Configuration Changes
-
-In this release, the schema version has changed from 23 to 24.
-
- Properties starting with `log_`, and `verbose` property, which used to set up
-  logging are now moved to the new object `log` containing new properties
-  `file`, `max_backups`, `max_size`, `max_age`, `compress`, `local_time`, and
-  `verbose`:
-
-  ```yaml
-  # BEFORE:
-  'log_file': ""
-  'log_max_backups': 0
-  'log_max_size': 100
-  'log_max_age': 3
-  'log_compress': false
-  'log_localtime': false
-  'verbose': false
-
-  # AFTER:
-  'log':
-      'file': ""
-      'max_backups': 0
-      'max_size': 100
-      'max_age': 3
-      'compress': false
-      'local_time': false
-      'verbose': false
-  ```
-
-  To rollback this change, remove the new object `log`, set back `log_` and
-  `verbose` properties and change the `schema_version` back to `23`.
-
-### Deprecated
-
- Default exposure of the non-standard ports 784 and 8853 for DNS-over-QUIC in
-  the `Dockerfile`.
-
-### Fixed
-
- Two unspecified IPs when a host is blocked in two filter lists ([#5972]).
- Incorrect setting of Parental Control cache size.
- Excessive RAM and CPU consumption by Safe Browsing and Parental Control
-  filters ([#5896]).
-
-### Removed
-
- The `HEALTHCHECK` section and the use of `tini` in the `ENTRYPOINT` section in
-  `Dockerfile` ([#5939]).  They caused a lot of issues, especially with tools
-  like `docker-compose` and `podman`.
-
-  **NOTE:** Some Docker tools may cache `ENTRYPOINT` sections, so some users may
-  be required to backup their configuration, stop the container, purge the old
-  image, and reload it from scratch.
-
-[#5896]: https://github.com/AdguardTeam/AdGuardHome/issues/5896
-[#5972]: https://github.com/AdguardTeam/AdGuardHome/issues/5972
-[#5990]: https://github.com/AdguardTeam/AdGuardHome/issues/5990
-
-[go-1.19.11]:   https://groups.google.com/g/golang-announce/c/2q13H6LEEx0/m/sduSepLLBwAJ
-[ms-v0.107.34]: https://github.com/AdguardTeam/AdGuardHome/milestone/69?closed=1
-
-
-
-## [v0.107.33] - 2023-07-03
-
-See also the [v0.107.33 GitHub milestone][ms-v0.107.33].
-
-### Added
-
- The new command-line flag `--web-addr` is the address to serve the web UI on,
-  in the host:port format.
- The ability to set inactivity periods for filtering blocked services, both
-  globally and per client, in the configuration file ([#951]).  The UI changes
-  are coming in the upcoming releases.
+- The new HTTP API, `GET /control/querylog/export`, which can be used to
+  export query log items.  See `openapi/openapi.yaml` for the full description
+  ([#3389]).
+- The ability to set inactivity periods for filtering blocked services in the
+  configuration file ([#951]).  The UI changes are coming in the upcoming
+  releases.
 - The ability to edit rewrite rules via `PUT /control/rewrite/update` HTTP API
-  and the Web UI ([#1577]).
+  ([#1577]).

 ### Changed

 #### Configuration Changes

-In this release, the schema version has changed from 20 to 23.
+In this release, the schema version has changed from 20 to 21.

- Properties `bind_host`, `bind_port`, and `web_session_ttl` which used to setup
-  web UI binding configuration, are now moved to a new object `http` containing
-  new properties `address` and `session_ttl`:
-
-  ```yaml
-  # BEFORE:
-  'bind_host': '1.2.3.4'
-  'bind_port': 8080
-  'web_session_ttl': 720
-
-  # AFTER:
-  'http':
-    'address': '1.2.3.4:8080'
-    'session_ttl': '720h'
-  ```
-
-  Note that the new `http.session_ttl` property is now a duration string.  To
-  rollback this change, remove the new object `http`, set back `bind_host`,
-  `bind_port`, `web_session_ttl`,  and change the `schema_version` back to `22`.
- Property `clients.persistent.blocked_services`, which in schema versions 21
-  and earlier used to be a list containing ids of blocked services, is now an
-  object containing ids and schedule for blocked services:
-
-  ```yaml
-  # BEFORE:
-  'clients':
-    'persistent':
-      - 'name': 'client-name'
-        'blocked_services':
-        - id_1
-        - id_2
-
-  # AFTER:
-  'clients':
-    'persistent':
-    - 'name': client-name
-      'blocked_services':
-        'ids':
-        - id_1
-        - id_2
-      'schedule':
-        'time_zone': 'Local'
-        'sun':
-          'start': '0s'
-          'end': '24h'
-        'mon':
-          'start': '1h'
-          'end': '23h'
-  ```
-
-  To rollback this change, replace `clients.persistent.blocked_services` object
-  with the list of ids of blocked services and change the `schema_version` back
-  to `21`.
 - Property `dns.blocked_services`, which in schema versions 20 and earlier used
  to be a list containing ids of blocked services, is now an object containing
  ids and schedule for blocked services:
@@ -242,23 +83,8 @@ In this release, the schema version has changed from 20 to 23.
  To rollback this change, replace `dns.blocked_services` object with the list
  of ids of blocked services and change the `schema_version` back to `20`.

-### Deprecated
-
- The `HEALTHCHECK` section and the use of `tini` in the `ENTRYPOINT` section in
-  `Dockerfile` ([#5939]).  They cause a lot of issues, especially with tools
-  like `docker-compose` and `podman`, and will be removed in a future release.
- Flags `-h`, `--host`, `-p`, `--port` have been deprecated.  The `-h` flag
-  will work as an alias for `--help`, instead of the deprecated `--host` in the
-  future releases.
-
 ### Fixed

- Ignoring of `/etc/hosts` file when resolving the hostnames of upstream DNS
-  servers ([#5902]).
- Excessive error logging when using DNS-over-QUIC ([#5285]).
- Inability to set `bind_host` in `AdGuardHome.yaml` in Docker ([#4231],
-  [#4235]).
- The blocklists can now be deleted properly ([#5700]).
 - Queries with the question-section target `.`, for example `NS .`, are now
  counted in the statistics and correctly shown in the query log ([#5910]).
 - Safe Search not working with `AAAA` queries for domains that don't have `AAAA`
@@ -266,16 +92,13 @@ In this release, the schema version has changed from 20 to 23.

 [#951]:  https://github.com/AdguardTeam/AdGuardHome/issues/951
 [#1577]: https://github.com/AdguardTeam/AdGuardHome/issues/1577
-[#4231]: https://github.com/AdguardTeam/AdGuardHome/issues/4231
-[#4235]: https://github.com/AdguardTeam/AdGuardHome/pull/4235
-[#5285]: https://github.com/AdguardTeam/AdGuardHome/issues/5285
-[#5700]: https://github.com/AdguardTeam/AdGuardHome/issues/5700
-[#5902]: https://github.com/AdguardTeam/AdGuardHome/issues/5902
+[#3389]: https://github.com/AdguardTeam/AdGuardHome/issues/3389
 [#5910]: https://github.com/AdguardTeam/AdGuardHome/issues/5910
 [#5913]: https://github.com/AdguardTeam/AdGuardHome/issues/5913
-[#5939]: https://github.com/AdguardTeam/AdGuardHome/discussions/5939

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



@@ -2257,13 +2080,11 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].


 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.35...HEAD
-[v0.107.35]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.34...v0.107.35
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.33...HEAD
+[v0.107.33]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.32...v0.107.33
 -->

-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.34...HEAD
-[v0.107.34]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.33...v0.107.34
-[v0.107.33]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.32...v0.107.33
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.32...HEAD
 [v0.107.32]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.31...v0.107.32
 [v0.107.31]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.30...v0.107.31
 [v0.107.30]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.29...v0.107.30
--- a/4
+++ b/4
@@ -78,7 +78,7 @@ build: deps quick-build

 quick-build: js-build go-build

-ci: deps test go-bench go-fuzz
+ci: deps test

 deps: js-deps go-deps
 lint: js-lint go-lint
@@ -104,10 +104,8 @@ js-deps:
 js-lint: ; $(NPM) $(NPM_FLAGS) run lint
 js-test: ; $(NPM) $(NPM_FLAGS) run test

-go-bench: ; $(ENV) "$(SHELL)" ./scripts/make/go-bench.sh
 go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
 go-deps:  ; $(ENV) "$(SHELL)" ./scripts/make/go-deps.sh
-go-fuzz:  ; $(ENV) "$(SHELL)" ./scripts/make/go-fuzz.sh
 go-lint:  ; $(ENV) "$(SHELL)" ./scripts/make/go-lint.sh
 go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh

--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -7,7 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
    'channel': 'edge'
-    'dockerGo': 'adguard/golang-ubuntu:6.8'
+    'dockerGo': 'adguard/golang-ubuntu:6.7'

 'stages':
  - 'Build frontend':
@@ -272,7 +272,7 @@
        # need to build a few of these.
        'variables':
            'channel': 'beta'
-            'dockerGo': 'adguard/golang-ubuntu:6.8'
+            'dockerGo': 'adguard/golang-ubuntu:6.7'
    # release-vX.Y.Z branches are the branches from which the actual final
    # release is built.
  - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -287,4 +287,4 @@
        # are the ones that actually get released.
        'variables':
            'channel': 'release'
-            'dockerGo': 'adguard/golang-ubuntu:6.8'
+            'dockerGo': 'adguard/golang-ubuntu:6.7'
--- a/bamboo-specs/snapcraft.yaml
+++ b/bamboo-specs/snapcraft.yaml
@@ -10,7 +10,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
    'channel': 'edge'
-    'dockerGo': 'adguard/golang-ubuntu:6.8'
+    'dockerGo': 'adguard/golang-ubuntu:6.7'
    'snapcraftChannel': 'edge'

 'stages':
@@ -191,7 +191,7 @@
        # need to build a few of these.
        'variables':
            'channel': 'beta'
-            'dockerGo': 'adguard/golang-ubuntu:6.8'
+            'dockerGo': 'adguard/golang-ubuntu:6.7'
            'snapcraftChannel': 'beta'
    # release-vX.Y.Z branches are the branches from which the actual final
    # release is built.
@@ -207,5 +207,5 @@
        # are the ones that actually get released.
        'variables':
            'channel': 'release'
-            'dockerGo': 'adguard/golang-ubuntu:6.8'
+            'dockerGo': 'adguard/golang-ubuntu:6.7'
            'snapcraftChannel': 'candidate'
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@
    'key': 'AHBRTSPECS'
    'name': 'AdGuard Home - Build and run tests'
 'variables':
-    'dockerGo': 'adguard/golang-ubuntu:6.8'
+    'dockerGo': 'adguard/golang-ubuntu:6.7'

 'stages':
  - 'Tests':
--- a/client/src/__locales/be.json
+++ b/client/src/__locales/be.json
@@ -475,9 +475,7 @@
    "setup_dns_notice": "Каб выкарыстоўваць <1>DNS-over-HTTPS</1> ці <1>DNS-over-TLS</1>, вам патрэбна <0>наладзіць шыфраванне</0> у наладах AdGuard Home.",
    "rewrite_added": "Правіла перанакіравання DNS для «{{key}}» паспяхова дададзена",
    "rewrite_deleted": "Правіла перанакіравання DNS для «{{key}}» паспяхова выдалена",
-    "rewrite_updated": "Перазапіс DNS паспяхова абноўлены",
    "rewrite_add": "Дадаць правіла перанакіравання DNS",
-    "rewrite_edit": "Рэдагаваць перазапіс DNS",
    "rewrite_not_found": "Не знойдзена правілаў перанакіравання DNS",
    "rewrite_confirm_delete": "Вы ўпэўнены, што хочаце выдаліць правіла перанакіравання DNS для «{{key}}»?",
    "rewrite_desc": "Дазваляе лёгка наладзіць карыстацкі DNS-адказ для пэўнага дамена.",
--- a/client/src/__locales/cs.json
+++ b/client/src/__locales/cs.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Pro použití <1>DNS skrze HTTPS</1> nebo <1>DNS skrze TLS</1> potřebujete v nastaveních AdGuard Home <0>nakonfigurovat šifrování</0>.",
    "rewrite_added": "Přesměrování DNS pro „{{key}}“ úspěšně přidáno",
    "rewrite_deleted": "Přesměrování DNS pro „{{key}}“ úspěšně smazáno",
-    "rewrite_updated": "Přesměrování DNS bylo úspěšně aktualizováno",
    "rewrite_add": "Přidat přesměrování DNS",
-    "rewrite_edit": "Upravit přesměrování DNS",
    "rewrite_not_found": "Přesměrování DNS nenalezeny",
    "rewrite_confirm_delete": "Jste si jisti, že chcete smazat přesměrování DNS pro „{{key}}“?",
    "rewrite_desc": "Umožňuje snadno nakonfigurovat vlastní DNS odezvy pro konkrétní název domény.",
--- a/client/src/__locales/da.json
+++ b/client/src/__locales/da.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "For at kunne bruge <1>DNS-over-HTTPS</1> eller <1>DNS-over-TLS</1>, skal du <0>opsætte Krypteringen</0> i AdGuard Homes indstillinger.",
    "rewrite_added": "DNS-omskrivning for \"{{key}}\" blev tilføjet",
    "rewrite_deleted": "DNS-omskrivning for \"{{key}}\" blev slettet",
-    "rewrite_updated": "DNS-omskrivning hermed opdateret",
    "rewrite_add": "Tilføj DNS-omskrivning",
-    "rewrite_edit": "Redigér DNS-omskrivning",
    "rewrite_not_found": "Ingen DNS-omskrivninger fundet",
    "rewrite_confirm_delete": "Sikker på, at du vil slette DNS-omskrivning for \"{{key}}\"?",
    "rewrite_desc": "Gør det nemt at opsætte det tilpassede DNS-svar for et specifikt domænenavn.",
--- a/client/src/__locales/de.json
+++ b/client/src/__locales/de.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Um <1>DNS-over-HTTTPS</1> oder <1>DNS-over-TLS</1> verwenden zu können, müssen Sie in den AdGuard Home Einstellungen die <0>Verschlüsselung konfigurieren</0>.",
    "rewrite_added": "DNS-Umschreibung für „{{key}}“ erfolgreich hinzugefügt",
    "rewrite_deleted": "DNS-Umschreibung für „{{key}}“ erfolgreich entfernt",
-    "rewrite_updated": "DNS-Rewrite erfolgreich aktualisiert",
    "rewrite_add": "DNS-Umschreibung hinzufügen",
-    "rewrite_edit": "DNS-Rewrite bearbeiten",
    "rewrite_not_found": "Keine DNS-Umschreibungen gefunden",
    "rewrite_confirm_delete": "Möchten Sie die DNS-Umschreibung für „{{key}}“ wirklich entfernen?",
    "rewrite_desc": "Ermöglicht die einfache Konfiguration der benutzerdefinierten DNS-Antwort für einen bestimmten Domainnamen.",
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -444,7 +444,7 @@
    "client_confirm_delete": "Are you sure you want to delete client \"{{key}}\"?",
    "list_confirm_delete": "Are you sure you want to delete this list?",
    "auto_clients_title": "Runtime clients",
-    "auto_clients_desc": "Information about IP addresses of devices that are using or may use AdGuard Home. This information is gathered from several sources, including hosts files, reverse DNS, etc.",
+    "auto_clients_desc": "Devices not on the list of Persistent clients that may still use AdGuard Home",
    "access_title": "Access settings",
    "access_desc": "Here you can configure access rules for the AdGuard Home DNS server",
    "access_allowed_title": "Allowed clients",
@@ -478,9 +478,7 @@
    "setup_dns_notice": "In order to use <1>DNS-over-HTTPS</1> or <1>DNS-over-TLS</1>, you need to <0>configure Encryption</0> in AdGuard Home settings.",
    "rewrite_added": "DNS rewrite for \"{{key}}\" successfully added",
    "rewrite_deleted": "DNS rewrite for \"{{key}}\" successfully deleted",
-    "rewrite_updated": "DNS rewrite successfully updated",
    "rewrite_add": "Add DNS rewrite",
-    "rewrite_edit": "Edit DNS rewrite",
    "rewrite_not_found": "No DNS rewrites found",
    "rewrite_confirm_delete": "Are you sure you want to delete DNS rewrite for \"{{key}}\"?",
    "rewrite_desc": "Allows to easily configure custom DNS response for a specific domain name.",
--- a/client/src/__locales/es.json
+++ b/client/src/__locales/es.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Para utilizar <1>DNS mediante HTTPS</1> o <1>DNS mediante TLS</1>, debes <0>configurar el cifrado</0> en la configuración de AdGuard Home.",
    "rewrite_added": "Reescritura DNS para \"{{key}}\" añadido correctamente",
    "rewrite_deleted": "Reescritura DNS para \"{{key}}\" eliminado correctamente",
-    "rewrite_updated": "Reconfiguración de DNS actualizada correctamente",
    "rewrite_add": "Añadir reescritura DNS",
-    "rewrite_edit": "Editar reconfiguración de DNS",
    "rewrite_not_found": "No se han encontrado reescrituras DNS",
    "rewrite_confirm_delete": "¿Estás seguro de que deseas eliminar la reescritura DNS para \"{{key}}\"?",
    "rewrite_desc": "Permite configurar fácilmente la respuesta DNS personalizada para un nombre de dominio específico.",
--- a/client/src/__locales/fa.json
+++ b/client/src/__locales/fa.json
@@ -440,9 +440,7 @@
    "setup_dns_notice": "به منظور استفاده از <1>DNS-over-HTTPS</1> یا <1>DNS-over-TLS</1>، شما نیاز به <0>پیکربندی رمزگذاری</0> در تنظیمات AdGuard Home دارید.",
    "rewrite_added": "بازنویسی DNS برای \"{{key}}\" با موفقیت اضافه شد",
    "rewrite_deleted": "بازنویسی DNS برای \"{{key}}\" با موفقیت حذف شد",
-    "rewrite_updated": "بازنویسی DNS با موفقیت به روز شد",
    "rewrite_add": "افزودن بازنویسی DNS",
-    "rewrite_edit": "بازنویسی DNS را ویرایش کنید",
    "rewrite_not_found": "بازنویسی DNS یافت نشد",
    "rewrite_confirm_delete": "آیا واقعا میخواهید بازنویسی DNS برای \"{{key}}\" را حذف کنید؟",
    "rewrite_desc": "به آسانی اجازه پیکربندی پاسخ DNS دستی برای یک نام دامنه خاص را می دهد.",
--- a/client/src/__locales/fi.json
+++ b/client/src/__locales/fi.json
@@ -222,7 +222,7 @@
    "all_lists_up_to_date_toast": "Kaikki listat ovat ajan tasalla",
    "updated_upstream_dns_toast": "Ylävirtojen palvelimet tallennettiin",
    "dns_test_ok_toast": "Määritetyt DNS-palvelimet toimivat oikein",
-    "dns_test_not_ok_toast": "Palvelin \"{{key}}\": Ei voitu käyttää, tarkista oikeinkirjoitus",
+    "dns_test_not_ok_toast": "Palvelin \"{{key}}\": ei voitu käyttää, tarkista sen oikeinkirjoitus",
    "dns_test_warning_toast": "Datavuon \"{{key}}\" ei vastaa testipyyntöihin eikä välttämättä toimi kunnolla",
    "unblock": "Salli",
    "block": "Estä",
@@ -478,9 +478,7 @@
    "setup_dns_notice": "<1>DNS-over-HTTPS</1> tai <1>DNS-over-TLS</1> -toteutuksia varten, on AdGuard Homen <0>Salausasetukset</0> määritettävä.",
    "rewrite_added": "Kohteen \"{{key}}\" DNS-uudelleenohjaus lisättiin",
    "rewrite_deleted": "Kohteen \"{{key}}\" DNS-uudelleenohjaus poistettiin",
-    "rewrite_updated": "DNS-uudelleenohjaukset päivitettiin",
    "rewrite_add": "Lisää DNS-uudelleenohjaus",
-    "rewrite_edit": "Muokkaa DNS-uudelleenohjausta",
    "rewrite_not_found": "DNS-uudelleenohjauksia ei löytynyt",
    "rewrite_confirm_delete": "Haluatko varmasti poistaa DNS-uudelleenohjauksen kohteelle \"{{key}}\"?",
    "rewrite_desc": "Mahdollistaa oman DNS-vastauksen helpon määrityksen tietylle verkkotunnukselle.",
--- a/client/src/__locales/fr.json
+++ b/client/src/__locales/fr.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Pour utiliser le <1>DNS-over-HTTPS</1> ou le <1>DNS-over-TLS</1>, vous devez <0>configurer le Chiffrement</0> dans les paramètres de AdGuard Home.",
    "rewrite_added": "Réécriture DNS pour « {{key}} » ajoutée",
    "rewrite_deleted": "Réécriture DNS pour « {{key}} » supprimée",
-    "rewrite_updated": "Réécriture DNS mise à jour",
    "rewrite_add": "Ajouter une réécriture DNS",
-    "rewrite_edit": "Modifier la réécriture DNS",
    "rewrite_not_found": "Aucune réécriture DNS trouvée",
    "rewrite_confirm_delete": "Voulez-vous vraiment supprimer la réécriture DNS pour « {{key}} » ?",
    "rewrite_desc": "Permet de configurer facilement la réponse DNS personnalisée pour un nom de domaine spécifique.",
--- a/client/src/__locales/hr.json
+++ b/client/src/__locales/hr.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Da biste koristili <1>DNS-over-HTTPS</1> ili <1>DNS-over-TLS</1>, morate <0>postaviti šifriranje</0> u AdGuard Home postavkama.",
    "rewrite_added": "DNS prijepis za \"{{key}}\" je uspješno dodan",
    "rewrite_deleted": "DNS prijepis za \"{{key}}\" je uspješno uklonjen",
-    "rewrite_updated": "Prepisivanje DNS-a uspješno ažurirano",
    "rewrite_add": "Dodaj DNS prijepis",
-    "rewrite_edit": "Uredite prepisivanje DNS-a",
    "rewrite_not_found": "Nema DNS prijepisa",
    "rewrite_confirm_delete": "Jeste li sigurni da želite ukloniti DNS prijepis za \"{{key}}\" klijenta?",
    "rewrite_desc": "Omogućuje jednostavno postavljanje prilagođenog DNS odgovora za određenu domenu.",
--- a/client/src/__locales/hu.json
+++ b/client/src/__locales/hu.json
@@ -167,7 +167,6 @@
    "enabled_parental_toast": "Szülői felügyelet engedélyezve",
    "disabled_safe_search_toast": "Biztonságos keresés letiltva",
    "enabled_save_search_toast": "Biztonságos keresés engedélyezve",
-    "updated_save_search_toast": "A Biztonságos keresés beállításai frissítve",
    "enabled_table_header": "Engedélyezve",
    "name_table_header": "Név",
    "list_url_table_header": "Lista URL-je",
@@ -291,8 +290,6 @@
    "rate_limit": "Kérések korlátozása",
    "edns_enable": "EDNS kliens alhálózat engedélyezése",
    "edns_cs_desc": "Adja hozzá az EDNS Client Subnet beállítást (ECS) a felfelé irányuló kérésekhez, és naplózza a kliensek által küldött értékeket a lekérdezési naplóban.",
-    "edns_use_custom_ip": "Használjon egyéni IP-címet az EDNS-hez",
-    "edns_use_custom_ip_desc": "Engedélyezze az egyéni IP-cím használatát az EDNS-hez",
    "rate_limit_desc": "Maximálisan hány kérést küldhet egy kliens másodpercenkén. Ha 0-ra állítja, akkor nincs korlátozás.",
    "blocking_ipv4_desc": "A blokkolt A kéréshez visszaadandó IP-cím",
    "blocking_ipv6_desc": "A blokkolt AAAA kéréshez visszaadandó IP-cím",
@@ -478,9 +475,7 @@
    "setup_dns_notice": "Ahhoz, hogy a <1>DNS-over-HTTPS</1> vagy a <1>DNS-over-TLS</1> valamelyikét használja, muszáj <0>beállítania a titkosítást</0> az AdGuard Home beállításaiban.",
    "rewrite_added": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen hozzáadva",
    "rewrite_deleted": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen törölve",
-    "rewrite_updated": "A DNS újraírása sikeresen frissítve",
    "rewrite_add": "DNS átírás hozzáadása",
-    "rewrite_edit": "DNS újraírás szerkesztése",
    "rewrite_not_found": "Nem találhatók DNS átírások",
    "rewrite_confirm_delete": "Biztosan törölni szeretné a DNS átírást ehhez: \"{{key}}\"?",
    "rewrite_desc": "Lehetővé teszi, hogy egyszerűen beállítson egyéni DNS választ egy adott domain névhez.",
@@ -528,10 +523,6 @@
    "statistics_retention_confirm": "Biztos benne, hogy megváltoztatja a statisztika megőrzési idejét? Ha csökkentette az értéket, a megadottnál korábbi adatok elvesznek",
    "statistics_cleared": "A statisztikák sikeresen vissza lettek állítva",
    "statistics_enable": "Statisztikák engedélyezése",
-    "ignore_domains": "Figyelmen kívül hagyott domainek (újsorral elválasztva)",
-    "ignore_domains_title": "Figyelmen kívül hagyott domainek",
-    "ignore_domains_desc_stats": "Az ezekre a tartományokra vonatkozó lekérdezések nem kerülnek a statisztikákba",
-    "ignore_domains_desc_query": "Az ezekhez a tartományokhoz tartozó lekérdezések nem kerülnek a lekérdezési naplóba",
    "interval_hours": "{{count}} óra",
    "interval_hours_plural": "{{count}} óra",
    "filters_configuration": "Szűrők beállításai",
@@ -652,29 +643,5 @@
    "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",
-    "make_static": "Statikussá tétel",
-    "theme_auto_desc": "Automatikus (az eszköz színsémájától függően)",
-    "theme_dark_desc": "Sötét téma",
-    "theme_light_desc": "Világos téma",
-    "disable_for_seconds": "{{count}} másodpercig",
-    "disable_for_seconds_plural": "{{count}} másodpercig",
-    "disable_for_minutes": "{{count}} percig",
-    "disable_for_minutes_plural": "{{count}} percig",
-    "disable_for_hours": "{{count}} óráig",
-    "disable_for_hours_plural": "{{count}} óráig",
-    "disable_until_tomorrow": "Holnapig",
-    "disable_notify_for_seconds": "Kapcsolja ki a védelmet {{count}} másodpercre",
-    "disable_notify_for_seconds_plural": "Kapcsolja ki a védelmet {{count}} másodpercre",
-    "disable_notify_for_minutes": "Kapcsolja ki a védelmet {{count}} percre",
-    "disable_notify_for_minutes_plural": "Kapcsolja ki a védelmet {{count}} percre",
-    "disable_notify_for_hours": "Kapcsolja ki a védelmet {{count}} órára",
-    "disable_notify_for_hours_plural": "Kapcsolja ki a védelmet {{count}} órára",
-    "disable_notify_until_tomorrow": "Holnapig kapcsolja ki a védelmet",
-    "enable_protection_timer": "A védelem {{time}}-kor aktiválódik",
-    "custom_retention_input": "Adja meg a megőrzést órákban",
-    "custom_rotation_input": "Írja be a forgatást órákban",
-    "protection_section_label": "Védelem",
-    "log_and_stats_section_label": "Lekérdezési napló és statisztikák",
-    "ignore_query_log": "Figyelmen kívül hagyja ezt az ügyfelet a lekérdezési naplóban",
-    "ignore_statistics": "Hagyja figyelmen kívül ezt az ügyfelet a statisztikákban"
+    "protection_section_label": "Védelem"
 }
--- a/client/src/__locales/id.json
+++ b/client/src/__locales/id.json
@@ -474,9 +474,7 @@
    "setup_dns_notice": "Jikalau ingin menggunakan <1>DNS-over-HTTPS</1> atau <1>DNS-over-TLS</1>, Anda perlu <0>mengatur Enkripsi</0> pada pengaturan AdGuard Home.",
    "rewrite_added": "DNS rewrite untuk \"{{key}}\" berhasil ditambahkan",
    "rewrite_deleted": "DNS rewrite untuk \"{{key}}\" berhasil dihapus",
-    "rewrite_updated": "Penulisan ulang DNS berhasil diperbarui",
    "rewrite_add": "Tambah DNS rewrite",
-    "rewrite_edit": "Edit penulisan ulang DNS",
    "rewrite_not_found": "Tidak ada DNS rewrite ditemukan",
    "rewrite_confirm_delete": "Apakah anda yakin ingin menghapus DNS rewrite untuk \"{{key}}\"?",
    "rewrite_desc": "Memungkinkan untuk dengan mudah mengkonfigurasi respons DNS kustom untuk nama domain tertentu.",
--- a/client/src/__locales/it.json
+++ b/client/src/__locales/it.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Per utilizzare <1>DNS su HTTPS</1> o <1>DNS su TLS</1>, è necessario <0>configurare la crittografia</0> nelle impostazioni di AdGuard Home.",
    "rewrite_added": "Riscrittura DNS per \"{{key}}\" aggiunta correttamente",
    "rewrite_deleted": "La riscrittura DNS per \"{{key}}\" è stata eliminata correttamente",
-    "rewrite_updated": "Riscrittura DNS aggiornata correttamente",
    "rewrite_add": "Aggiungi la riscrittura DNS",
-    "rewrite_edit": "Modifica della riscrittura DNS",
    "rewrite_not_found": "Nessuna riscrittura DNS trovata",
    "rewrite_confirm_delete": "Sei sicuro di voler cancellare la riscrittura DNS per \"{{key}}\"?",
    "rewrite_desc": "Consente di configurare facilmente la risposta DNS personalizzata per un nome di dominio specifico.",
--- a/client/src/__locales/ja.json
+++ b/client/src/__locales/ja.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "<1>DNS-over-HTTPS</1>または<1>DNS-over-TLS</1>を使用するには、AdGuard Home 設定の<0>暗号化設定</0>が必要です。",
    "rewrite_added": "\"{{key}}\" のDNS書き換え情報を追加完了しました",
    "rewrite_deleted": "\"{{key}}\" のDNS書き換え情報を削除完了しました",
-    "rewrite_updated": "DNS rewrite を更新完了しました。",
    "rewrite_add": "DNS書き換え情報を追加する",
-    "rewrite_edit": "DNS rewrite を編集する",
    "rewrite_not_found": "DNS書き換え情報はありません",
    "rewrite_confirm_delete": "\"{{key}}\" のDNS書き換え情報を削除してもよろしいですか？",
    "rewrite_desc": "特定のドメイン名に対するDNS応答を簡単にカスタマイズすることを可能にします。",
--- a/client/src/__locales/ko.json
+++ b/client/src/__locales/ko.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "<1>DNS-over-HTTPS</1> 또는 <1>DNS-over-TLS를</1> 사용하려면 AdGuard Home 설정에서 <0>암호화를 구성해야 합니다.</0>",
    "rewrite_added": "'{{key}}'에 대한 DNS 수정 정보를 성공적으로 추가 됩니다",
    "rewrite_deleted": "'{{key}}'에 대한 DNS 수정 정보를 성공적으로 삭제 됩니다",
-    "rewrite_updated": "DNS 다시 쓰기 업데이트 완료",
    "rewrite_add": "DNS 변환 정보를 추가합니다",
-    "rewrite_edit": "DNS 다시 쓰기 편집",
    "rewrite_not_found": "DNS 변경 정보를 찾을 수 없습니다",
    "rewrite_confirm_delete": "'{{key}}'에 대한 DNS 변경 정보를 삭제하시겠습니까?",
    "rewrite_desc": "특정 도메인 이름에 대한 사용자 지정 DNS 응답을 쉽게 구성할 수 있습니다.",
--- a/client/src/__locales/nl.json
+++ b/client/src/__locales/nl.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.",
    "rewrite_added": "DNS-herschrijving voor \"{{key}}\" met succes toegevoegd",
    "rewrite_deleted": "DNS-herschrijving voor \"{{key}}\" met succes verwijderd",
-    "rewrite_updated": "DNS-herschrijven succesvol bijgewerkt",
    "rewrite_add": "DNS-herschrijving toevoegen",
-    "rewrite_edit": "DNS-herschrijven bewerken",
    "rewrite_not_found": "Geen DNS-herschrijving gevonden",
    "rewrite_confirm_delete": "Bent u zeker dat u DNS-herschrijving \"{{key}}\" wilt verwijderen?",
    "rewrite_desc": "Hiermee kunt u eenvoudig aangepaste DNS-antwoorden configureren voor een specifieke domeinnaam.",
--- a/client/src/__locales/no.json
+++ b/client/src/__locales/no.json
@@ -457,9 +457,7 @@
    "setup_dns_notice": "For å benytte <1>DNS-over-HTTPS</1> eller <1>DNS-over-TLS</1>, må du <0>sette opp Kryptering</0> i AdGuard Home-innstillingene.",
    "rewrite_added": "DNS-omdirigeringen for «{{key}}» ble vellykket lagt til",
    "rewrite_deleted": "DNS-omdirigeringen for «{{key}}» ble vellykket slettet",
-    "rewrite_updated": "DNS-omskriving ble oppdatert",
    "rewrite_add": "Legg til DNS-omdirigering",
-    "rewrite_edit": "Rediger DNS-omskriving",
    "rewrite_not_found": "Ingen DNS-omdirigeringer ble funnet",
    "rewrite_confirm_delete": "Er du sikker på at du vil slette DNS-omdirigeringen for «{{key}}»?",
    "rewrite_desc": "Lar deg enkelt konfigurere selvvalgte DNS-tilbakemeldinger for et spesifikt domenenavn.",
--- a/client/src/__locales/pl.json
+++ b/client/src/__locales/pl.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Aby skorzystać z <1>DNS-over-HTTPS</1> lub <1>DNS-over-TLS</1>, musisz w ustawieniach AdGuard Home <0>skonfigurować szyfrowanie</0>.",
    "rewrite_added": "Pomyślnie dodano przepisanie DNS dla „{{key}}”",
    "rewrite_deleted": "Przepisanie DNS dla „{{key}}” zostało pomyślnie usunięte",
-    "rewrite_updated": "Pomyślnie zaktualizowano przepisywanie DNS",
    "rewrite_add": "Dodaj przepisywanie DNS",
-    "rewrite_edit": "Edytuj przepisywanie DNS",
    "rewrite_not_found": "Nie znaleziono przepisywania DNS",
    "rewrite_confirm_delete": "Czy na pewno chcesz usunąć przepisywanie DNS dla „{{key}}”?",
    "rewrite_desc": "Pozwala łatwo skonfigurować niestandardową odpowiedź DNS dla określonej nazwy domeny.",
--- a/client/src/__locales/pt-br.json
+++ b/client/src/__locales/pt-br.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Para usar o <1>DNS-sobre-HTTPS</1> ou <1>DNS-sobre-TLS</1>, você precisa <0>configurar a criptografia</0> nas configurações do AdGuard Home.",
    "rewrite_added": "Reescrita de DNS para \"{{key}}\" adicionada com sucesso",
    "rewrite_deleted": "Reescrita de DNS para \"{{key}}\" excluída com sucesso",
-    "rewrite_updated": "Reconfiguração de DNS atualizada com êxito",
    "rewrite_add": "Adicionar reescrita de DNS",
-    "rewrite_edit": "Editar reconfiguração de DNS",
    "rewrite_not_found": "Nenhuma reescrita de DNS foi encontrada",
    "rewrite_confirm_delete": "Você tem certeza de que deseja excluir a reescrita de DNS para \"{{key}}\"?",
    "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",
--- a/client/src/__locales/pt-pt.json
+++ b/client/src/__locales/pt-pt.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Para usar o <1>DNS-sobre-HTTPS</1> ou <1>DNS-sobre-TLS</1>, precisa de <0>configurar a criptografia</0> nas configurações do AdGuard Home.",
    "rewrite_added": "Reescrita de DNS para \"{{key}}\" adicionada com sucesso",
    "rewrite_deleted": "Reescrita de DNS para \"{{key}}\" excluída com sucesso",
-    "rewrite_updated": "Reedição de DNS atualizada com sucesso",
    "rewrite_add": "Adicionar reescrita de DNS",
-    "rewrite_edit": "Editar reedição de DNS",
    "rewrite_not_found": "Nenhuma reescrita de DNS foi encontrada",
    "rewrite_confirm_delete": "Tem a certeza de que deseja excluir a reescrita de DNS para \"{{key}}\"?",
    "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",
--- a/client/src/__locales/ro.json
+++ b/client/src/__locales/ro.json
@@ -167,7 +167,6 @@
    "enabled_parental_toast": "Control Parental activat",
    "disabled_safe_search_toast": "Căutare protejată dezactivată",
    "enabled_save_search_toast": "Căutare protejată activată",
-    "updated_save_search_toast": "Setări Căutare sigură actualizate",
    "enabled_table_header": "Activat",
    "name_table_header": "Nume",
    "list_url_table_header": "Lista URL",
@@ -257,12 +256,12 @@
    "query_log_cleared": "Jurnalul de interogare a fost șters cu succes",
    "query_log_updated": "Jurnalul de solicitări a fost actualizat cu succes",
    "query_log_clear": "Curăță jurnalele",
-    "query_log_retention": "Interogarea jurnalelor de rotație",
+    "query_log_retention": "Retenție jurnale interogare",
    "query_log_enable": "Activați jurnal",
    "query_log_configuration": "Configurația jurnalelor",
    "query_log_disabled": "Jurnalul de interogare este dezactivat și poate fi configurat în <0>setări</0>",
    "query_log_strict_search": "Utilizați ghilimele duble pentru căutare strictă",
-    "query_log_retention_confirm": "Sigur doriți să modificați rotația jurnalului de interogări? Dacă micșorați valoarea intervalului, unele date se vor pierde",
+    "query_log_retention_confirm": "Sunteți sigur că doriți să schimbați retenția jurnalului de interogare? Reducând valoarea intervalului, unele date vor fi pierdute",
    "anonymize_client_ip": "Anonimizare client IP",
    "anonymize_client_ip_desc": "Nu salvați adresa IP completă a clientului în jurnale și statistici",
    "dns_config": "Configurația serverului DNS",
@@ -291,8 +290,6 @@
    "rate_limit": "Limita ratei",
    "edns_enable": "Activați subrețeaua de clienți EDNS",
    "edns_cs_desc": "Adaugă opțiunea EDNS Client Subnet (ECS) la solicitările în amonte și înregistrează valorile trimise de clienți în jurnalul de interogare.",
-    "edns_use_custom_ip": "Utilizați IP personalizat pentru EDNS",
-    "edns_use_custom_ip_desc": "Permiteți utilizarea IP-ului personalizat pentru EDNS",
    "rate_limit_desc": "Numărul de interogări pe secundă permise pe client. Setarea la 0 înseamnă că nu există limită.",
    "blocking_ipv4_desc": "Adresa IP de returnat pentru o cerere A de blocare",
    "blocking_ipv6_desc": "Adresa IP de returnat pentru o cerere AAAA de blocare",
@@ -478,9 +475,7 @@
    "setup_dns_notice": "Pentru a utiliza <1>DNS-over-HTTPS</1> sau <1>DNS-over-TLS</1>, trebuie să <0>configurați Criptarea</0> în setările AdGuard Home.",
    "rewrite_added": "Rescriere DNS pentru \"{{key}}\" adăugată cu succes",
    "rewrite_deleted": "Rescriere DNS pentru \"{{key}}\" ștearsă cu succes",
-    "rewrite_updated": "DNS rescrie actualizat cu succes",
    "rewrite_add": "Adăugați rescriere DNS",
-    "rewrite_edit": "Editați rescrierea DNS",
    "rewrite_not_found": "Nu s-au găsit rescrieri DNS",
    "rewrite_confirm_delete": "Sunteți sigur că doriți să ștergeți rescrierea DNS pentru \"{{key}}\"?",
    "rewrite_desc": "Permite configurarea cu ușurință a răspunsului personalizat DNS pentru un nume de domeniu specific.",
@@ -528,10 +523,6 @@
    "statistics_retention_confirm": "Sunteți sigur că doriți să schimbați păstrarea statisticilor? Dacă reduceți valoarea intervalului, unele date vor fi pierdute",
    "statistics_cleared": "Statisticile au fost șterse cu succes",
    "statistics_enable": "Activați statisticile",
-    "ignore_domains": "Domenii ignorate (separate prin linie nouă)",
-    "ignore_domains_title": "Domenii ignorate",
-    "ignore_domains_desc_stats": "Interogările pentru aceste domenii nu sunt scrise în statistici",
-    "ignore_domains_desc_query": "Interogările pentru aceste domenii nu sunt scrise în jurnalul de interogări",
    "interval_hours": "{{count}} oră",
    "interval_hours_plural": "{{count}} ore",
    "filters_configuration": "Configurația filtrelor",
@@ -652,29 +643,5 @@
    "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",
-    "make_static": "Faceți static",
-    "theme_auto_desc": "Auto (pe baza schemei de culori a dispozitivului dvs.)",
-    "theme_dark_desc": "Temă întunecată",
-    "theme_light_desc": "Temă luminoasă",
-    "disable_for_seconds": "Timp de {{count}} secundă",
-    "disable_for_seconds_plural": "Timp de {{count}} secunde",
-    "disable_for_minutes": "Timp de {{count}} minut",
-    "disable_for_minutes_plural": "Timp de {{count}} minute",
-    "disable_for_hours": "Timp de {{count}} oră",
-    "disable_for_hours_plural": "Timp de {{count}} ore",
-    "disable_until_tomorrow": "Până mâine",
-    "disable_notify_for_seconds": "Dezactivați protecția timp de {{count}} secundă",
-    "disable_notify_for_seconds_plural": "Dezactivați protecția timp de {{count}} secunde",
-    "disable_notify_for_minutes": "Dezactivați protecția timp de {{count}} minut",
-    "disable_notify_for_minutes_plural": "Dezactivați protecția timp de {{count}} minute",
-    "disable_notify_for_hours": "Dezactivează protecția timp de {{count}} oră",
-    "disable_notify_for_hours_plural": "Dezactivați protecția timp de {{count}} ore",
-    "disable_notify_until_tomorrow": "Dezactivează protecția până mâine",
-    "enable_protection_timer": "Protecția va fi activată în {{time}}",
-    "custom_retention_input": "Introduceți reținerea în ore",
-    "custom_rotation_input": "Introduceți rotația în ore",
-    "protection_section_label": "Protecție",
-    "log_and_stats_section_label": "Jurnal de interogări și statistici",
-    "ignore_query_log": "Ignorați acest client în jurnalul de interogări",
-    "ignore_statistics": "Ignorați acest client în statistici"
+    "protection_section_label": "Protecție"
 }
--- a/client/src/__locales/ru.json
+++ b/client/src/__locales/ru.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Чтобы использовать <1>DNS-over-HTTPS</1> или <1>DNS-over-TLS</1>, вам нужно <0>настроить шифрование</0> в настройках AdGuard Home.",
    "rewrite_added": "Правило перезаписи DNS-запросов для «{{key}}» успешно добавлено",
    "rewrite_deleted": "Правило перезаписи DNS-запросов для «{{key}}» успешно удалено",
-    "rewrite_updated": "Правило перезаписи DNS-запросов успешно обновлено",
    "rewrite_add": "Добавить правило перезаписи DNS-запросов",
-    "rewrite_edit": "Редактировать правило перезаписи DNS-запросов",
    "rewrite_not_found": "Не найдено правил перезаписи DNS-запросов",
    "rewrite_confirm_delete": "Вы уверены, что хотите удалить правило перезаписи DNS-запросов для «{{key}}»?",
    "rewrite_desc": "Позволяет легко настроить пользовательский DNS-ответ для определеннного домена.",
--- a/client/src/__locales/si-lk.json
+++ b/client/src/__locales/si-lk.json
@@ -153,7 +153,6 @@
    "enabled_parental_toast": "දෙමාපිය පාලනය සබල කෙරිණි",
    "disabled_safe_search_toast": "ආරක්‍ෂිත සෙවුම අබල කෙරිණි",
    "enabled_save_search_toast": "ආරක්‍ෂිත සෙවුම සබල කෙරිණි",
-    "updated_save_search_toast": "ආරක්‍ෂිත සෙවුමේ සැකසුම් යාවත්කාල විය",
    "enabled_table_header": "සබලයි",
    "name_table_header": "නම",
    "list_url_table_header": "ඒ.ස.නි.(URL) ලැයිස්තුව",
@@ -238,12 +237,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": "සටහන් සහ සංඛ්‍යාලේඛන තුළ අනුග්‍රාහකයේ පූර්ණ අ.ජා.කෙ. ලිපිනය සුරකින්න එපා",
    "dns_config": "ව.නා.ප. සේවාදායක වින්‍යාසය",
@@ -271,8 +270,6 @@
    "form_enter_rate_limit": "අනුපාත සීමාව ඇතුල් කරන්න",
    "rate_limit": "අනුපාත සීමාව",
    "edns_enable": "EDNS අනුග්‍රාහක අනුජාලය සබල කරන්න",
-    "edns_use_custom_ip": "EDNS සඳහා අභිරුචි අ.ජා.කෙ. යොදාගන්න",
-    "edns_use_custom_ip_desc": "EDNS සඳහා අභිරුචි අ.ජා.කෙ. භාවිතයට ඉඩදෙන්න",
    "rate_limit_desc": "එක් අනුග්‍රාහකයකට ඉඩ දී ඇති තත්පරයට ඉල්ලීම් ගණන. එය 0 ලෙස සැකසීම යනුවෙන් අදහස් කරන්නේ සීමාවක් නැති බවයි.",
    "blocking_ipv4_desc": "අවහිර කළ A ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
    "blocking_ipv6_desc": "අවහිර කළ AAAA ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
@@ -281,9 +278,6 @@
    "blocking_mode_nxdomain": "නොපවතින වසම: NXDOMAIN කේතය සමඟ ප්‍රතිචාර දක්වයි",
    "blocking_mode_null_ip": "අභිශූන්‍යය අ.ජා.කෙ.: ශුන්‍ය අ.ජා.කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
    "blocking_mode_custom_ip": "අභිරුචි අන්තර්ජාල කෙටුම්පත: අතින් සැකසූ අ.ජා. කෙ. ලිපිනයක් සමඟ ප්‍රතිචාර දක්වයි",
-    "theme_auto": "ස්වයං",
-    "theme_light": "දීප්ත",
-    "theme_dark": "අඳුරු",
    "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>ව.නා.ප. සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායක භාවිතා කරනු ඇත.",
    "tracker_source": "ලුහුබැඳීම් මූලාශ්‍රය",
    "source_label": "මූලාශ්‍රය",
@@ -376,7 +370,6 @@
    "encryption_issuer": "නිකුත් කරන්නා",
    "encryption_hostnames": "ධාරක නාම",
    "encryption_reset": "සංකේතාංකන සැකසුම් යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "encryption_warning": "අවවාදයයි",
    "topline_expiring_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත්වීමට ආසන්න වී ඇත. <0>සංකේතන සැකසුම්</0> යාවත්කාල කරන්න.",
    "topline_expired_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත් වී ඇත. <0>සංකේතන සැකසුම්</0> යාවත්කාල කරන්න.",
    "form_error_port_range": "80-65535 පරාසය හි තොටක අගයක් ඇතුල් කරන්න",
@@ -497,10 +490,8 @@
    "statistics_clear": "සංඛ්‍යාලේඛන හිස් කරන්න",
    "statistics_clear_confirm": "සංඛ්‍යාලේඛන ඉවත් කිරීමට වුවමනා ද?",
    "statistics_retention_confirm": "සංඛ්‍යාලේඛන රඳවා තබා ගැනීම වෙනස් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
-    "statistics_cleared": "සංඛ්‍යාලේඛන සාර්ථකව හිස් කෙරිණි",
+    "statistics_cleared": "සංඛ්‍යාලේඛන සාර්ථකව ඉවත් කෙරිණි",
    "statistics_enable": "සංඛ්‍යාලේඛන සබල කරන්න",
-    "ignore_domains": "නොසලකන වසම් (පේළියකට එක බැගින්)",
-    "ignore_domains_title": "නොසලකන වසම්",
    "interval_hours": "පැය {{count}}",
    "interval_hours_plural": "පැය {{count}}",
    "filters_configuration": "පෙරහන් වින්‍යාසය",
@@ -610,31 +601,5 @@
    "parental_control": "දෙමාපිය පාලනය",
    "safe_browsing": "ආරක්‍ෂිත පිරික්සුම",
    "served_from_cache": "{{value}} <i>(නිහිතයෙන් ගැනිණි)</i>",
-    "form_error_password_length": "මුරපදය අවම වශයෙන් අකුරු {{value}} ක් දිගු විය යුතුමයි",
-    "cache_cleared": "ව.නා.ප. නිහිතය හිස් කෙරිණි",
-    "clear_cache": "නිහිතය මකන්න",
-    "make_static": "ස්ථිතික කරන්න",
-    "theme_dark_desc": "අඳුරු තේමාව",
-    "theme_light_desc": "දීප්ත තේමාව",
-    "disable_for_seconds": "තත්පර {{count}} ක්",
-    "disable_for_seconds_plural": "තත්පර {{count}} ක්",
-    "disable_for_minutes": "විනාඩි {{count}} ක්",
-    "disable_for_minutes_plural": "විනාඩි {{count}} ක්",
-    "disable_for_hours": "පැය {{count}} ක්",
-    "disable_for_hours_plural": "පැය {{count}} ක්",
-    "disable_until_tomorrow": "හෙට වනතුරු",
-    "disable_notify_for_seconds": "තත්. {{count}} කට රැකවරණය අබල කරන්න",
-    "disable_notify_for_seconds_plural": "තත්. {{count}} කට රැකවරණය අබල කරන්න",
-    "disable_notify_for_minutes": "විනාඩි {{count}} කට රැකවරණය අබල කරන්න",
-    "disable_notify_for_minutes_plural": "විනාඩි {{count}} කට රැකවරණය අබල කරන්න",
-    "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": "සංඛ්‍යාලේඛනයට අනුග්‍රාහකය නොසලකන්න"
+    "form_error_password_length": "මුරපදය අවම වශයෙන් අකුරු {{value}} ක් දිගු විය යුතුමයි"
 }
--- a/client/src/__locales/sk.json
+++ b/client/src/__locales/sk.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Pre použitie <1>DNS-over-HTTPS</1> alebo <1>DNS-over-TLS</1>, potrebujete v nastaveniach AdGuard Home <0>nakonfigurovať šifrovanie</0>.",
    "rewrite_added": "DNS prepísanie pre \"{{key}}\" bolo úspešne pridané",
    "rewrite_deleted": "DNS prepísanie pre \"{{key}}\" bolo úspešne vymazané",
-    "rewrite_updated": "Prepísanie DNS bolo úspešne aktualizované",
    "rewrite_add": "Pridať DNS prepísanie",
-    "rewrite_edit": "Upraviť prepísanie DNS",
    "rewrite_not_found": "Neboli nájdené žiadne DNS prepísania",
    "rewrite_confirm_delete": "Naozaj chcete odstrániť prepísanie DNS pre \"{{key}}\"?",
    "rewrite_desc": "Umožňuje ľahko nakonfigurovať vlastnú odpoveď DNS pre konkrétne meno domény.",
--- a/client/src/__locales/sl.json
+++ b/client/src/__locales/sl.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Za uporabo <1>DNS-prek-HTTPS</1> ali <1>DNS-prek-TLS</1>, morate <0>konfigurirati šifriranje</0> v nastavitvah AdGuard Home.",
    "rewrite_added": "Uspešno je dodano DNS prepisovanje za \"{{key}}\"",
    "rewrite_deleted": "Uspešno je izbrisano DNS prepisovanje za \"{{key}}\"",
-    "rewrite_updated": "DNS prepisovanje uspešno posodobljen",
    "rewrite_add": "Dodaj prepisovanje DNS",
-    "rewrite_edit": "Urejanje prepisa DNS",
    "rewrite_not_found": "Ni bilo najdenih prepisovanj DNS",
    "rewrite_confirm_delete": "Ali ste prepričani, da želite izbrisati prepisovanje DNS za \"{{key}}\"?",
    "rewrite_desc": "Omogoča enostavno konfiguriranje odgovora DNS po meri za določeno ime domene.",
--- a/client/src/__locales/sr-cs.json
+++ b/client/src/__locales/sr-cs.json
@@ -475,9 +475,7 @@
    "setup_dns_notice": "Kako biste koristili <1>DNS-over-HTTPS</1> ili <1>DNS-over-TLS</1>, potrebno je da <0>konfigurišete šifrovanje</0> u AdGuard Home postavkama.",
    "rewrite_added": "DNS prepisivanje za \"{{key}}\" je uspešno dodato",
    "rewrite_deleted": "DNS prepisivanje za \"{{key}}\" uspešno izbrisano",
-    "rewrite_updated": "DNS ponovo napisao uspešno ažuriran",
    "rewrite_add": "Dodaj DNS prepisivanje",
-    "rewrite_edit": "Uređivanje DNS prepravke",
    "rewrite_not_found": "DNS prepisivanja nisu pronađena",
    "rewrite_confirm_delete": "Jeste li sigurni da želite da izbrišete DNS prepisivanje za \"{{key}}\"?",
    "rewrite_desc": "Dozvoljava da jednostavno konfigurišete prilagođeni DNS odgovor za određeni domen.",
--- a/client/src/__locales/sv.json
+++ b/client/src/__locales/sv.json
@@ -475,9 +475,7 @@
    "setup_dns_notice": "För att kunna använda <1>DNS-över-HTTPS</1> eller <1>DNS-över-TLS</1>, behöver du <0>konfigurera Kryptering</0> i AdGuard Home-inställningar.",
    "rewrite_added": "DNS-omskrivning för \"{{key}}\" lyckad",
    "rewrite_deleted": "DNS-omskrivning för \"{{key}}\" har tagits bort",
-    "rewrite_updated": "DNS-omskrivning har uppdaterats",
    "rewrite_add": "Lägg till DNS omskrivning",
-    "rewrite_edit": "Redigera DNS-omskrivning",
    "rewrite_not_found": "Inga DNS omskrivningar hittades",
    "rewrite_confirm_delete": "Är du säker på att du vill ta bort DNS-omskrivningen för \"{{key}}\"?",
    "rewrite_desc": "Gör det enkelt att konfigurera anpassat DNS svar för ett specifikt domännamn.",
--- a/client/src/__locales/tr.json
+++ b/client/src/__locales/tr.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "<1>DNS-over-HTTPS</1> veya <1>DNS-over-TLS</1> protokolünü kullanmak için AdGuard Home üzerinde <0>Şifreleme ayarları</0> bölümünden ayarları yapmanız gerekir.",
    "rewrite_added": "\"{{key}}\" için DNS yeniden yazımı başarıyla eklendi",
    "rewrite_deleted": "\"{{key}}\" için DNS yeniden yazımı başarıyla silindi",
-    "rewrite_updated": "DNS yeniden yazma başarıyla güncellendi",
    "rewrite_add": "DNS yeniden yazımı ekle",
-    "rewrite_edit": "DNS yeniden yazmayı düzenle",
    "rewrite_not_found": "DNS yeniden yazımı bulunamadı",
    "rewrite_confirm_delete": "\"{{key}}\" için DNS yeniden yazımını silmek istediğinize emin misiniz?",
    "rewrite_desc": "Belirli bir alan adı için özel DNS yanıtını kolayca yapılandırmanızı sağlar.",
--- a/client/src/__locales/uk.json
+++ b/client/src/__locales/uk.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "Для використання <1>DNS-over-HTTPS</1> або <1>DNS-over-TLS</1>, вам потрібно <0>налаштувати Шифрування</0> в налаштуваннях AdGuard Home.",
    "rewrite_added": "Перезапис DNS для «{{key}}» успішно додано",
    "rewrite_deleted": "Перезапис DNS для «{{key}}» успішно видалено",
-    "rewrite_updated": "Перезапис DNS успішно оновлено",
    "rewrite_add": "Додати перезапис DNS",
-    "rewrite_edit": "Редагувати перезапис DNS",
    "rewrite_not_found": "Перезаписів DNS не знайдено",
    "rewrite_confirm_delete": "Ви впевнені, що хочете видалити перезапис DNS для «{{key}}»?",
    "rewrite_desc": "Дозволяє легко налаштувати власну відповідь DNS для певного доменного імені.",
--- a/client/src/__locales/vi.json
+++ b/client/src/__locales/vi.json
@@ -1,5 +1,5 @@
 {
-    "client_settings": "Cài đặt thiết bị",
+    "client_settings": "Cài đặt máy khách",
    "example_upstream_reserved": "ngược dòng <0>cho các miền cụ thể</0>;",
    "example_upstream_comment": "một lời bình luận.",
    "upstream_parallel": "Sử dụng truy vấn song song để tăng tốc độ giải quyết bằng cách truy vấn đồng thời tất cả các máy chủ ngược tuyến",
@@ -167,7 +167,6 @@
    "enabled_parental_toast": "Đã bật quản lý của phụ huynh",
    "disabled_safe_search_toast": "Đã tắt tìm kiếm an toàn",
    "enabled_save_search_toast": "Đã bật tìm kiếm an toàn",
-    "updated_save_search_toast": "Cài đặt Tìm kiếm an toàn đã được cập nhật",
    "enabled_table_header": "Kích hoạt",
    "name_table_header": "Tên",
    "list_url_table_header": "URL bộ lọc",
@@ -257,12 +256,12 @@
    "query_log_cleared": "Nhật ký truy vấn đã được xóa thành công",
    "query_log_updated": "Cập nhật thành công nhật kí truy xuất",
    "query_log_clear": "Xóa nhật ký truy vấn",
-    "query_log_retention": "Xoay vòng nhật ký truy vấn",
+    "query_log_retention": "Lưu giữ nhật ký truy vấn",
    "query_log_enable": "Bật nhật ký",
    "query_log_configuration": "Cấu hình nhật ký",
    "query_log_disabled": "Nhật ký truy vấn bị vô hiệu hóa và có thể được định cấu hình trong <0>cài đặt</ 0>",
    "query_log_strict_search": "Sử dụng dấu ngoặc kép để tìm kiếm nghiêm ngặt",
-    "query_log_retention_confirm": "Bạn có chắc chắn muốn thay đổi xoay vòng nhật ký truy vấn không? Nếu bạn giảm giá trị khoảng thời gian, một số dữ liệu sẽ bị mất",
+    "query_log_retention_confirm": "Bạn có chắc chắn muốn thay đổi lưu giữ nhật ký truy vấn? Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
    "anonymize_client_ip": "Ẩn danh IP khách",
    "anonymize_client_ip_desc": "Không lưu địa chỉ IP đầy đủ của khách hàng trong nhật ký và thống kê",
    "dns_config": "Thiết lập máy chủ DNS",
@@ -291,8 +290,6 @@
    "rate_limit": "Giới hạn yêu cầu",
    "edns_enable": "Bật mạng con EDNS Client",
    "edns_cs_desc": "Thêm tùy chọn EDNS Client Subnet (ECS) vào các yêu cầu ngược dòng và ghi lại các giá trị được gửi bởi các máy khách trong nhật ký truy vấn.",
-    "edns_use_custom_ip": "Sử dụng địa chỉ IP tùy chỉnh cho EDNS",
-    "edns_use_custom_ip_desc": "Cho phép sử dụng địa chỉ IP tùy chỉnh cho EDNS",
    "rate_limit_desc": "Số lượng yêu cầu mỗi giây mà một khách hàng được phép thực hiện (0: không giới hạn)",
    "blocking_ipv4_desc": "Địa chỉ IP được trả lại cho một yêu cầu A bị chặn",
    "blocking_ipv6_desc": "Địa chỉ IP được trả lại cho một yêu cầu AAA bị chặn",
@@ -478,9 +475,7 @@
    "setup_dns_notice": "Để sử dụng <1>DNS-over-HTTPS</1> hoặc <1>DNS-over-TLS</1>, bạn cần <0>định cấu hình Mã hóa</0> trong cài đặt AdGuard Home.",
    "rewrite_added": "DNS viết lại cho \"{{key}}\" đã thêm thành công",
    "rewrite_deleted": "DNS viết lại cho \"{{key}}\" đã xóa thành công",
-    "rewrite_updated": "Viết lại DNS được cập nhật thành công",
    "rewrite_add": "Thêm DNS viết lại",
-    "rewrite_edit": "Chỉnh sửa viết lại DNS",
    "rewrite_not_found": "Không tìm thấy DNS viết lại",
    "rewrite_confirm_delete": "Bạn có chắc chắn muốn xóa DNS viết lại cho \"{{key}}\" không?",
    "rewrite_desc": "Cho phép dễ dàng định cấu hình tùy chỉnh DNS phản hồi cho một tên miền cụ thể.",
@@ -528,10 +523,6 @@
    "statistics_retention_confirm": "Bạn có chắc chắn muốn thay đổi lưu giữ số liệu thống kê? Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
    "statistics_cleared": "Xoá thống kê thành công",
    "statistics_enable": "Bật thống kê",
-    "ignore_domains": "Các miền bị bỏ qua (cách nhau bởi dòng mới)",
-    "ignore_domains_title": "Các miền bị bỏ qua",
-    "ignore_domains_desc_stats": "Các truy vấn cho các miền này sẽ không được ghi vào thống kê",
-    "ignore_domains_desc_query": "Các truy vấn cho các miền này sẽ không được ghi vào nhật ký truy vấn",
    "interval_hours": "{{count}} giờ",
    "interval_hours_plural": "{{count}} giờ",
    "filters_configuration": "Cấu hình bộ lọc",
@@ -652,29 +643,5 @@
    "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",
-    "make_static": "Chuyển sang tĩnh",
-    "theme_auto_desc": "Tự động (dựa trên chủ đề màu của thiết bị của bạn)",
-    "theme_dark_desc": "Chủ đề tối",
-    "theme_light_desc": "Chủ đề sáng",
-    "disable_for_seconds": "Trong {{count}} giây",
-    "disable_for_seconds_plural": "Trong {{count}} giây",
-    "disable_for_minutes": "Trong {{count}} phút",
-    "disable_for_minutes_plural": "Trong {{count}} phút",
-    "disable_for_hours": "Trong {{count}} giờ",
-    "disable_for_hours_plural": "Trong {{count}} giờ",
-    "disable_until_tomorrow": "Cho đến ngày mai",
-    "disable_notify_for_seconds": "Tắt bảo vệ trong {{count}} giây",
-    "disable_notify_for_seconds_plural": "Tắt bảo vệ trong {{count}} giây",
-    "disable_notify_for_minutes": "Tắt bảo vệ trong {{count}} phút",
-    "disable_notify_for_minutes_plural": "Tắt bảo vệ trong {{count}} phút",
-    "disable_notify_for_hours": "Tắt bảo vệ trong {{count}} giờ",
-    "disable_notify_for_hours_plural": "Tắt bảo vệ trong {{count}} giờ",
-    "disable_notify_until_tomorrow": "Vô hiệu hóa bảo vệ cho đến ngày mai",
-    "enable_protection_timer": "Bảo vệ sẽ được bật trong {{time}}",
-    "custom_retention_input": "Nhập thời gian giữ lại theo giờ",
-    "custom_rotation_input": "Nhập chu kỳ theo giờ",
-    "protection_section_label": "Sự bảo vệ",
-    "log_and_stats_section_label": "Nhật ký truy vấn và thống kê",
-    "ignore_query_log": "Bỏ qua máy khách này trong nhật ký truy vấn",
-    "ignore_statistics": "Bỏ qua máy khách này trong thống kê"
+    "protection_section_label": "Sự bảo vệ"
 }
--- a/client/src/__locales/zh-cn.json
+++ b/client/src/__locales/zh-cn.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "为了使用 <1>DNS-over-HTTPS</1> 或者 <1>DNS-over-TLS</1> ，您需要在 AdGuard Home 设置中 <0>配置加密</0> 。",
    "rewrite_added": "已成功添加 \"{{key}}\" 的 DNS 重写",
    "rewrite_deleted": "已成功删除 \"{{key}}\" 的 DNS 重写",
-    "rewrite_updated": "DNS 重写已成功更新",
    "rewrite_add": "添加 DNS 重写",
-    "rewrite_edit": "编辑 DNS 重写",
    "rewrite_not_found": "未找到 DNS 重写",
    "rewrite_confirm_delete": "您确定要删除 \"{{key}}\" 的 DNS 重写？",
    "rewrite_desc": "可以轻松地为特定域名配置自定义 DNS 响应。",
--- a/client/src/__locales/zh-hk.json
+++ b/client/src/__locales/zh-hk.json
@@ -48,7 +48,6 @@
    "out_of_range_error": "必須介於 \"{{start}}\" - \"{{end}}\" 範圍之外",
    "lower_range_start_error": "必須小於起始值",
    "greater_range_start_error": "必須大於起始值",
-    "gateway_or_subnet_invalid": "無效子網路",
    "dhcp_form_gateway_input": "閘道 IP 位址",
    "dhcp_form_subnet_input": "子網路遮罩",
    "dhcp_form_range_title": "IP 位址範圍",
@@ -196,7 +195,6 @@
    "form_error_url_or_path_format": "列表中含有的 URL 網址或絕對路徑",
    "custom_filter_rules": "自訂過濾規則",
    "custom_filter_rules_hint": "一行一條規則。您可以使用「adblock」語法或「hosts檔案」的語法。",
-    "system_host_files": "系統 hosts 檔案",
    "examples_title": "範例",
    "example_meaning_filter_block": "封鎖對 example.org 網域及其所有子網域的存取",
    "example_meaning_filter_whitelist": "解除對 example.org 網域及其所有子網域存取封鎖",
@@ -281,8 +279,6 @@
    "rate_limit": "速率限制",
    "edns_enable": "啟用 EDNS Client Subnet",
    "edns_cs_desc": "傳送用戶端的子網路給 DNS 伺服器。",
-    "edns_use_custom_ip": "使用自訂 EDNS IP",
-    "edns_use_custom_ip_desc": "允許使用自訂 EDNS IP",
    "rate_limit_desc": "限制單一裝置每秒發出的查詢次數（設定為 0 即表示無限制）",
    "blocking_ipv4_desc": "回覆指定 IPv4 位址給被封鎖的網域的 A 紀錄查詢",
    "blocking_ipv6_desc": "回覆指定 IPv6 位址給被封鎖的網域的 AAAA 紀錄查詢",
@@ -291,9 +287,6 @@
    "blocking_mode_nxdomain": "NXDOMAIN：回應 NXDOMAIN 狀態碼",
    "blocking_mode_null_ip": "Null IP：回應零值的 IP 位址（A 紀錄回應 0.0.0.0 ，AAAA 紀錄回應 ::）",
    "blocking_mode_custom_ip": "自訂 IP 位址：回應一個自訂的 IP 位址",
-    "theme_auto": "自動",
-    "theme_light": "明亮",
-    "theme_dark": "深色",
    "upstream_dns_client_desc": "如果您將此欄位留白，AdGuard Home 將使用 <0>DNS 設定</0> 內的設定的 DNS 伺服器。",
    "tracker_source": "追蹤器來源",
    "source_label": "來源",
@@ -404,7 +397,6 @@
    "dns_providers": "下列為常見的<0> DNS 伺服器</0>。",
    "update_now": "立即更新",
    "update_failed": "自動更新發生錯誤。請嘗試依照<a>以下步驟</a> 來手動更新。",
-    "manual_update": "請嘗試依照<a>下列步驟</a>來手動更新。",
    "processing_update": "請稍候，AdGuard Home 正在更新",
    "clients_title": "用戶端",
    "clients_desc": "對已連接到 AdGuard Home 的裝置進行設定",
@@ -513,7 +505,6 @@
    "statistics_clear_confirm": "您確定要清除統計資料嗎？",
    "statistics_retention_confirm": "您確定要更改統計資料保存時間嗎？如果您縮短期限部分資料可能將會遺失",
    "statistics_cleared": "已清除統計資料",
-    "statistics_enable": "啟用統計數據",
    "interval_hours": "{{count}} 小時",
    "interval_hours_plural": "{{count}} 小時",
    "filters_configuration": "過濾器設定",
@@ -622,22 +613,5 @@
    "original_response": "原始回應",
    "click_to_view_queries": "按一下以檢視查詢結果",
    "port_53_faq_link": "連接埠 53 經常被「DNSStubListener」或「systemd-resolved」服務佔用。請閱讀下列有關解決<0>這個問題</0>的說明",
-    "adg_will_drop_dns_queries": "AdGuard Home 將停止回應此用戶端的所有 DNS 查詢。",
-    "safe_browsing": "安全瀏覽",
-    "served_from_cache": "{{value}} <i>(由快取回應)</i>",
-    "form_error_password_length": "密碼必須至少 {{value}} 個字元長度",
-    "theme_dark_desc": "深色主題",
-    "theme_light_desc": "淺色主題",
-    "disable_for_seconds": "{{count}} 秒",
-    "disable_for_seconds_plural": "{{count}} 秒",
-    "disable_for_minutes": "{{count}} 分鐘",
-    "disable_for_minutes_plural": "{{count}} 分鐘",
-    "disable_for_hours": "{{count}} 小時",
-    "disable_for_hours_plural": "{{count}} 小時",
-    "disable_until_tomorrow": "直到明天",
-    "disable_notify_for_seconds": "暫停防護 {{count}} 秒",
-    "disable_notify_for_seconds_plural": "暫停防護 {{count}} 秒",
-    "disable_notify_for_minutes": "暫停防護 {{count}} 分鐘",
-    "disable_notify_for_minutes_plural": "暫停防護 {{count}} 分鐘",
-    "disable_notify_for_hours": "暫停防護 {{count}} 小時"
+    "adg_will_drop_dns_queries": "AdGuard Home 將停止回應此用戶端的所有 DNS 查詢。"
 }
--- a/client/src/__locales/zh-tw.json
+++ b/client/src/__locales/zh-tw.json
@@ -478,9 +478,7 @@
    "setup_dns_notice": "為了使用 <1>DNS-over-HTTPS</1> 或 <1>DNS-over-TLS</1>，您需要在 AdGuard Home 設定裡<0>配置加密</0>。",
    "rewrite_added": "對於 \"{{key}}\" 之 DNS 改寫被成功地加入",
    "rewrite_deleted": "對於 \"{{key}}\" 之 DNS 改寫被成功地刪除",
-    "rewrite_updated": "DNS 重寫已成功更新",
    "rewrite_add": "新增 DNS 改寫",
-    "rewrite_edit": "編輯 DNS 重寫",
    "rewrite_not_found": "無已發現之 DNS 改寫",
    "rewrite_confirm_delete": "您確定您想要刪除對於 \"{{key}}\" 之 DNS 改寫嗎？",
    "rewrite_desc": "允許輕易地配置自訂的 DNS 回應供特定的域名。",
--- a/client/src/actions/rewrites.js
+++ b/client/src/actions/rewrites.js
@@ -38,29 +38,6 @@ export const addRewrite = (config) => async (dispatch) => {
    }
 };

-export const updateRewriteRequest = createAction('UPDATE_REWRITE_REQUEST');
-export const updateRewriteFailure = createAction('UPDATE_REWRITE_FAILURE');
-export const updateRewriteSuccess = createAction('UPDATE_REWRITE_SUCCESS');
-
-/**
- * @param {Object} config
- * @param {string} config.target - current DNS rewrite value
- * @param {string} config.update - updated DNS rewrite value
- */
-export const updateRewrite = (config) => async (dispatch) => {
-    dispatch(updateRewriteRequest());
-    try {
-        await apiClient.updateRewrite(config);
-        dispatch(updateRewriteSuccess());
-        dispatch(toggleRewritesModal());
-        dispatch(getRewritesList());
-        dispatch(addSuccessToast(i18next.t('rewrite_updated', { key: config.domain })));
-    } catch (error) {
-        dispatch(addErrorToast({ error }));
-        dispatch(updateRewriteFailure());
-    }
-};
-
 export const deleteRewriteRequest = createAction('DELETE_REWRITE_REQUEST');
 export const deleteRewriteFailure = createAction('DELETE_REWRITE_FAILURE');
 export const deleteRewriteSuccess = createAction('DELETE_REWRITE_SUCCESS');
--- a/client/src/api/Api.js
+++ b/client/src/api/Api.js
@@ -455,8 +455,6 @@ class Api {

    REWRITE_ADD = { path: 'rewrite/add', method: 'POST' };

-    REWRITE_UPDATE = { path: 'rewrite/update', method: 'PUT' };
-
    REWRITE_DELETE = { path: 'rewrite/delete', method: 'POST' };

    getRewritesList() {
@@ -472,14 +470,6 @@ class Api {
        return this.makeRequest(path, method, parameters);
    }

-    updateRewrite(config) {
-        const { path, method } = this.REWRITE_UPDATE;
-        const parameters = {
-            data: config,
-        };
-        return this.makeRequest(path, method, parameters);
-    }
-
    deleteRewrite(config) {
        const { path, method } = this.REWRITE_DELETE;
        const parameters = {
--- a/client/src/components/Dashboard/Counters.js
+++ b/client/src/components/Dashboard/Counters.js
@@ -6,7 +6,7 @@ import { shallowEqual, useSelector } from 'react-redux';
 import Card from '../ui/Card';
 import { formatNumber } from '../../helpers/helpers';
 import LogsSearchLink from '../ui/LogsSearchLink';
-import { RESPONSE_FILTER, DAY } from '../../helpers/constants';
+import { RESPONSE_FILTER } from '../../helpers/constants';
 import Tooltip from '../ui/Tooltip';

 const Row = ({
@@ -54,12 +54,12 @@ const Counters = ({ refreshButton, subtitle }) => {
        avgProcessingTime,
    } = useSelector((state) => state.stats, shallowEqual);
    const { t } = useTranslation();
-    const days = interval / DAY;
+
    const rows = [
        {
            label: 'dns_query',
            count: numDnsQueries,
-            tooltipTitle: days === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: days }),
+            tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
            response_status: RESPONSE_FILTER.ALL.QUERY,
        },
        {
--- a/client/src/components/Filters/Rewrites/Form.js
+++ b/client/src/components/Filters/Rewrites/Form.js
@@ -105,7 +105,6 @@ Form.propTypes = {
    submitting: PropTypes.bool.isRequired,
    processingAdd: PropTypes.bool.isRequired,
    t: PropTypes.func.isRequired,
-    initialValues: PropTypes.object,
 };

 export default flow([
--- a/client/src/components/Filters/Rewrites/Modal.js
+++ b/client/src/components/Filters/Rewrites/Modal.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { Trans, withTranslation } from 'react-i18next';
 import ReactModal from 'react-modal';

-import { MODAL_TYPE } from '../../../helpers/constants';
 import Form from './Form';

 const Modal = (props) => {
@@ -13,8 +12,6 @@ const Modal = (props) => {
        toggleRewritesModal,
        processingAdd,
        processingDelete,
-        modalType,
-        currentRewrite,
    } = props;

    return (
@@ -27,18 +24,13 @@ const Modal = (props) => {
            <div className="modal-content">
                <div className="modal-header">
                    <h4 className="modal-title">
-                        {modalType === MODAL_TYPE.EDIT_REWRITE ? (
-                            <Trans>rewrite_edit</Trans>
-                        ) : (
-                            <Trans>rewrite_add</Trans>
-                        )}
+                        <Trans>rewrite_add</Trans>
                    </h4>
                    <button type="button" className="close" onClick={() => toggleRewritesModal()}>
                        <span className="sr-only">Close</span>
                    </button>
                </div>
                <Form
-                    initialValues={{ ...currentRewrite }}
                    onSubmit={handleSubmit}
                    toggleRewritesModal={toggleRewritesModal}
                    processingAdd={processingAdd}
@@ -55,8 +47,6 @@ Modal.propTypes = {
    toggleRewritesModal: PropTypes.func.isRequired,
    processingAdd: PropTypes.bool.isRequired,
    processingDelete: PropTypes.bool.isRequired,
-    modalType: PropTypes.string.isRequired,
-    currentRewrite: PropTypes.object,
 };

 export default withTranslation()(Modal);
--- a/client/src/components/Filters/Rewrites/Table.js
+++ b/client/src/components/Filters/Rewrites/Table.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import ReactTable from 'react-table';
 import { withTranslation } from 'react-i18next';
 import { sortIp } from '../../../helpers/helpers';
-import { MODAL_TYPE } from '../../../helpers/constants';

 class Table extends Component {
    cellWrap = ({ value }) => (
@@ -32,44 +31,24 @@ class Table extends Component {
            maxWidth: 100,
            sortable: false,
            resizable: false,
-            Cell: (value) => {
-                const currentRewrite = {
-                    answer: value.row.answer,
-                    domain: value.row.domain,
-                };
-
-                return (
-                    <div className="logs__row logs__row--center">
-                        <button
-                            type="button"
-                            className="btn btn-icon btn-outline-primary btn-sm mr-2"
-                            onClick={() => {
-                                this.props.toggleRewritesModal({
-                                    type: MODAL_TYPE.EDIT_REWRITE,
-                                    currentRewrite,
-                                });
-                            }}
-                            disabled={this.props.processingUpdate}
-                            title={this.props.t('edit_table_action')}
-                        >
-                            <svg className="icons icon12">
-                                <use xlinkHref="#edit" />
-                            </svg>
-                        </button>
-
-                        <button
-                            type="button"
-                            className="btn btn-icon btn-outline-secondary btn-sm"
-                            onClick={() => this.props.handleDelete(currentRewrite)}
-                            title={this.props.t('delete_table_action')}
-                        >
-                            <svg className="icons">
-                                <use xlinkHref="#delete" />
-                            </svg>
-                        </button>
-                    </div>
-                );
-            },
+            Cell: (value) => (
+                <div className="logs__row logs__row--center">
+                    <button
+                        type="button"
+                        className="btn btn-icon btn-icon--green btn-outline-secondary btn-sm"
+                        onClick={() => this.props.handleDelete({
+                            answer: value.row.answer,
+                            domain: value.row.domain,
+                        })
+                        }
+                        title={this.props.t('delete_table_action')}
+                    >
+                        <svg className="icons">
+                            <use xlinkHref="#delete" />
+                        </svg>
+                    </button>
+                </div>
+            ),
        },
    ];

@@ -105,9 +84,7 @@ Table.propTypes = {
    processing: PropTypes.bool.isRequired,
    processingAdd: PropTypes.bool.isRequired,
    processingDelete: PropTypes.bool.isRequired,
-    processingUpdate: PropTypes.bool.isRequired,
    handleDelete: PropTypes.func.isRequired,
-    toggleRewritesModal: PropTypes.func.isRequired,
 };

 export default withTranslation()(Table);
--- a/client/src/components/Filters/Rewrites/index.js
+++ b/client/src/components/Filters/Rewrites/index.js
@@ -6,13 +6,16 @@ import Table from './Table';
 import Modal from './Modal';
 import Card from '../../ui/Card';
 import PageTitle from '../../ui/PageTitle';
-import { MODAL_TYPE } from '../../../helpers/constants';

 class Rewrites extends Component {
    componentDidMount() {
        this.props.getRewritesList();
    }

+    handleSubmit = (values) => {
+        this.props.addRewrite(values);
+    };
+
    handleDelete = (values) => {
        // eslint-disable-next-line no-alert
        if (window.confirm(this.props.t('rewrite_confirm_delete', { key: values.domain }))) {
@@ -20,19 +23,6 @@ class Rewrites extends Component {
        }
    };

-    handleSubmit = (values) => {
-        const { modalType, currentRewrite } = this.props.rewrites;
-
-        if (modalType === MODAL_TYPE.EDIT_REWRITE && currentRewrite) {
-            this.props.updateRewrite({
-                target: currentRewrite,
-                update: values,
-            });
-        } else {
-            this.props.addRewrite(values);
-        }
-    };
-
    render() {
        const {
            t,
@@ -46,9 +36,6 @@ class Rewrites extends Component {
            processing,
            processingAdd,
            processingDelete,
-            processingUpdate,
-            modalType,
-            currentRewrite,
        } = rewrites;

        return (
@@ -67,15 +54,13 @@ class Rewrites extends Component {
                            processing={processing}
                            processingAdd={processingAdd}
                            processingDelete={processingDelete}
-                            processingUpdate={processingUpdate}
                            handleDelete={this.handleDelete}
-                            toggleRewritesModal={toggleRewritesModal}
                        />

                        <button
                            type="button"
                            className="btn btn-success btn-standard mt-3"
-                            onClick={() => toggleRewritesModal({ type: MODAL_TYPE.ADD_REWRITE })}
+                            onClick={() => toggleRewritesModal()}
                            disabled={processingAdd}
                        >
                            <Trans>rewrite_add</Trans>
@@ -83,13 +68,10 @@ class Rewrites extends Component {

                        <Modal
                            isModalOpen={isModalOpen}
-                            modalType={modalType}
                            toggleRewritesModal={toggleRewritesModal}
                            handleSubmit={this.handleSubmit}
                            processingAdd={processingAdd}
                            processingDelete={processingDelete}
-                            processingUpdate={processingUpdate}
-                            currentRewrite={currentRewrite}
                        />
                    </Fragment>
                </Card>
@@ -104,7 +86,6 @@ Rewrites.propTypes = {
    toggleRewritesModal: PropTypes.func.isRequired,
    addRewrite: PropTypes.func.isRequired,
    deleteRewrite: PropTypes.func.isRequired,
-    updateRewrite: PropTypes.func.isRequired,
    rewrites: PropTypes.object.isRequired,
 };

--- a/client/src/components/Filters/Table.js
+++ b/client/src/components/Filters/Table.js
@@ -48,7 +48,6 @@ class Table extends Component {
            Header: <Trans>list_url_table_header</Trans>,
            accessor: 'url',
            minWidth: 180,
-            // eslint-disable-next-line react/prop-types
            Cell: ({ value }) => (
                <div className="logs__row">
                    {isValidAbsolutePath(value) ? value
--- a/client/src/components/ProtectionTimer/index.js
+++ b/client/src/components/ProtectionTimer/index.js
@@ -32,8 +32,6 @@ const ProtectionTimer = ({
 };

 ProtectionTimer.propTypes = {
-    protectionDisabledDuration: PropTypes.number,
-    toggleProtectionSuccess: PropTypes.func.isRequired,
    setProtectionTimerTime: PropTypes.func.isRequired,
 };

--- a/client/src/components/Settings/LogsConfig/Form.js
+++ b/client/src/components/Settings/LogsConfig/Form.js
@@ -27,6 +27,7 @@ import {
 } from '../../../helpers/constants';
 import '../FormButton.css';

+
 const getIntervalTitle = (interval, t) => {
    switch (interval) {
        case RETENTION_CUSTOM:
--- a/client/src/components/Settings/StatsConfig/Form.js
+++ b/client/src/components/Settings/StatsConfig/Form.js
@@ -7,6 +7,7 @@ import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
 import { connect } from 'react-redux';

+
 import {
    renderRadioField,
    toNumber,
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
@@ -1,4 +1,3 @@
-/* eslint-disable react/no-unknown-property */
 import React from 'react';

 import './Icons.css';
--- a/client/src/containers/DnsRewrites.js
+++ b/client/src/containers/DnsRewrites.js
@@ -3,7 +3,6 @@ import {
    getRewritesList,
    addRewrite,
    deleteRewrite,
-    updateRewrite,
    toggleRewritesModal,
 } from '../actions/rewrites';
 import Rewrites from '../components/Filters/Rewrites';
@@ -18,7 +17,6 @@ const mapDispatchToProps = {
    getRewritesList,
    addRewrite,
    deleteRewrite,
-    updateRewrite,
    toggleRewritesModal,
 };

--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -173,8 +173,6 @@ export const MODAL_TYPE = {
    ADD_FILTERS: 'ADD_FILTERS',
    EDIT_FILTERS: 'EDIT_FILTERS',
    CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST',
-    ADD_REWRITE: 'ADD_REWRITE',
-    EDIT_REWRITE: 'EDIT_REWRITE',
 };

 export const CLIENT_ID = {
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -845,6 +845,7 @@ export const sortIp = (a, b) => {
    }
 };

+
 /**
 * @param {number} filterId
 * @returns {string}
--- a/client/src/helpers/trackers/trackers.json
+++ b/client/src/helpers/trackers/trackers.json
--- a/client/src/reducers/rewrites.js
+++ b/client/src/reducers/rewrites.js
@@ -30,27 +30,7 @@ const rewrites = handleActions(
        [actions.deleteRewriteFailure]: (state) => ({ ...state, processingDelete: false }),
        [actions.deleteRewriteSuccess]: (state) => ({ ...state, processingDelete: false }),

-        [actions.updateRewriteRequest]: (state) => ({ ...state, processingUpdate: true }),
-        [actions.updateRewriteFailure]: (state) => ({ ...state, processingUpdate: false }),
-        [actions.updateRewriteSuccess]: (state) => {
-            const newState = {
-                ...state,
-                processingUpdate: false,
-            };
-            return newState;
-        },
-
-        [actions.toggleRewritesModal]: (state, { payload }) => {
-            if (payload) {
-                const newState = {
-                    ...state,
-                    modalType: payload.type || '',
-                    isModalOpen: !state.isModalOpen,
-                    currentRewrite: payload.currentRewrite,
-                };
-                return newState;
-            }
-
+        [actions.toggleRewritesModal]: (state) => {
            const newState = {
                ...state,
                isModalOpen: !state.isModalOpen,
@@ -62,10 +42,7 @@ const rewrites = handleActions(
        processing: true,
        processingAdd: false,
        processingDelete: false,
-        processingUpdate: false,
        isModalOpen: false,
-        modalType: '',
-        currentRewrite: {},
        list: [],
    },
 );
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # A docker file for scripts/make/build-docker.sh.

-FROM alpine:3.18
+FROM alpine:3.17

 ARG BUILD_DATE
 ARG VERSION
@@ -25,6 +25,8 @@ RUN apk --no-cache add ca-certificates libcap tzdata && \
 	mkdir -p /opt/adguardhome/conf /opt/adguardhome/work && \
 	chown -R nobody: /opt/adguardhome

+RUN apk --no-cache add tini
+
 ARG DIST_DIR
 ARG TARGETARCH
 ARG TARGETOS
@@ -41,19 +43,45 @@ RUN setcap 'cap_net_bind_service=+eip' /opt/adguardhome/AdGuardHome
 # 68     :      UDP : DHCP (client)
 # 80     : TCP      : HTTP (main)
 # 443    : TCP, UDP : HTTPS, DNS-over-HTTPS (incl. HTTP/3), DNSCrypt (main)
+# 784    :      UDP : DNS-over-QUIC (experimental)
 # 853    : TCP, UDP : DNS-over-TLS, DNS-over-QUIC
 # 3000   : TCP, UDP : HTTP(S) (alt, incl. HTTP/3)
+# 3001   : TCP, UDP : HTTP(S) (beta, incl. HTTP/3)
 # 5443   : TCP, UDP : DNSCrypt (alt)
 # 6060   : TCP      : HTTP (pprof)
-EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 853/tcp\
-	853/udp 3000/tcp 3000/udp 5443/tcp 5443/udp 6060/tcp
+# 8853   :      UDP : DNS-over-QUIC (experimental)
+#
+# TODO(a.garipov): Remove the old, non-standard 784 and 8853 ports for
+# DNS-over-QUIC in a future release.
+EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 784/udp\
+	853/tcp 853/udp 3000/tcp 3000/udp 5443/tcp\
+	5443/udp 6060/tcp 8853/udp

 WORKDIR /opt/adguardhome/work

-ENTRYPOINT ["/opt/adguardhome/AdGuardHome"]
+# Install helpers for healthcheck.
+COPY --chown=nobody:nogroup\
+	./${DIST_DIR}/docker/scripts\
+	/opt/adguardhome/scripts
+
+HEALTHCHECK \
+	--interval=30s \
+	--timeout=10s \
+	--retries=3 \
+	CMD [ "/opt/adguardhome/scripts/healthcheck.sh" ]
+
+# It seems that the healthckech script sometimes spawns zombie processes, so we
+# need a way to handle them, since AdGuard Home doesn't know how to keep track
+# of the processes delegated to it by the OS.  Use tini as entry point because
+# it needs the PID=1 to be the default parent for orphaned processes.
+#
+# See https://github.com/adguardTeam/adGuardHome/issues/3290.
+ENTRYPOINT [ "/sbin/tini", "--" ]

 CMD [ \
+	"/opt/adguardhome/AdGuardHome", \
 	"--no-check-update", \
 	"-c", "/opt/adguardhome/conf/AdGuardHome.yaml", \
+	"-h", "0.0.0.0", \
 	"-w", "/opt/adguardhome/work" \
 ]
--- a/docker/dns-bind.awk
+++ b/docker/dns-bind.awk
@@ -0,0 +1,29 @@
+/^[^[:space:]]/ { is_dns = /^dns:/ }
+
+/^[[:space:]]+bind_hosts:/ { if (is_dns) prev_line = FNR }
+
+/^[[:space:]]+- .+/ {
+    if (FNR - prev_line == 1) {
+        addrs[$2] = true
+        prev_line = FNR
+
+        if ($2 == "0.0.0.0" || $2 == "'::'") {
+            # Drop all the other addresses.
+            delete addrs
+            addrs[""] = true
+            prev_line = -1
+        }
+    }
+}
+
+/^[[:space:]]+port:/ { if (is_dns) port = $2 }
+
+END {
+    for (addr in addrs) {
+        if (match(addr, ":")) {
+            print "[" addr "]:" port
+        } else {
+            print addr ":" port
+        }
+    }
+}
--- a/docker/healthcheck.sh
+++ b/docker/healthcheck.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# AdGuard Home Docker healthcheck script
+
+# Exit the script if a pipeline fails (-e), prevent accidental filename
+# expansion (-f), and consider undefined variables as errors (-u).
+set -e -f -u
+
+# Function error_exit is an echo wrapper that writes to stderr and stops the
+# script execution with code 1.
+error_exit() {
+	echo "$1" 1>&2
+
+	exit 1
+}
+
+agh_dir="/opt/adguardhome"
+readonly agh_dir
+
+filename="${agh_dir}/conf/AdGuardHome.yaml"
+readonly filename
+
+if ! [ -f "$filename" ]
+then
+    wget "http://127.0.0.1:3000" -O /dev/null -q || exit 1
+
+    exit 0
+fi
+
+help_dir="${agh_dir}/scripts"
+readonly help_dir
+
+# Parse web host
+
+web_url="$( awk -f "${help_dir}/web-bind.awk" "$filename" )"
+readonly web_url
+
+if [ "$web_url" = '' ]
+then
+    error_exit "no web bindings could be retrieved from $filename"
+fi
+
+# TODO(e.burkov):  Deal with 0 port.
+case "$web_url"
+in
+(*':0')
+    error_exit '0 in web port is not supported by healthcheck'
+    ;;
+(*)
+    # Go on.
+    ;;
+esac
+
+# Parse DNS hosts
+
+dns_hosts="$( awk -f "${help_dir}/dns-bind.awk" "$filename" )"
+readonly dns_hosts
+
+if [ "$dns_hosts" = '' ]
+then
+    error_exit "no DNS bindings could be retrieved from $filename"
+fi
+
+first_dns="$( echo "$dns_hosts" | head -n 1 )"
+readonly first_dns
+
+# TODO(e.burkov):  Deal with 0 port.
+case "$first_dns"
+in
+(*':0')
+    error_exit '0 in DNS port is not supported by healthcheck'
+    ;;
+(*)
+    # Go on.
+    ;;
+esac
+
+# Check
+
+# Skip SSL certificate validation since there is no guarantee the container
+# trusts the one used.  It should be safe to drop the SSL validation since the
+# current script intended to be used from inside the container and only checks
+# the endpoint availability, ignoring the content of the response.
+#
+# See https://github.com/AdguardTeam/AdGuardHome/issues/5642.
+wget --no-check-certificate "$web_url" -O /dev/null -q || exit 1
+
+test_fqdn="healthcheck.adguardhome.test."
+readonly test_fqdn
+
+# The awk script currently returns only port prefixed with colon in case of
+# unspecified address.
+case "$first_dns"
+in
+(':'*)
+    nslookup -type=a "$test_fqdn" "127.0.0.1${first_dns}" > /dev/null ||\
+    nslookup -type=a "$test_fqdn" "[::1]${first_dns}" > /dev/null ||\
+        error_exit "nslookup failed for $host"
+    ;;
+(*)
+    echo "$dns_hosts" | while read -r host
+    do
+        nslookup -type=a "$test_fqdn" "$host" > /dev/null ||\
+            error_exit "nslookup failed for $host"
+    done
+    ;;
+esac
--- a/docker/web-bind.awk
+++ b/docker/web-bind.awk
@@ -0,0 +1,13 @@
+# Don't consider the HTTPS hostname since the enforced HTTPS redirection should
+# work if the SSL check skipped.  See file docker/healthcheck.sh.
+/^bind_host:/ { host = $2 }
+
+/^bind_port:/ { port = $2 }
+
+END {
+    if (match(host, ":")) {
+        print "http://[" host "]:" port
+     } else {
+        print "http://" host ":" port
+    }
+}
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,8 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.19

 require (
-	// TODO(a.garipov): Update to a tagged version when it's released.
-	github.com/AdguardTeam/dnsproxy v0.50.3-0.20230628054307-31e374065768
-	github.com/AdguardTeam/golibs v0.13.4
+	github.com/AdguardTeam/dnsproxy v0.50.2
+	github.com/AdguardTeam/golibs v0.13.3
 	github.com/AdguardTeam/urlfilter v0.16.1
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/ameshkov/dnscrypt/v2 v2.2.7
@@ -18,7 +17,7 @@ require (
 	github.com/google/gopacket v1.1.19
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.3.0
-	github.com/insomniacslk/dhcp v0.0.0-20230612134759-b20c9ba983df
+	github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb
 	github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86
 	github.com/kardianos/service v1.2.2
 	github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
@@ -27,13 +26,13 @@ require (
 	// TODO(a.garipov): This package is deprecated; find a new one or use our
 	// own code for that.  Perhaps, use gopacket.
 	github.com/mdlayher/raw v0.1.0
-	github.com/miekg/dns v1.1.55
+	github.com/miekg/dns v1.1.54
 	github.com/quic-go/quic-go v0.35.1
 	github.com/stretchr/testify v1.8.4
 	github.com/ti-mo/netfilter v0.5.0
 	go.etcd.io/bbolt v1.3.7
 	golang.org/x/crypto v0.10.0
-	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
+	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
 	golang.org/x/net v0.11.0
 	golang.org/x/sys v0.9.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -51,17 +50,17 @@ require (
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
-	github.com/onsi/ginkgo/v2 v2.11.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.10.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pierrec/lz4/v4 v4.1.18 // indirect
+	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
 	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
 	github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
-	golang.org/x/mod v0.11.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/sync v0.2.0 // indirect
 	golang.org/x/text v0.10.0 // indirect
-	golang.org/x/tools v0.10.0 // indirect
+	golang.org/x/tools v0.9.3 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-github.com/AdguardTeam/dnsproxy v0.50.3-0.20230628054307-31e374065768 h1:5Ia6wA+tqAlTyzuaOVGSlHmb0osLWXeJUs3NxCuC4gA=
-github.com/AdguardTeam/dnsproxy v0.50.3-0.20230628054307-31e374065768/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
+github.com/AdguardTeam/dnsproxy v0.50.2 h1:p1471SsMZ6SMo7T51Olw4aNluahvMwSLMorwxYV18ts=
+github.com/AdguardTeam/dnsproxy v0.50.2/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
 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.4 h1:ACTwIR1pEENBijHcEWtiMbSh4wWQOlIHRxmUB8oBHf8=
-github.com/AdguardTeam/golibs v0.13.4/go.mod h1:wkJ6EUsN4np/9Gp7+9QeooY9E2U2WCLJYAioLCzkHsI=
+github.com/AdguardTeam/golibs v0.13.3 h1:RT3QbzThtaLiFLkIUDS6/hlGEXrh0zYvdf4bd7UWpGo=
+github.com/AdguardTeam/golibs v0.13.3/go.mod h1:wkJ6EUsN4np/9Gp7+9QeooY9E2U2WCLJYAioLCzkHsI=
 github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
 github.com/AdguardTeam/urlfilter v0.16.1 h1:ZPi0rjqo8cQf2FVdzo6cqumNoHZx2KPXj2yZa1A5BBw=
 github.com/AdguardTeam/urlfilter v0.16.1/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
@@ -58,8 +58,8 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
-github.com/insomniacslk/dhcp v0.0.0-20230612134759-b20c9ba983df h1:pF1MMIzEJzJ/MyI4bXYXVYyN8CJgoQ2PPKT2z3O/Cl4=
-github.com/insomniacslk/dhcp v0.0.0-20230612134759-b20c9ba983df/go.mod h1:7474bZ1YNCvarT6WFKie4kEET6J0KYRDC4XJqqXzQW4=
+github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb h1:6fDKEAXwe3rsfS4khW3EZ8kEqmSiV9szhMPcDrD+Y7Q=
+github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb/go.mod h1:7474bZ1YNCvarT6WFKie4kEET6J0KYRDC4XJqqXzQW4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
@@ -85,18 +85,18 @@ github.com/mdlayher/socket v0.2.1/go.mod h1:QLlNPkFR88mRUNQIzRBMfXxwKal8H7u1h3bL
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
 github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
-github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
-github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/miekg/dns v1.1.54 h1:5jon9mWcb0sFJGpnI99tOMhCPyJ+RPVz5b63MQG0VWI=
+github.com/miekg/dns v1.1.54/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
-github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
-github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
+github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs=
+github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE=
+github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
-github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
+github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -136,13 +136,13 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
 golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
-golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME=
-golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
-golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -156,8 +156,8 @@ golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
 golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -191,8 +191,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
-golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/internal/aghnet/addr.go
+++ b/internal/aghnet/addr.go
@@ -1,43 +0,0 @@
-package aghnet
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/AdguardTeam/golibs/stringutil"
-)
-
-// NormalizeDomain returns a lowercased version of host without the final dot,
-// unless host is ".", in which case it returns it unchanged.  That is a special
-// case that to allow matching queries like:
-//
-//	dig IN NS '.'
-func NormalizeDomain(host string) (norm string) {
-	if host == "." {
-		return host
-	}
-
-	return strings.ToLower(strings.TrimSuffix(host, "."))
-}
-
-// NewDomainNameSet returns nil and error, if list has duplicate or empty domain
-// name.  Otherwise returns a set, which contains domain names normalized using
-// [NormalizeDomain].
-func NewDomainNameSet(list []string) (set *stringutil.Set, err error) {
-	set = stringutil.NewSet()
-
-	for i, host := range list {
-		if host == "" {
-			return nil, fmt.Errorf("at index %d: hostname is empty", i)
-		}
-
-		host = NormalizeDomain(host)
-		if set.Has(host) {
-			return nil, fmt.Errorf("duplicate hostname %q at index %d", host, i)
-		}
-
-		set.Add(host)
-	}
-
-	return set, nil
-}
--- a/internal/aghnet/addr_test.go
+++ b/internal/aghnet/addr_test.go
@@ -1,59 +0,0 @@
-package aghnet_test
-
-import (
-	"testing"
-
-	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
-	"github.com/AdguardTeam/golibs/testutil"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewDomainNameSet(t *testing.T) {
-	t.Parallel()
-
-	testCases := []struct {
-		name       string
-		wantErrMsg string
-		in         []string
-	}{{
-		name:       "nil",
-		wantErrMsg: "",
-		in:         nil,
-	}, {
-		name:       "success",
-		wantErrMsg: "",
-		in: []string{
-			"Domain.Example",
-			".",
-		},
-	}, {
-		name:       "dups",
-		wantErrMsg: `duplicate hostname "domain.example" at index 1`,
-		in: []string{
-			"Domain.Example",
-			"domain.example",
-		},
-	}, {
-		name:       "bad_domain",
-		wantErrMsg: "at index 0: hostname is empty",
-		in: []string{
-			"",
-		},
-	}}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-			set, err := aghnet.NewDomainNameSet(tc.in)
-			testutil.AssertErrorMsg(t, tc.wantErrMsg, err)
-			if err != nil {
-				return
-			}
-
-			for _, host := range tc.in {
-				assert.Truef(t, set.Has(aghnet.NormalizeDomain(host)), "%q not matched", host)
-			}
-		})
-	}
-}
--- a/internal/aghnet/hostgen.go
+++ b/internal/aghnet/hostgen.go
@@ -1,8 +1,12 @@
 package aghnet

 import (
+	"fmt"
 	"net/netip"
 	"strings"
+
+	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/stringutil"
 )

 // GenerateHostname generates the hostname from ip.  In case of using IPv4 the
@@ -25,8 +29,32 @@ func GenerateHostname(ip netip.Addr) (hostname string) {
 	hostname = ip.StringExpanded()

 	if ip.Is4() {
-		return strings.ReplaceAll(hostname, ".", "-")
+		return strings.Replace(hostname, ".", "-", -1)
 	}

-	return strings.ReplaceAll(hostname, ":", "-")
+	return strings.Replace(hostname, ":", "-", -1)
+}
+
+// NewDomainNameSet returns nil and error, if list has duplicate or empty
+// domain name.  Otherwise returns a set, which contains non-FQDN domain names,
+// and nil error.
+func NewDomainNameSet(list []string) (set *stringutil.Set, err error) {
+	set = stringutil.NewSet()
+
+	for i, v := range list {
+		host := strings.ToLower(strings.TrimSuffix(v, "."))
+		// TODO(a.garipov): Think about ignoring empty (".") names in the
+		// future.
+		if host == "" {
+			return nil, errors.Error("host name is empty")
+		}
+
+		if set.Has(host) {
+			return nil, fmt.Errorf("duplicate host name %q at index %d", host, i)
+		}
+
+		set.Add(host)
+	}
+
+	return set, nil
 }
--- a/internal/aghnet/hostscontainer.go
+++ b/internal/aghnet/hostscontainer.go
@@ -56,20 +56,15 @@ func (rm *requestMatcher) MatchRequest(
 ) (res *urlfilter.DNSResult, ok bool) {
 	switch req.DNSType {
 	case dns.TypeA, dns.TypeAAAA, dns.TypePTR:
-		log.Debug(
-			"%s: handling %s request for %s",
-			hostsContainerPrefix,
-			dns.Type(req.DNSType),
-			req.Hostname,
-		)
-
-		rm.stateLock.RLock()
-		defer rm.stateLock.RUnlock()
-
-		return rm.engine.MatchRequest(req)
+		log.Debug("%s: handling the request for %s", hostsContainerPrefix, req.Hostname)
 	default:
 		return nil, false
 	}
+
+	rm.stateLock.RLock()
+	defer rm.stateLock.RUnlock()
+
+	return rm.engine.MatchRequest(req)
 }

 // Translate returns the source hosts-syntax rule for the generated dnsrewrite
@@ -101,8 +96,6 @@ const hostsContainerPrefix = "hosts container"

 // HostsContainer stores the relevant hosts database provided by the OS and
 // processes both A/AAAA and PTR DNS requests for those.
-//
-// TODO(e.burkov):  Improve API and move to golibs.
 type HostsContainer struct {
 	// requestMatcher matches the requests and translates the rules.  It's
 	// embedded to implement MatchRequest and Translate for *HostsContainer.
--- a/internal/aghtest/interface.go
+++ b/internal/aghtest/interface.go
@@ -2,8 +2,8 @@ package aghtest

 import (
 	"context"
-	"io"
 	"io/fs"
+	"net"

 	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
@@ -19,23 +19,23 @@ import (

 // Package fs

-// FS is a fake [fs.FS] implementation for tests.
+// type check
+var _ fs.FS = &FS{}
+
+// FS is a mock [fs.FS] implementation for tests.
 type FS struct {
 	OnOpen func(name string) (fs.File, error)
 }

-// type check
-var _ fs.FS = (*FS)(nil)
-
 // Open implements the [fs.FS] interface for *FS.
 func (fsys *FS) Open(name string) (fs.File, error) {
 	return fsys.OnOpen(name)
 }

 // type check
-var _ fs.GlobFS = (*GlobFS)(nil)
+var _ fs.GlobFS = &GlobFS{}

-// GlobFS is a fake [fs.GlobFS] implementation for tests.
+// GlobFS is a mock [fs.GlobFS] implementation for tests.
 type GlobFS struct {
 	// FS is embedded here to avoid implementing all it's methods.
 	FS
@@ -48,9 +48,9 @@ func (fsys *GlobFS) Glob(pattern string) ([]string, error) {
 }

 // type check
-var _ fs.StatFS = (*StatFS)(nil)
+var _ fs.StatFS = &StatFS{}

-// StatFS is a fake [fs.StatFS] implementation for tests.
+// StatFS is a mock [fs.StatFS] implementation for tests.
 type StatFS struct {
 	// FS is embedded here to avoid implementing all it's methods.
 	FS
@@ -62,34 +62,47 @@ func (fsys *StatFS) Stat(name string) (fs.FileInfo, error) {
 	return fsys.OnStat(name)
 }

-// Package io
+// Package net

-// Writer is a fake [io.Writer] implementation for tests.
-type Writer struct {
-	OnWrite func(b []byte) (n int, err error)
+// type check
+var _ net.Listener = (*Listener)(nil)
+
+// Listener is a mock [net.Listener] implementation for tests.
+type Listener struct {
+	OnAccept func() (conn net.Conn, err error)
+	OnAddr   func() (addr net.Addr)
+	OnClose  func() (err error)
 }

-var _ io.Writer = (*Writer)(nil)
+// Accept implements the [net.Listener] interface for *Listener.
+func (l *Listener) Accept() (conn net.Conn, err error) {
+	return l.OnAccept()
+}

-// Write implements the [io.Writer] interface for *Writer.
-func (w *Writer) Write(b []byte) (n int, err error) {
-	return w.OnWrite(b)
+// Addr implements the [net.Listener] interface for *Listener.
+func (l *Listener) Addr() (addr net.Addr) {
+	return l.OnAddr()
+}
+
+// Close implements the [net.Listener] interface for *Listener.
+func (l *Listener) Close() (err error) {
+	return l.OnClose()
 }

 // Module adguard-home

 // Package aghos

-// FSWatcher is a fake [aghos.FSWatcher] implementation for tests.
+// type check
+var _ aghos.FSWatcher = (*FSWatcher)(nil)
+
+// FSWatcher is a mock [aghos.FSWatcher] implementation for tests.
 type FSWatcher struct {
 	OnEvents func() (e <-chan struct{})
 	OnAdd    func(name string) (err error)
 	OnClose  func() (err error)
 }

-// type check
-var _ aghos.FSWatcher = (*FSWatcher)(nil)
-
 // Events implements the [aghos.FSWatcher] interface for *FSWatcher.
 func (w *FSWatcher) Events() (e <-chan struct{}) {
 	return w.OnEvents()
@@ -107,16 +120,16 @@ func (w *FSWatcher) Close() (err error) {

 // Package agh

-// ServiceWithConfig is a fake [agh.ServiceWithConfig] implementation for tests.
+// type check
+var _ agh.ServiceWithConfig[struct{}] = (*ServiceWithConfig[struct{}])(nil)
+
+// ServiceWithConfig is a mock [agh.ServiceWithConfig] implementation for tests.
 type ServiceWithConfig[ConfigType any] struct {
 	OnStart    func() (err error)
 	OnShutdown func(ctx context.Context) (err error)
 	OnConfig   func() (c ConfigType)
 }

-// type check
-var _ agh.ServiceWithConfig[struct{}] = (*ServiceWithConfig[struct{}])(nil)
-
 // Start implements the [agh.ServiceWithConfig] interface for
 // *ServiceWithConfig.
 func (s *ServiceWithConfig[_]) Start() (err error) {
@@ -139,7 +152,10 @@ func (s *ServiceWithConfig[ConfigType]) Config() (c ConfigType) {

 // Package upstream

-// UpstreamMock is a fake [upstream.Upstream] implementation for tests.
+// type check
+var _ upstream.Upstream = (*UpstreamMock)(nil)
+
+// UpstreamMock is a mock [upstream.Upstream] implementation for tests.
 //
 // TODO(a.garipov): Replace with all uses of Upstream with UpstreamMock and
 // rename it to just Upstream.
@@ -149,9 +165,6 @@ type UpstreamMock struct {
 	OnClose    func() (err error)
 }

-// type check
-var _ upstream.Upstream = (*UpstreamMock)(nil)
-
 // Address implements the [upstream.Upstream] interface for *UpstreamMock.
 func (u *UpstreamMock) Address() (addr string) {
 	return u.OnAddress()
--- a/internal/dhcpd/bitset.go
+++ b/internal/dhcpd/bitset.go
@@ -25,8 +25,11 @@ func (s *bitSet) isSet(n uint64) (ok bool) {

 	var word uint64
 	word, ok = s.words[wordIdx]
+	if !ok {
+		return false
+	}

-	return ok && word&(1<<bitIdx) != 0
+	return word&(1<<bitIdx) != 0
 }

 // set sets or unsets a bit.
--- a/internal/dhcpd/conn_bsd.go
+++ b/internal/dhcpd/conn_bsd.go
@@ -249,30 +249,31 @@ func (c *dhcpConn) buildEtherPkt(payload []byte, peer *dhcpUnicastAddr) (pkt []b
 func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
 	switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
 	case giaddr != nil && !giaddr.IsUnspecified():
-		// Send any return messages to the server port on the BOOTP relay agent
-		// whose address appears in giaddr.
+		// Send any return messages to the server port on the BOOTP
+		// relay agent whose address appears in giaddr.
 		peer = &net.UDPAddr{
 			IP:   giaddr,
 			Port: dhcpv4.ServerPort,
 		}
 		if mtype == dhcpv4.MessageTypeNak {
 			// Set the broadcast bit in the DHCPNAK, so that the relay agent
-			// broadcasts it to the client, because the client may not have a
-			// correct network address or subnet mask, and the client may not be
-			// answering ARP requests.
+			// broadcasts it to the client, because the client may not have
+			// a correct network address or subnet mask, and the client may not
+			// be answering ARP requests.
 			resp.SetBroadcast()
 		}
 	case mtype == dhcpv4.MessageTypeNak:
 		// Broadcast any DHCPNAK messages to 0xffffffff.
 	case ciaddr != nil && !ciaddr.IsUnspecified():
-		// Unicast DHCPOFFER and DHCPACK messages to the address in ciaddr.
+		// Unicast DHCPOFFER and DHCPACK messages to the address in
+		// ciaddr.
 		peer = &net.UDPAddr{
 			IP:   ciaddr,
 			Port: dhcpv4.ClientPort,
 		}
 	case !req.IsBroadcast() && req.ClientHWAddr != nil:
-		// Unicast DHCPOFFER and DHCPACK messages to the client's hardware
-		// address and yiaddr.
+		// Unicast DHCPOFFER and DHCPACK messages to the client's
+		// hardware address and yiaddr.
 		peer = &dhcpUnicastAddr{
 			Addr:   raw.Addr{HardwareAddr: req.ClientHWAddr},
 			yiaddr: resp.YourIPAddr,
--- a/internal/dhcpd/conn_linux.go
+++ b/internal/dhcpd/conn_linux.go
@@ -247,30 +247,31 @@ func (c *dhcpConn) buildEtherPkt(payload []byte, peer *dhcpUnicastAddr) (pkt []b
 func (s *v4Server) send(peer net.Addr, conn net.PacketConn, req, resp *dhcpv4.DHCPv4) {
 	switch giaddr, ciaddr, mtype := req.GatewayIPAddr, req.ClientIPAddr, resp.MessageType(); {
 	case giaddr != nil && !giaddr.IsUnspecified():
-		// Send any return messages to the server port on the BOOTP relay agent
-		// whose address appears in giaddr.
+		// Send any return messages to the server port on the BOOTP
+		// relay agent whose address appears in giaddr.
 		peer = &net.UDPAddr{
 			IP:   giaddr,
 			Port: dhcpv4.ServerPort,
 		}
 		if mtype == dhcpv4.MessageTypeNak {
 			// Set the broadcast bit in the DHCPNAK, so that the relay agent
-			// broadcasts it to the client, because the client may not have a
-			// correct network address or subnet mask, and the client may not be
-			// answering ARP requests.
+			// broadcasts it to the client, because the client may not have
+			// a correct network address or subnet mask, and the client may not
+			// be answering ARP requests.
 			resp.SetBroadcast()
 		}
 	case mtype == dhcpv4.MessageTypeNak:
 		// Broadcast any DHCPNAK messages to 0xffffffff.
 	case ciaddr != nil && !ciaddr.IsUnspecified():
-		// Unicast DHCPOFFER and DHCPACK messages to the address in ciaddr.
+		// Unicast DHCPOFFER and DHCPACK messages to the address in
+		// ciaddr.
 		peer = &net.UDPAddr{
 			IP:   ciaddr,
 			Port: dhcpv4.ClientPort,
 		}
 	case !req.IsBroadcast() && req.ClientHWAddr != nil:
-		// Unicast DHCPOFFER and DHCPACK messages to the client's hardware
-		// address and yiaddr.
+		// Unicast DHCPOFFER and DHCPACK messages to the client's
+		// hardware address and yiaddr.
 		peer = &dhcpUnicastAddr{
 			Addr:   packet.Addr{HardwareAddr: req.ClientHWAddr},
 			yiaddr: resp.YourIPAddr,
--- a/internal/dhcpd/dhcpd.go
+++ b/internal/dhcpd/dhcpd.go
@@ -28,9 +28,8 @@ const (
 	defaultBackoff     time.Duration = 500 * time.Millisecond
 )

-// Lease contains the necessary information about a DHCP lease.  It's used as is
-// in the database, so don't change it until it's absolutely necessary, see
-// [dataVersion].
+// Lease contains the necessary information about a DHCP lease.  It's used in
+// various places.  So don't change it without good reason.
 type Lease struct {
 	// Expiry is the expiration time of the lease.
 	Expiry time.Time `json:"expires"`
@@ -42,6 +41,8 @@ type Lease struct {
 	HWAddr net.HardwareAddr `json:"mac"`

 	// IP is the IP address leased to the client.
+	//
+	// TODO(a.garipov): Migrate leases.db.
 	IP netip.Addr `json:"ip"`

 	// IsStatic defines if the lease is static.
--- a/internal/dhcpd/migrate.go
+++ b/internal/dhcpd/migrate.go
@@ -51,9 +51,6 @@ func migrateDB(conf *ServerConfig) (err error) {
 	oldLeasesPath := filepath.Join(conf.WorkDir, dbFilename)
 	dataDirPath := filepath.Join(conf.DataDir, dataFilename)

-	// #nosec G304 -- Trust this path, since it's taken from the old file name
-	// relative to the working directory and should generally be considered
-	// safe.
 	file, err := os.Open(oldLeasesPath)
 	if errors.Is(err, os.ErrNotExist) {
 		// Nothing to migrate.
--- a/internal/dhcpd/routeradv.go
+++ b/internal/dhcpd/routeradv.go
@@ -200,7 +200,7 @@ func createICMPv6RAPacket(params icmpv6RA) (data []byte, err error) {
 func (ra *raCtx) Init() (err error) {
 	ra.stop.Store(0)
 	ra.conn = nil
-	if !ra.raAllowSLAAC && !ra.raSLAACOnly {
+	if !(ra.raAllowSLAAC || ra.raSLAACOnly) {
 		return nil
 	}

--- a/internal/dhcpsvc/config.go
+++ b/internal/dhcpsvc/config.go
@@ -1,86 +0,0 @@
-package dhcpsvc
-
-import (
-	"net/netip"
-	"time"
-
-	"github.com/google/gopacket/layers"
-)
-
-// Config is the configuration for the DHCP service.
-type Config struct {
-	// Interfaces stores configurations of DHCP server specific for the network
-	// interface identified by its name.
-	Interfaces map[string]*InterfaceConfig
-
-	// LocalDomainName is the top-level domain name to use for resolving DHCP
-	// clients' hostnames.
-	LocalDomainName string
-
-	// ICMPTimeout is the timeout for checking another DHCP server's presence.
-	ICMPTimeout time.Duration
-
-	// Enabled is the state of the service, whether it is enabled or not.
-	Enabled bool
-}
-
-// InterfaceConfig is the configuration of a single DHCP interface.
-type InterfaceConfig struct {
-	// IPv4 is the configuration of DHCP protocol for IPv4.
-	IPv4 *IPv4Config
-
-	// IPv6 is the configuration of DHCP protocol for IPv6.
-	IPv6 *IPv6Config
-}
-
-// IPv4Config is the interface-specific configuration for DHCPv4.
-type IPv4Config struct {
-	// GatewayIP is the IPv4 address of the network's gateway.  It is used as
-	// the default gateway for DHCP clients and also used in calculating the
-	// network-specific broadcast address.
-	GatewayIP netip.Addr
-
-	// SubnetMask is the IPv4 subnet mask of the network.  It should be a valid
-	// IPv4 subnet mask (i.e. all 1s followed by all 0s).
-	SubnetMask netip.Addr
-
-	// RangeStart is the first address in the range to assign to DHCP clients.
-	RangeStart netip.Addr
-
-	// RangeEnd is the last address in the range to assign to DHCP clients.
-	RangeEnd netip.Addr
-
-	// Options is the list of DHCP options to send to DHCP clients.
-	Options layers.DHCPOptions
-
-	// LeaseDuration is the TTL of a DHCP lease.
-	LeaseDuration time.Duration
-
-	// Enabled is the state of the DHCPv4 service, whether it is enabled or not
-	// on the specific interface.
-	Enabled bool
-}
-
-// IPv6Config is the interface-specific configuration for DHCPv6.
-type IPv6Config struct {
-	// RangeStart is the first address in the range to assign to DHCP clients.
-	RangeStart netip.Addr
-
-	// Options is the list of DHCP options to send to DHCP clients.
-	Options layers.DHCPOptions
-
-	// LeaseDuration is the TTL of a DHCP lease.
-	LeaseDuration time.Duration
-
-	// RASlaacOnly defines whether the DHCP clients should only use SLAAC for
-	// address assignment.
-	RASLAACOnly bool
-
-	// RAAllowSlaac defines whether the DHCP clients may use SLAAC for address
-	// assignment.
-	RAAllowSLAAC bool
-
-	// Enabled is the state of the DHCPv6 service, whether it is enabled or not
-	// on the specific interface.
-	Enabled bool
-}
--- a/internal/dhcpsvc/dhcpsvc.go
+++ b/internal/dhcpsvc/dhcpsvc.go
@@ -1,120 +0,0 @@
-// Package dhcpsvc contains the AdGuard Home DHCP service.
-//
-// TODO(e.burkov): Add tests.
-package dhcpsvc
-
-import (
-	"context"
-	"net"
-	"net/netip"
-	"time"
-
-	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
-)
-
-// Lease is a DHCP lease.
-//
-// TODO(e.burkov):  Consider it to [agh], since it also may be needed in
-// [websvc].  Also think of implementing iterating methods with appropriate
-// signatures.
-type Lease struct {
-	// IP is the IP address leased to the client.
-	IP netip.Addr
-
-	// Expiry is the expiration time of the lease.
-	Expiry time.Time
-
-	// Hostname of the client.
-	Hostname string
-
-	// HWAddr is the physical hardware address (MAC address).
-	HWAddr net.HardwareAddr
-
-	// IsStatic defines if the lease is static.
-	IsStatic bool
-}
-
-type Interface interface {
-	agh.ServiceWithConfig[*Config]
-
-	// Enabled returns true if DHCP provides information about clients.
-	Enabled() (ok bool)
-
-	// HostByIP returns the hostname of the DHCP client with the given IP
-	// address.  The address will be netip.Addr{} if there is no such client,
-	// due to an assumption that a DHCP client must always have an IP address.
-	HostByIP(ip netip.Addr) (host string)
-
-	// MACByIP returns the MAC address for the given IP address leased.  It
-	// returns nil if there is no such client, due to an assumption that a DHCP
-	// client must always have a MAC address.
-	MACByIP(ip netip.Addr) (mac net.HardwareAddr)
-
-	// IPByHost returns the IP address of the DHCP client with the given
-	// hostname.  The hostname will be an empty string if there is no such
-	// client, due to an assumption that a DHCP client must always have a
-	// hostname, either set by the client or assigned automatically.
-	IPByHost(host string) (ip netip.Addr)
-
-	// Leases returns all the DHCP leases.
-	Leases() (leases []*Lease)
-
-	// AddLease adds a new DHCP lease.  It returns an error if the lease is
-	// invalid or already exists.
-	AddLease(l *Lease) (err error)
-
-	// EditLease changes an existing DHCP lease.  It returns an error if there
-	// is no lease equal to old or if new is invalid or already exists.
-	EditLease(old, new *Lease) (err error)
-
-	// RemoveLease removes an existing DHCP lease.  It returns an error if there
-	// is no lease equal to l.
-	RemoveLease(l *Lease) (err error)
-
-	// Reset removes all the DHCP leases.
-	Reset() (err error)
-}
-
-// Empty is an [Interface] implementation that does nothing.
-type Empty struct{}
-
-// type check
-var _ Interface = Empty{}
-
-// Start implements the [Service] interface for Empty.
-func (Empty) Start() (err error) { return nil }
-
-// Shutdown implements the [Service] interface for Empty.
-func (Empty) Shutdown(_ context.Context) (err error) { return nil }
-
-var _ agh.ServiceWithConfig[*Config] = Empty{}
-
-// Config implements the [ServiceWithConfig] interface for Empty.
-func (Empty) Config() (conf *Config) { return nil }
-
-// Enabled implements the [Interface] interface for Empty.
-func (Empty) Enabled() (ok bool) { return false }
-
-// HostByIP implements the [Interface] interface for Empty.
-func (Empty) HostByIP(_ netip.Addr) (host string) { return "" }
-
-// MACByIP implements the [Interface] interface for Empty.
-func (Empty) MACByIP(_ netip.Addr) (mac net.HardwareAddr) { return nil }
-
-// IPByHost implements the [Interface] interface for Empty.
-func (Empty) IPByHost(_ string) (ip netip.Addr) { return netip.Addr{} }
-
-// Leases implements the [Interface] interface for Empty.
-func (Empty) Leases() (leases []*Lease) { return nil }
-
-// AddLease implements the [Interface] interface for Empty.
-func (Empty) AddLease(_ *Lease) (err error) { return nil }
-
-// EditLease implements the [Interface] interface for Empty.
-func (Empty) EditLease(_, _ *Lease) (err error) { return nil }
-
-// RemoveLease implements the [Interface] interface for Empty.
-func (Empty) RemoveLease(_ *Lease) (err error) { return nil }
-
-// Reset implements the [Interface] interface for Empty.
-func (Empty) Reset() (err error) { return nil }
--- a/internal/dnsforward/config.go
+++ b/internal/dnsforward/config.go
@@ -15,6 +15,7 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/aghtls"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/dnsproxy/proxy"
+	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/netutil"
@@ -270,10 +271,7 @@ type ServerConfig struct {
 	UDPListenAddrs []*net.UDPAddr        // UDP listen address
 	TCPListenAddrs []*net.TCPAddr        // TCP listen address
 	UpstreamConfig *proxy.UpstreamConfig // Upstream DNS servers config
-
-	// ClientIPs, if not nil, is used to send clients' IP addresses to other
-	// parts of AdGuard Home that may use it for resolving rDNS, WHOIS, etc.
-	ClientIPs chan netip.Addr
+	OnDNSRequest   func(d *proxy.DNSContext)

 	FilteringConfig
 	TLSConfig
@@ -438,6 +436,102 @@ func (s *Server) initDefaultSettings() {
 	}
 }

+// UpstreamHTTPVersions returns the HTTP versions for upstream configuration
+// depending on configuration.
+func UpstreamHTTPVersions(http3 bool) (v []upstream.HTTPVersion) {
+	if !http3 {
+		return upstream.DefaultHTTPVersions
+	}
+
+	return []upstream.HTTPVersion{
+		upstream.HTTPVersion3,
+		upstream.HTTPVersion2,
+		upstream.HTTPVersion11,
+	}
+}
+
+// prepareUpstreamSettings - prepares upstream DNS server settings
+func (s *Server) prepareUpstreamSettings() error {
+	// We're setting a customized set of RootCAs.  The reason is that Go default
+	// mechanism of loading TLS roots does not always work properly on some
+	// routers so we're loading roots manually and pass it here.
+	//
+	// See [aghtls.SystemRootCAs].
+	upstream.RootCAs = s.conf.TLSv12Roots
+	upstream.CipherSuites = s.conf.TLSCiphers
+
+	// Load upstreams either from the file, or from the settings
+	var upstreams []string
+	if s.conf.UpstreamDNSFileName != "" {
+		data, err := os.ReadFile(s.conf.UpstreamDNSFileName)
+		if err != nil {
+			return fmt.Errorf("reading upstream from file: %w", err)
+		}
+
+		upstreams = stringutil.SplitTrimmed(string(data), "\n")
+
+		log.Debug("dns: using %d upstream servers from file %s", len(upstreams), s.conf.UpstreamDNSFileName)
+	} else {
+		upstreams = s.conf.UpstreamDNS
+	}
+
+	httpVersions := UpstreamHTTPVersions(s.conf.UseHTTP3Upstreams)
+	upstreams = stringutil.FilterOut(upstreams, IsCommentOrEmpty)
+	upstreamConfig, err := proxy.ParseUpstreamsConfig(
+		upstreams,
+		&upstream.Options{
+			Bootstrap:    s.conf.BootstrapDNS,
+			Timeout:      s.conf.UpstreamTimeout,
+			HTTPVersions: httpVersions,
+			PreferIPv6:   s.conf.BootstrapPreferIPv6,
+		},
+	)
+	if err != nil {
+		return fmt.Errorf("parsing upstream config: %w", err)
+	}
+
+	if len(upstreamConfig.Upstreams) == 0 {
+		log.Info("warning: no default upstream servers specified, using %v", defaultDNS)
+		var uc *proxy.UpstreamConfig
+		uc, err = proxy.ParseUpstreamsConfig(
+			defaultDNS,
+			&upstream.Options{
+				Bootstrap:    s.conf.BootstrapDNS,
+				Timeout:      s.conf.UpstreamTimeout,
+				HTTPVersions: httpVersions,
+				PreferIPv6:   s.conf.BootstrapPreferIPv6,
+			},
+		)
+		if err != nil {
+			return fmt.Errorf("parsing default upstreams: %w", err)
+		}
+
+		upstreamConfig.Upstreams = uc.Upstreams
+	}
+
+	s.conf.UpstreamConfig = upstreamConfig
+
+	return nil
+}
+
+// setProxyUpstreamMode sets the upstream mode and related settings in conf
+// based on provided parameters.
+func setProxyUpstreamMode(
+	conf *proxy.Config,
+	allServers bool,
+	fastestAddr bool,
+	fastestTimeout time.Duration,
+) {
+	if allServers {
+		conf.UpstreamMode = proxy.UModeParallel
+	} else if fastestAddr {
+		conf.UpstreamMode = proxy.UModeFastestAddr
+		conf.FastestPingTimeout = fastestTimeout
+	} else {
+		conf.UpstreamMode = proxy.UModeLoadBalance
+	}
+}
+
 // prepareIpsetListSettings reads and prepares the ipset configuration either
 // from a file or from the data in the configuration file.
 func (s *Server) prepareIpsetListSettings() (err error) {
@@ -446,7 +540,6 @@ func (s *Server) prepareIpsetListSettings() (err error) {
 		return s.ipset.init(s.conf.IpsetList)
 	}

-	// #nosec G304 -- Trust the path explicitly given by the user.
 	data, err := os.ReadFile(fn)
 	if err != nil {
 		return err
--- a/internal/dnsforward/process.go
+++ b/internal/dnsforward/process.go
@@ -30,7 +30,6 @@ type dnsContext struct {
 	setts *filtering.Settings

 	result *filtering.Result
-
 	// origResp is the response received from upstream.  It is set when the
 	// response is modified by filters.
 	origResp *dns.Msg
@@ -49,13 +48,13 @@ type dnsContext struct {
 	// clientID is the ClientID from DoH, DoQ, or DoT, if provided.
 	clientID string

-	// startTime is the time at which the processing of the request has started.
-	startTime time.Time
-
 	// origQuestion is the question received from the client.  It is set
 	// when the request is modified by rewrites.
 	origQuestion dns.Question

+	// startTime is the time at which the processing of the request has started.
+	startTime time.Time
+
 	// protectionEnabled shows if the filtering is enabled, and if the
 	// server's DNS filter is ready.
 	protectionEnabled bool
@@ -146,13 +145,10 @@ func (s *Server) handleDNSRequest(_ *proxy.Proxy, pctx *proxy.DNSContext) error
 // processRecursion checks the incoming request and halts its handling by
 // answering NXDOMAIN if s has tried to resolve it recently.
 func (s *Server) processRecursion(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing recursion")
-	defer log.Debug("dnsforward: finished processing recursion")
-
 	pctx := dctx.proxyCtx

 	if msg := pctx.Req; msg != nil && s.recDetector.check(*msg) {
-		log.Debug("dnsforward: recursion detected resolving %q", msg.Question[0].Name)
+		log.Debug("recursion detected resolving %q", msg.Question[0].Name)
 		pctx.Res = s.genNXDomain(pctx.Req)

 		return resultCodeFinish
@@ -161,33 +157,12 @@ func (s *Server) processRecursion(dctx *dnsContext) (rc resultCode) {
 	return resultCodeSuccess
 }

-// mozillaFQDN is the domain used to signal the Firefox browser to not use its
-// own DoH server.
-//
-// See https://support.mozilla.org/en-US/kb/canary-domain-use-application-dnsnet.
-const mozillaFQDN = "use-application-dns.net."
-
-// healthcheckFQDN is a reserved domain-name used for healthchecking.
-//
-// [Section 6.2 of RFC 6761] states that DNS Registries/Registrars must not
-// grant requests to register test names in the normal way to any person or
-// entity, making domain names under the test. TLD free to use in internal
-// purposes.
-//
-// [Section 6.2 of RFC 6761]: https://www.rfc-editor.org/rfc/rfc6761.html#section-6.2
-const healthcheckFQDN = "healthcheck.adguardhome.test."
-
 // processInitial terminates the following processing for some requests if
-// needed and enriches dctx with some client-specific information.
+// needed and enriches the ctx with some client-specific information.
 //
 // TODO(e.burkov):  Decompose into less general processors.
 func (s *Server) processInitial(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing initial")
-	defer log.Debug("dnsforward: finished processing initial")
-
 	pctx := dctx.proxyCtx
-	s.processClientIP(pctx.Addr)
-
 	q := pctx.Req.Question[0]
 	qt := q.Qtype
 	if s.conf.AAAADisabled && qt == dns.TypeAAAA {
@@ -196,13 +171,28 @@ func (s *Server) processInitial(dctx *dnsContext) (rc resultCode) {
 		return resultCodeFinish
 	}

-	if (qt == dns.TypeA || qt == dns.TypeAAAA) && q.Name == mozillaFQDN {
+	if s.conf.OnDNSRequest != nil {
+		s.conf.OnDNSRequest(pctx)
+	}
+
+	// Disable Mozilla DoH.
+	//
+	// See https://support.mozilla.org/en-US/kb/canary-domain-use-application-dnsnet.
+	if (qt == dns.TypeA || qt == dns.TypeAAAA) && q.Name == "use-application-dns.net." {
 		pctx.Res = s.genNXDomain(pctx.Req)

 		return resultCodeFinish
 	}

-	if q.Name == healthcheckFQDN {
+	// Handle a reserved domain healthcheck.adguardhome.test.
+	//
+	// [Section 6.2 of RFC 6761] states that DNS Registries/Registrars must not
+	// grant requests to register test names in the normal way to any person or
+	// entity, making domain names under test. TLD free to use in internal
+	// purposes.
+	//
+	// [Section 6.2 of RFC 6761]: https://www.rfc-editor.org/rfc/rfc6761.html#section-6.2
+	if q.Name == "healthcheck.adguardhome.test." {
 		// Generate a NODATA negative response to make nslookup exit with 0.
 		pctx.Res = s.makeResponse(pctx.Req)

@@ -217,33 +207,11 @@ func (s *Server) processInitial(dctx *dnsContext) (rc resultCode) {

 	// Get the client-specific filtering settings.
 	dctx.protectionEnabled, _ = s.UpdatedProtectionStatus()
-	dctx.setts = s.clientRequestFilteringSettings(dctx)
+	dctx.setts = s.getClientRequestFilteringSettings(dctx)

 	return resultCodeSuccess
 }

-// processClientIP sends the client IP address to s.clientIPs, if needed.
-func (s *Server) processClientIP(addr net.Addr) {
-	clientIP := netutil.NetAddrToAddrPort(addr).Addr()
-	if clientIP == (netip.Addr{}) {
-		log.Info("dnsforward: warning: bad client addr %q", addr)
-
-		return
-	}
-
-	// Do not assign s.clientIPs to a local variable to then use, since this
-	// lock also serializes the closure of s.clientIPs.
-	s.serverLock.RLock()
-	defer s.serverLock.RUnlock()
-
-	select {
-	case s.clientIPs <- clientIP:
-		// Go on.
-	default:
-		log.Debug("dnsforward: client ip channel is nil or full; len: %d", len(s.clientIPs))
-	}
-}
-
 func (s *Server) setTableHostToIP(t hostToIPTable) {
 	s.tableHostToIPLock.Lock()
 	defer s.tableHostToIPLock.Unlock()
@@ -314,9 +282,6 @@ func (s *Server) onDHCPLeaseChanged(flags int) {
 //
 // See https://www.ietf.org/archive/id/draft-ietf-add-ddr-10.html.
 func (s *Server) processDDRQuery(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing ddr")
-	defer log.Debug("dnsforward: finished processing ddr")
-
 	if !s.conf.HandleDDR {
 		return resultCodeSuccess
 	}
@@ -410,9 +375,6 @@ func (s *Server) makeDDRResponse(req *dns.Msg) (resp *dns.Msg) {
 // processDetermineLocal determines if the client's IP address is from locally
 // served network and saves the result into the context.
 func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing local detection")
-	defer log.Debug("dnsforward: finished processing local detection")
-
 	rc = resultCodeSuccess

 	var ip net.IP
@@ -443,9 +405,6 @@ func (s *Server) dhcpHostToIP(host string) (ip netip.Addr, ok bool) {
 //
 // TODO(a.garipov): Adapt to AAAA as well.
 func (s *Server) processDHCPHosts(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing dhcp hosts")
-	defer log.Debug("dnsforward: finished processing dhcp hosts")
-
 	pctx := dctx.proxyCtx
 	req := pctx.Req
 	q := req.Question[0]
@@ -585,9 +544,6 @@ func extractARPASubnet(domain string) (pref netip.Prefix, err error) {
 // processRestrictLocal responds with NXDOMAIN to PTR requests for IP addresses
 // in locally served network from external clients.
 func (s *Server) processRestrictLocal(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing local restriction")
-	defer log.Debug("dnsforward: finished processing local restriction")
-
 	pctx := dctx.proxyCtx
 	req := pctx.Req
 	q := req.Question[0]
@@ -657,9 +613,6 @@ func (s *Server) ipToDHCPHost(ip netip.Addr) (host string, ok bool) {
 // processDHCPAddrs responds to PTR requests if the target IP is leased by the
 // DHCP server.
 func (s *Server) processDHCPAddrs(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing dhcp addrs")
-	defer log.Debug("dnsforward: finished processing dhcp addrs")
-
 	pctx := dctx.proxyCtx
 	if pctx.Res != nil {
 		return resultCodeSuccess
@@ -705,9 +658,6 @@ func (s *Server) processDHCPAddrs(dctx *dnsContext) (rc resultCode) {
 // processLocalPTR responds to PTR requests if the target IP is detected to be
 // inside the local network and the query was not answered from DHCP.
 func (s *Server) processLocalPTR(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing local ptr")
-	defer log.Debug("dnsforward: finished processing local ptr")
-
 	pctx := dctx.proxyCtx
 	if pctx.Res != nil {
 		return resultCodeSuccess
@@ -742,9 +692,6 @@ func (s *Server) processLocalPTR(dctx *dnsContext) (rc resultCode) {

 // Apply filtering logic
 func (s *Server) processFilteringBeforeRequest(ctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing filtering before req")
-	defer log.Debug("dnsforward: finished processing filtering before req")
-
 	if ctx.proxyCtx.Res != nil {
 		// Go on since the response is already set.
 		return resultCodeSuccess
@@ -778,9 +725,6 @@ func ipStringFromAddr(addr net.Addr) (ipStr string) {

 // processUpstream passes request to upstream servers and handles the response.
 func (s *Server) processUpstream(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing upstream")
-	defer log.Debug("dnsforward: finished processing upstream")
-
 	pctx := dctx.proxyCtx
 	req := pctx.Req
 	q := req.Question[0]
@@ -927,9 +871,6 @@ func (s *Server) setCustomUpstream(pctx *proxy.DNSContext, clientID string) {

 // Apply filtering logic after we have received response from upstream servers
 func (s *Server) processFilteringAfterResponse(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing filtering after resp")
-	defer log.Debug("dnsforward: finished processing filtering after resp")
-
 	pctx := dctx.proxyCtx
 	switch res := dctx.result; res.Reason {
 	case filtering.NotFilteredAllowList:
--- a/internal/dnsforward/process_internal_test.go
+++ b/internal/dnsforward/process_internal_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/AdguardTeam/golibs/testutil"
-	"github.com/AdguardTeam/urlfilter/rules"
 	"github.com/miekg/dns"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -23,95 +22,6 @@ const (
 	ddrTestFQDN       = ddrTestDomainName + "."
 )

-func TestServer_ProcessInitial(t *testing.T) {
-	t.Parallel()
-
-	testCases := []struct {
-		name         string
-		target       string
-		wantRCode    rules.RCode
-		qType        rules.RRType
-		aaaaDisabled bool
-		wantRC       resultCode
-	}{{
-		name:         "success",
-		target:       testQuestionTarget,
-		wantRCode:    -1,
-		qType:        dns.TypeA,
-		aaaaDisabled: false,
-		wantRC:       resultCodeSuccess,
-	}, {
-		name:         "aaaa_disabled",
-		target:       testQuestionTarget,
-		wantRCode:    dns.RcodeSuccess,
-		qType:        dns.TypeAAAA,
-		aaaaDisabled: true,
-		wantRC:       resultCodeFinish,
-	}, {
-		name:         "aaaa_disabled_a",
-		target:       testQuestionTarget,
-		wantRCode:    -1,
-		qType:        dns.TypeA,
-		aaaaDisabled: true,
-		wantRC:       resultCodeSuccess,
-	}, {
-		name:         "mozilla_canary",
-		target:       mozillaFQDN,
-		wantRCode:    dns.RcodeNameError,
-		qType:        dns.TypeA,
-		aaaaDisabled: false,
-		wantRC:       resultCodeFinish,
-	}, {
-		name:         "adguardhome_healthcheck",
-		target:       healthcheckFQDN,
-		wantRCode:    dns.RcodeSuccess,
-		qType:        dns.TypeA,
-		aaaaDisabled: false,
-		wantRC:       resultCodeFinish,
-	}}
-
-	for _, tc := range testCases {
-		tc := tc
-
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			clientIPs := make(chan netip.Addr, 1)
-
-			c := ServerConfig{
-				FilteringConfig: FilteringConfig{
-					AAAADisabled:     tc.aaaaDisabled,
-					EDNSClientSubnet: &EDNSClientSubnet{Enabled: false},
-				},
-				ClientIPs: clientIPs,
-			}
-
-			s := createTestServer(t, &filtering.Config{}, c, nil)
-
-			dctx := &dnsContext{
-				proxyCtx: &proxy.DNSContext{
-					Req:       createTestMessageWithType(tc.target, tc.qType),
-					Addr:      testClientAddr,
-					RequestID: 1234,
-				},
-			}
-
-			gotRC := s.processInitial(dctx)
-			assert.Equal(t, tc.wantRC, gotRC)
-
-			gotAddr, _ := testutil.RequireReceive(t, clientIPs, testTimeout)
-			assert.Equal(t, netutil.NetAddrToAddrPort(testClientAddr).Addr(), gotAddr)
-
-			if tc.wantRCode > 0 {
-				gotResp := dctx.proxyCtx.Res
-				require.NotNil(t, gotResp)
-
-				assert.Equal(t, tc.wantRCode, gotResp.Rcode)
-			}
-		})
-	}
-}
-
 func TestServer_ProcessDDRQuery(t *testing.T) {
 	dohSVCB := &dns.SVCB{
 		Priority: 1,
@@ -154,7 +64,7 @@ func TestServer_ProcessDDRQuery(t *testing.T) {
 	}{{
 		name:       "pass_host",
 		wantRes:    resultCodeSuccess,
-		host:       testQuestionTarget,
+		host:       "example.net.",
 		qtype:      dns.TypeSVCB,
 		ddrEnabled: true,
 		portDoH:    8043,
@@ -324,33 +234,33 @@ func TestServer_ProcessDetermineLocal(t *testing.T) {
 func TestServer_ProcessDHCPHosts_localRestriction(t *testing.T) {
 	knownIP := netip.MustParseAddr("1.2.3.4")
 	testCases := []struct {
-		wantIP     netip.Addr
 		name       string
 		host       string
+		wantIP     netip.Addr
 		wantRes    resultCode
 		isLocalCli bool
 	}{{
-		wantIP:     knownIP,
 		name:       "local_client_success",
 		host:       "example.lan",
+		wantIP:     knownIP,
 		wantRes:    resultCodeSuccess,
 		isLocalCli: true,
 	}, {
-		wantIP:     netip.Addr{},
 		name:       "local_client_unknown_host",
 		host:       "wronghost.lan",
+		wantIP:     netip.Addr{},
 		wantRes:    resultCodeSuccess,
 		isLocalCli: true,
 	}, {
-		wantIP:     netip.Addr{},
 		name:       "external_client_known_host",
 		host:       "example.lan",
+		wantIP:     netip.Addr{},
 		wantRes:    resultCodeFinish,
 		isLocalCli: false,
 	}, {
-		wantIP:     netip.Addr{},
 		name:       "external_client_unknown_host",
 		host:       "wronghost.lan",
+		wantIP:     netip.Addr{},
 		wantRes:    resultCodeFinish,
 		isLocalCli: false,
 	}}
@@ -422,52 +332,52 @@ func TestServer_ProcessDHCPHosts(t *testing.T) {

 	knownIP := netip.MustParseAddr("1.2.3.4")
 	testCases := []struct {
-		wantIP  netip.Addr
 		name    string
 		host    string
 		suffix  string
+		wantIP  netip.Addr
 		wantRes resultCode
 		qtyp    uint16
 	}{{
-		wantIP:  netip.Addr{},
 		name:    "success_external",
 		host:    examplecom,
 		suffix:  defaultLocalDomainSuffix,
+		wantIP:  netip.Addr{},
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeA,
 	}, {
-		wantIP:  netip.Addr{},
 		name:    "success_external_non_a",
 		host:    examplecom,
 		suffix:  defaultLocalDomainSuffix,
+		wantIP:  netip.Addr{},
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeCNAME,
 	}, {
-		wantIP:  knownIP,
 		name:    "success_internal",
 		host:    examplelan,
 		suffix:  defaultLocalDomainSuffix,
+		wantIP:  knownIP,
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeA,
 	}, {
-		wantIP:  netip.Addr{},
 		name:    "success_internal_unknown",
 		host:    "example-new.lan",
 		suffix:  defaultLocalDomainSuffix,
+		wantIP:  netip.Addr{},
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeA,
 	}, {
-		wantIP:  netip.Addr{},
 		name:    "success_internal_aaaa",
 		host:    examplelan,
 		suffix:  defaultLocalDomainSuffix,
+		wantIP:  netip.Addr{},
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeAAAA,
 	}, {
-		wantIP:  knownIP,
 		name:    "success_custom_suffix",
 		host:    "example.custom",
 		suffix:  "custom",
+		wantIP:  knownIP,
 		wantRes: resultCodeSuccess,
 		qtyp:    dns.TypeA,
 	}}
@@ -650,8 +560,10 @@ func TestServer_ProcessLocalPTR_usingResolvers(t *testing.T) {
 	var dnsCtx *dnsContext
 	setup := func(use bool) {
 		proxyCtx = &proxy.DNSContext{
-			Addr: testClientAddr,
-			Req:  createTestMessageWithType(reqAddr, dns.TypePTR),
+			Addr: &net.TCPAddr{
+				IP: net.IP{127, 0, 0, 1},
+			},
+			Req: createTestMessageWithType(reqAddr, dns.TypePTR),
 		}
 		dnsCtx = &dnsContext{
 			proxyCtx:        proxyCtx,
--- a/internal/dnsforward/dnsforward.go
+++ b/internal/dnsforward/dnsforward.go
@@ -17,7 +17,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/querylog"
-	"github.com/AdguardTeam/AdGuardHome/internal/rdns"
 	"github.com/AdguardTeam/AdGuardHome/internal/stats"
 	"github.com/AdguardTeam/dnsproxy/proxy"
 	"github.com/AdguardTeam/dnsproxy/upstream"
@@ -49,33 +48,12 @@ var webRegistered bool

 // hostToIPTable is a convenient type alias for tables of host names to an IP
 // address.
-//
-// TODO(e.burkov):  Use the [DHCP] interface instead.
 type hostToIPTable = map[string]netip.Addr

 // ipToHostTable is a convenient type alias for tables of IP addresses to their
 // host names.  For example, for use with PTR queries.
-//
-// TODO(e.burkov):  Use the [DHCP] interface instead.
 type ipToHostTable = map[netip.Addr]string

-// DHCP is an interface for accessing DHCP lease data needed in this package.
-type DHCP interface {
-	// HostByIP returns the hostname of the DHCP client with the given IP
-	// address.  The address will be netip.Addr{} if there is no such client,
-	// due to an assumption that a DHCP client must always have an IP address.
-	HostByIP(ip netip.Addr) (host string)
-
-	// IPByHost returns the IP address of the DHCP client with the given
-	// hostname.  The hostname will be an empty string if there is no such
-	// client, due to an assumption that a DHCP client must always have a
-	// hostname, either set by the client or assigned automatically.
-	IPByHost(host string) (ip netip.Addr)
-
-	// Enabled returns true if DHCP provides information about clients.
-	Enabled() (ok bool)
-}
-
 // Server is the main way to start a DNS server.
 //
 // Example:
@@ -99,10 +77,6 @@ type Server struct {
 	// must be a valid domain name plus dots on each side.
 	localDomainSuffix string

-	// ClientIPs, if not nil, is used to send clients' IP addresses to other
-	// parts of AdGuard Home that may use it for resolving rDNS, WHOIS, etc.
-	clientIPs chan<- netip.Addr
-
 	ipset          ipsetCtx
 	privateNets    netutil.SubnetSet
 	localResolvers *proxy.Proxy
@@ -241,7 +215,7 @@ func (s *Server) Close() {
 	s.dnsProxy = nil

 	if err := s.ipset.close(); err != nil {
-		log.Error("dnsforward: closing ipset: %s", err)
+		log.Error("closing ipset: %s", err)
 	}
 }

@@ -282,6 +256,17 @@ func (s *Server) Resolve(host string) ([]net.IPAddr, error) {
 	return s.internalProxy.LookupIPAddr(host)
 }

+// RDNSExchanger is a resolver for clients' addresses.
+type RDNSExchanger interface {
+	// Exchange tries to resolve the ip in a suitable way, i.e. either as local
+	// or as external.
+	Exchange(ip net.IP) (host string, err error)
+
+	// ResolvesPrivatePTR returns true if the RDNSExchanger is able to
+	// resolve PTR requests for locally-served addresses.
+	ResolvesPrivatePTR() (ok bool)
+}
+
 const (
 	// ErrRDNSNoData is returned by [RDNSExchanger.Exchange] when the answer
 	// section of response is either NODATA or has no PTR records.
@@ -293,10 +278,10 @@ const (
 )

 // type check
-var _ rdns.Exchanger = (*Server)(nil)
+var _ RDNSExchanger = (*Server)(nil)

-// Exchange implements the [rdns.Exchanger] interface for *Server.
-func (s *Server) Exchange(ip netip.Addr) (host string, err error) {
+// Exchange implements the RDNSExchanger interface for *Server.
+func (s *Server) Exchange(ip net.IP) (host string, err error) {
 	s.serverLock.RLock()
 	defer s.serverLock.RUnlock()

@@ -304,7 +289,7 @@ func (s *Server) Exchange(ip netip.Addr) (host string, err error) {
 		return "", nil
 	}

-	arpa, err := netutil.IPToReversedAddr(ip.AsSlice())
+	arpa, err := netutil.IPToReversedAddr(ip)
 	if err != nil {
 		return "", fmt.Errorf("reversing ip: %w", err)
 	}
@@ -322,15 +307,14 @@ func (s *Server) Exchange(ip netip.Addr) (host string, err error) {
 			Qclass: dns.ClassINET,
 		}},
 	}
-
-	dctx := &proxy.DNSContext{
+	ctx := &proxy.DNSContext{
 		Proto:     "udp",
 		Req:       req,
 		StartTime: time.Now(),
 	}

 	var resolver *proxy.Proxy
-	if s.isPrivateIP(ip) {
+	if s.privateNets.Contains(ip) {
 		if !s.conf.UsePrivateRDNS {
 			return "", nil
 		}
@@ -341,16 +325,12 @@ func (s *Server) Exchange(ip netip.Addr) (host string, err error) {
 		resolver = s.internalProxy
 	}

-	if err = resolver.Resolve(dctx); err != nil {
+	if err = resolver.Resolve(ctx); err != nil {
 		return "", err
 	}

-	return hostFromPTR(dctx.Res)
-}
-
-// hostFromPTR returns domain name from the PTR response or error.
-func hostFromPTR(resp *dns.Msg) (host string, err error) {
 	// Distinguish between NODATA response and a failed request.
+	resp := ctx.Res
 	if resp.Rcode != dns.RcodeSuccess && resp.Rcode != dns.RcodeNameError {
 		return "", fmt.Errorf(
 			"received %s response: %w",
@@ -369,25 +349,12 @@ func hostFromPTR(resp *dns.Msg) (host string, err error) {
 	return "", ErrRDNSNoData
 }

-// isPrivateIP returns true if the ip is private.
-func (s *Server) isPrivateIP(ip netip.Addr) (ok bool) {
-	return s.privateNets.Contains(ip.AsSlice())
-}
-
-// ShouldResolveClient returns false if ip is a loopback address, or ip is
-// private and resolving of private addresses is disabled.
-func (s *Server) ShouldResolveClient(ip netip.Addr) (ok bool) {
-	if ip.IsLoopback() {
-		return false
-	}
-
-	isPrivate := s.isPrivateIP(ip)
-
+// ResolvesPrivatePTR implements the RDNSExchanger interface for *Server.
+func (s *Server) ResolvesPrivatePTR() (ok bool) {
 	s.serverLock.RLock()
 	defer s.serverLock.RUnlock()

-	return s.conf.ResolveClients &&
-		(s.conf.UsePrivateRDNS || !isPrivate)
+	return s.conf.UsePrivateRDNS
 }

 // Start starts the DNS server.
@@ -476,17 +443,21 @@ func (s *Server) setupResolvers(localAddrs []string) (err error) {
 		return err
 	}

-	log.Debug("dnsforward: upstreams to resolve ptr for local addresses: %v", localAddrs)
+	log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)

-	upsConfig, err := s.prepareUpstreamConfig(localAddrs, nil, &upstream.Options{
-		Bootstrap: bootstraps,
-		Timeout:   defaultLocalTimeout,
-		// TODO(e.burkov): Should we verify server's certificates?
+	var upsConfig *proxy.UpstreamConfig
+	upsConfig, err = proxy.ParseUpstreamsConfig(
+		localAddrs,
+		&upstream.Options{
+			Bootstrap: bootstraps,
+			Timeout:   defaultLocalTimeout,
+			// TODO(e.burkov): Should we verify server's certificates?

-		PreferIPv6: s.conf.BootstrapPreferIPv6,
-	})
+			PreferIPv6: s.conf.BootstrapPreferIPv6,
+		},
+	)
 	if err != nil {
-		return fmt.Errorf("parsing private upstreams: %w", err)
+		return fmt.Errorf("parsing upstreams: %w", err)
 	}

 	s.localResolvers = &proxy.Proxy{
@@ -518,8 +489,7 @@ func (s *Server) Prepare(conf *ServerConfig) (err error) {

 	err = s.prepareUpstreamSettings()
 	if err != nil {
-		// Don't wrap the error, because it's informative enough as is.
-		return err
+		return fmt.Errorf("preparing upstream settings: %w", err)
 	}

 	var proxyConfig proxy.Config
@@ -560,8 +530,6 @@ func (s *Server) Prepare(conf *ServerConfig) (err error) {

 	s.recDetector.clear()

-	s.clientIPs = s.conf.ClientIPs
-
 	return nil
 }

@@ -688,9 +656,7 @@ func (s *Server) Reconfigure(conf *ServerConfig) error {
 	s.serverLock.Lock()
 	defer s.serverLock.Unlock()

-	log.Info("dnsforward: starting reconfiguring server")
-	defer log.Info("dnsforward: finished reconfiguring server")
-
+	log.Print("Start reconfiguring the server")
 	err := s.stopLocked()
 	if err != nil {
 		return fmt.Errorf("could not reconfigure the server: %w", err)
@@ -703,9 +669,6 @@ func (s *Server) Reconfigure(conf *ServerConfig) error {
 	// TODO(a.garipov): This whole piece of API is weird and needs to be remade.
 	if conf == nil {
 		conf = &s.conf
-	} else if s.clientIPs != nil {
-		close(s.clientIPs)
-		s.clientIPs = nil
 	}

 	err = s.Prepare(conf)
@@ -745,13 +708,13 @@ func (s *Server) IsBlockedClient(ip netip.Addr, clientID string) (blocked bool,
 	// Allow if at least one of the checks allows in allowlist mode, but block
 	// if at least one of the checks blocks in blocklist mode.
 	if allowlistMode && blockedByIP && blockedByClientID {
-		log.Debug("dnsforward: client %v (id %q) is not in access allowlist", ip, clientID)
+		log.Debug("client %v (id %q) is not in access allowlist", ip, clientID)

 		// Return now without substituting the empty rule for the
 		// clientID because the rule can't be empty here.
 		return true, rule
 	} else if !allowlistMode && (blockedByIP || blockedByClientID) {
-		log.Debug("dnsforward: client %v (id %q) is in access blocklist", ip, clientID)
+		log.Debug("client %v (id %q) is in access blocklist", ip, clientID)

 		blocked = true
 	}
--- a/internal/dnsforward/dnsforward_test.go
+++ b/internal/dnsforward/dnsforward_test.go
@@ -39,29 +39,11 @@ func TestMain(m *testing.M) {
 	testutil.DiscardLogOutput(m)
 }

-// testTimeout is the common timeout for tests.
-//
-// TODO(a.garipov): Use more.
-const testTimeout = 1 * time.Second
-
-// testQuestionTarget is the common question target for tests.
-//
-// TODO(a.garipov): Use more.
-const testQuestionTarget = "target.example"
-
 const (
 	tlsServerName     = "testdns.adguard.com"
 	testMessagesCount = 10
 )

-// testClientAddr is the common net.Addr for tests.
-//
-// TODO(a.garipov): Use more.
-var testClientAddr net.Addr = &net.TCPAddr{
-	IP:   net.IP{1, 2, 3, 4},
-	Port: 12345,
-}
-
 func startDeferStop(t *testing.T, s *Server) {
 	t.Helper()

@@ -71,13 +53,6 @@ func startDeferStop(t *testing.T, s *Server) {
 	testutil.CleanupAndRequireSuccess(t, s.Stop)
 }

-// packageUpstreamVariableMu is used to serialize access to the package-level
-// variables of package upstream.
-//
-// TODO(s.chzhen): Move these parameters to upstream options and remove this
-// crutch.
-var packageUpstreamVariableMu = &sync.Mutex{}
-
 func createTestServer(
 	t *testing.T,
 	filterConf *filtering.Config,
@@ -86,9 +61,6 @@ func createTestServer(
 ) (s *Server) {
 	t.Helper()

-	packageUpstreamVariableMu.Lock()
-	defer packageUpstreamVariableMu.Unlock()
-
 	rules := `||nxdomain.example.org
 ||NULL.example.org^
 127.0.0.1	host.example.org
@@ -335,9 +307,11 @@ func TestServer(t *testing.T) {
 }

 func TestServer_timeout(t *testing.T) {
+	const timeout time.Duration = time.Second
+
 	t.Run("custom", func(t *testing.T) {
 		srvConf := &ServerConfig{
-			UpstreamTimeout: testTimeout,
+			UpstreamTimeout: timeout,
 			FilteringConfig: FilteringConfig{
 				BlockingMode:     BlockingModeDefault,
 				EDNSClientSubnet: &EDNSClientSubnet{Enabled: false},
@@ -350,7 +324,7 @@ func TestServer_timeout(t *testing.T) {
 		err = s.Prepare(srvConf)
 		require.NoError(t, err)

-		assert.Equal(t, testTimeout, s.conf.UpstreamTimeout)
+		assert.Equal(t, timeout, s.conf.UpstreamTimeout)
 	})

 	t.Run("default", func(t *testing.T) {
@@ -571,7 +545,7 @@ func TestInvalidRequest(t *testing.T) {

 	// Send a DNS request without question.
 	_, _, err := (&dns.Client{
-		Timeout: testTimeout,
+		Timeout: 500 * time.Millisecond,
 	}).Exchange(&req, addr)

 	assert.NoErrorf(t, err, "got a response to an invalid query")
@@ -1299,11 +1273,11 @@ func TestServer_Exchange(t *testing.T) {
 	)

 	var (
-		onesIP  = netip.MustParseAddr("1.1.1.1")
-		localIP = netip.MustParseAddr("192.168.1.1")
+		onesIP  = net.IP{1, 1, 1, 1}
+		localIP = net.IP{192, 168, 1, 1}
 	)

-	revExtIPv4, err := netutil.IPToReversedAddr(onesIP.AsSlice())
+	revExtIPv4, err := netutil.IPToReversedAddr(onesIP)
 	require.NoError(t, err)

 	extUpstream := &aghtest.UpstreamMock{
@@ -1316,7 +1290,7 @@ func TestServer_Exchange(t *testing.T) {
 		},
 	}

-	revLocIPv4, err := netutil.IPToReversedAddr(localIP.AsSlice())
+	revLocIPv4, err := netutil.IPToReversedAddr(localIP)
 	require.NoError(t, err)

 	locUpstream := &aghtest.UpstreamMock{
@@ -1356,7 +1330,7 @@ func TestServer_Exchange(t *testing.T) {
 		want        string
 		wantErr     error
 		locUpstream upstream.Upstream
-		req         netip.Addr
+		req         net.IP
 	}{{
 		name:        "external_good",
 		want:        onesHost,
@@ -1380,7 +1354,7 @@ func TestServer_Exchange(t *testing.T) {
 		want:        "",
 		wantErr:     ErrRDNSNoData,
 		locUpstream: locUpstream,
-		req:         netip.MustParseAddr("192.168.1.2"),
+		req:         net.IP{192, 168, 1, 2},
 	}, {
 		name:        "invalid_answer",
 		want:        "",
@@ -1422,57 +1396,3 @@ func TestServer_Exchange(t *testing.T) {
 		assert.Empty(t, host)
 	})
 }
-
-func TestServer_ShouldResolveClient(t *testing.T) {
-	srv := &Server{
-		privateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed),
-	}
-
-	testCases := []struct {
-		ip         netip.Addr
-		want       require.BoolAssertionFunc
-		name       string
-		resolve    bool
-		usePrivate bool
-	}{{
-		name:       "default",
-		ip:         netip.MustParseAddr("1.1.1.1"),
-		want:       require.True,
-		resolve:    true,
-		usePrivate: true,
-	}, {
-		name:       "no_rdns",
-		ip:         netip.MustParseAddr("1.1.1.1"),
-		want:       require.False,
-		resolve:    false,
-		usePrivate: true,
-	}, {
-		name:       "loopback",
-		ip:         netip.MustParseAddr("127.0.0.1"),
-		want:       require.False,
-		resolve:    true,
-		usePrivate: true,
-	}, {
-		name:       "private_resolve",
-		ip:         netip.MustParseAddr("192.168.0.1"),
-		want:       require.True,
-		resolve:    true,
-		usePrivate: true,
-	}, {
-		name:       "private_no_resolve",
-		ip:         netip.MustParseAddr("192.168.0.1"),
-		want:       require.False,
-		resolve:    true,
-		usePrivate: false,
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			srv.conf.ResolveClients = tc.resolve
-			srv.conf.UsePrivateRDNS = tc.usePrivate
-
-			ok := srv.ShouldResolveClient(tc.ip)
-			tc.want(t, ok)
-		})
-	}
-}
--- a/internal/dnsforward/filter.go
+++ b/internal/dnsforward/filter.go
@@ -50,10 +50,10 @@ func (s *Server) beforeRequestHandler(
 	return true, nil
 }

-// clientRequestFilteringSettings looks up client filtering settings using the
-// client's IP address and ID, if any, from dctx.
-func (s *Server) clientRequestFilteringSettings(dctx *dnsContext) (setts *filtering.Settings) {
-	setts = s.dnsFilter.Settings()
+// getClientRequestFilteringSettings looks up client filtering settings using
+// the client's IP address and ID, if any, from dctx.
+func (s *Server) getClientRequestFilteringSettings(dctx *dnsContext) *filtering.Settings {
+	setts := s.dnsFilter.Settings()
 	setts.ProtectionEnabled = dctx.protectionEnabled
 	if s.conf.FilterHandler != nil {
 		ip, _ := netutil.IPAndPortFromAddr(dctx.proxyCtx.Addr)
--- a/internal/dnsforward/filter_test.go
+++ b/internal/dnsforward/filter_test.go
@@ -21,8 +21,6 @@ func TestHandleDNSRequest_filterDNSResponse(t *testing.T) {
 ||cname.specific^$dnstype=~CNAME
 ||0.0.0.1^$dnstype=~A
 ||::1^$dnstype=~AAAA
-0.0.0.0 duplicate.domain
-0.0.0.0 duplicate.domain
 `

 	forwardConf := ServerConfig{
@@ -139,17 +137,6 @@ func TestHandleDNSRequest_filterDNSResponse(t *testing.T) {
 			},
 			A: netutil.IPv4Zero(),
 		}},
-	}, {
-		req:  createTestMessage("duplicate.domain."),
-		name: "duplicate_domain",
-		wantAns: []dns.RR{&dns.A{
-			Hdr: dns.RR_Header{
-				Name:   "duplicate.domain.",
-				Rrtype: dns.TypeA,
-				Class:  dns.ClassINET,
-			},
-			A: netutil.IPv4Zero(),
-		}},
 	}}

 	for _, tc := range testCases {
--- a/internal/dnsforward/http.go
+++ b/internal/dnsforward/http.go
@@ -633,70 +633,61 @@ func (err domainSpecificTestError) Error() (msg string) {
 	return fmt.Sprintf("WARNING: %s", err.error)
 }

-// parseUpstreamLine parses line and creates the [upstream.Upstream] using opts
-// and information from [s.dnsFilter.EtcHosts].  It returns an error if the line
-// is not a valid upstream line, see [upstream.AddressToUpstream].  It's a
-// caller's responsibility to close u.
-func (s *Server) parseUpstreamLine(
-	line string,
-	opts *upstream.Options,
-) (u upstream.Upstream, specific bool, err error) {
-	// Separate upstream from domains list.
-	upstreamAddr, domains, err := separateUpstream(line)
-	if err != nil {
-		return nil, false, fmt.Errorf("wrong upstream format: %w", err)
+// checkDNS checks the upstream server defined by upstreamConfigStr using
+// healthCheck for actually exchange messages.  It uses bootstrap to resolve the
+// upstream's address.
+func checkDNS(
+	upstreamConfigStr string,
+	bootstrap []string,
+	bootstrapPrefIPv6 bool,
+	timeout time.Duration,
+	healthCheck healthCheckFunc,
+) (err error) {
+	if IsCommentOrEmpty(upstreamConfigStr) {
+		return nil
 	}

-	specific = len(domains) > 0
+	// Separate upstream from domains list.
+	upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
+	if err != nil {
+		return fmt.Errorf("wrong upstream format: %w", err)
+	}

 	useDefault, err := validateUpstream(upstreamAddr, domains)
 	if err != nil {
-		return nil, specific, fmt.Errorf("wrong upstream format: %w", err)
+		return fmt.Errorf("wrong upstream format: %w", err)
 	} else if useDefault {
-		return nil, specific, nil
+		return nil
+	}
+
+	if len(bootstrap) == 0 {
+		bootstrap = defaultBootstrap
 	}

 	log.Debug("dnsforward: checking if upstream %q works", upstreamAddr)

-	opts = &upstream.Options{
-		Bootstrap:  opts.Bootstrap,
-		Timeout:    opts.Timeout,
-		PreferIPv6: opts.PreferIPv6,
-	}
-
-	if s.dnsFilter != nil && s.dnsFilter.EtcHosts != nil {
-		resolved := s.resolveUpstreamHost(extractUpstreamHost(upstreamAddr))
-		sortNetIPAddrs(resolved, opts.PreferIPv6)
-		opts.ServerIPAddrs = resolved
-	}
-	u, err = upstream.AddressToUpstream(upstreamAddr, opts)
+	u, err := upstream.AddressToUpstream(upstreamAddr, &upstream.Options{
+		Bootstrap:  bootstrap,
+		Timeout:    timeout,
+		PreferIPv6: bootstrapPrefIPv6,
+	})
 	if err != nil {
-		return nil, specific, fmt.Errorf("creating upstream for %q: %w", upstreamAddr, err)
-	}
-
-	return u, specific, nil
-}
-
-func (s *Server) checkDNS(line string, opts *upstream.Options, check healthCheckFunc) (err error) {
-	if IsCommentOrEmpty(line) {
-		return nil
-	}
-
-	var u upstream.Upstream
-	var specific bool
-	defer func() {
-		if err != nil && specific {
-			err = domainSpecificTestError{error: err}
-		}
-	}()
-
-	u, specific, err = s.parseUpstreamLine(line, opts)
-	if err != nil || u == nil {
-		return err
+		return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err)
 	}
 	defer func() { err = errors.WithDeferred(err, u.Close()) }()

-	return check(u)
+	if err = healthCheck(u); err != nil {
+		err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
+		if domains != nil {
+			return domainSpecificTestError{error: err}
+		}
+
+		return err
+	}
+
+	log.Debug("dnsforward: upstream %q is ok", upstreamAddr)
+
+	return nil
 }

 func (s *Server) handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
@@ -708,54 +699,47 @@ func (s *Server) handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	opts := &upstream.Options{
-		Bootstrap:  req.BootstrapDNS,
-		Timeout:    s.conf.UpstreamTimeout,
-		PreferIPv6: s.conf.BootstrapPreferIPv6,
-	}
-	if len(opts.Bootstrap) == 0 {
-		opts.Bootstrap = defaultBootstrap
-	}
+	result := map[string]string{}
+	bootstraps := req.BootstrapDNS
+	bootstrapPrefIPv6 := s.conf.BootstrapPreferIPv6
+	timeout := s.conf.UpstreamTimeout

 	type upsCheckResult = struct {
-		err  error
+		res  string
 		host string
 	}

-	req.Upstreams = stringutil.FilterOut(req.Upstreams, IsCommentOrEmpty)
-	req.PrivateUpstreams = stringutil.FilterOut(req.PrivateUpstreams, IsCommentOrEmpty)
-
 	upsNum := len(req.Upstreams) + len(req.PrivateUpstreams)
-	result := make(map[string]string, upsNum)
 	resCh := make(chan upsCheckResult, upsNum)

+	checkUps := func(ups string, healthCheck healthCheckFunc) {
+		res := upsCheckResult{
+			host: ups,
+		}
+		defer func() { resCh <- res }()
+
+		checkErr := checkDNS(ups, bootstraps, bootstrapPrefIPv6, timeout, healthCheck)
+		if checkErr != nil {
+			res.res = checkErr.Error()
+		} else {
+			res.res = "OK"
+		}
+	}
+
 	for _, ups := range req.Upstreams {
-		go func(ups string) {
-			resCh <- upsCheckResult{
-				host: ups,
-				err:  s.checkDNS(ups, opts, checkDNSUpstreamExc),
-			}
-		}(ups)
+		go checkUps(ups, checkDNSUpstreamExc)
 	}
 	for _, ups := range req.PrivateUpstreams {
-		go func(ups string) {
-			resCh <- upsCheckResult{
-				host: ups,
-				err:  s.checkDNS(ups, opts, checkPrivateUpstreamExc),
-			}
-		}(ups)
+		go checkUps(ups, checkPrivateUpstreamExc)
 	}

 	for i := 0; i < upsNum; i++ {
+		pair := <-resCh
 		// TODO(e.burkov):  The upstreams used for both common and private
 		// resolving should be reported separately.
-		pair := <-resCh
-		if pair.err != nil {
-			result[pair.host] = pair.err.Error()
-		} else {
-			result[pair.host] = "OK"
-		}
+		result[pair.host] = pair.res
 	}
+	close(resCh)

 	_ = aghhttp.WriteJSONResponse(w, r, result)
 }
--- a/internal/dnsforward/http_test.go
+++ b/internal/dnsforward/http_test.go
@@ -13,12 +13,10 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"testing/fstest"
 	"time"

 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
-	"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/golibs/httphdr"
 	"github.com/AdguardTeam/golibs/netutil"
@@ -282,10 +280,6 @@ func TestIsCommentOrEmpty(t *testing.T) {
 }

 func TestValidateUpstreams(t *testing.T) {
-	const sdnsStamp = `sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_J` +
-		`S3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczE` +
-		`uYWRndWFyZC5jb20`
-
 	testCases := []struct {
 		name    string
 		wantErr string
@@ -306,7 +300,7 @@ func TestValidateUpstreams(t *testing.T) {
 			"[//]tls://1.1.1.1",
 			"[/www.host.com/]#",
 			"[/host.com/google.com/]8.8.8.8",
-			"[/host/]" + sdnsStamp,
+			"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
 		},
 	}, {
 		name:    "with_default",
@@ -316,7 +310,7 @@ func TestValidateUpstreams(t *testing.T) {
 			"[//]tls://1.1.1.1",
 			"[/www.host.com/]#",
 			"[/host.com/google.com/]8.8.8.8",
-			"[/host/]" + sdnsStamp,
+			"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
 			"8.8.8.8",
 		},
 	}, {
@@ -332,10 +326,9 @@ func TestValidateUpstreams(t *testing.T) {
 		wantErr: `validating upstream "123.3.7m": not an ip:port`,
 		set:     []string{"123.3.7m"},
 	}, {
-		name: "invalid",
-		wantErr: `bad upstream for domain "[/host.com]tls://dns.adguard.com": ` +
-			`missing separator`,
-		set: []string{"[/host.com]tls://dns.adguard.com"},
+		name:    "invalid",
+		wantErr: `bad upstream for domain "[/host.com]tls://dns.adguard.com": missing separator`,
+		set:     []string{"[/host.com]tls://dns.adguard.com"},
 	}, {
 		name:    "invalid",
 		wantErr: `validating upstream "[host.ru]#": not an ip:port`,
@@ -347,14 +340,14 @@ func TestValidateUpstreams(t *testing.T) {
 			"1.1.1.1",
 			"tls://1.1.1.1",
 			"https://dns.adguard.com/dns-query",
-			sdnsStamp,
+			"sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
 			"udp://dns.google",
 			"udp://8.8.8.8",
 			"[/host.com/]1.1.1.1",
 			"[//]tls://1.1.1.1",
 			"[/www.host.com/]#",
 			"[/host.com/google.com/]8.8.8.8",
-			"[/host/]" + sdnsStamp,
+			"[/host/]sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
 			"[/пример.рф/]8.8.8.8",
 		},
 	}, {
@@ -425,28 +418,27 @@ func TestValidateUpstreamsPrivate(t *testing.T) {
 	}
 }

-func newLocalUpstreamListener(t *testing.T, port uint16, handler dns.Handler) (real netip.AddrPort) {
-	t.Helper()
-
+func newLocalUpstreamListener(t *testing.T, port int, handler dns.Handler) (real net.Addr) {
 	startCh := make(chan struct{})
 	upsSrv := &dns.Server{
-		Addr:              netip.AddrPortFrom(netutil.IPv4Localhost(), port).String(),
+		Addr:              netip.AddrPortFrom(netutil.IPv4Localhost(), uint16(port)).String(),
 		Net:               "tcp",
 		Handler:           handler,
 		NotifyStartedFunc: func() { close(startCh) },
 	}
 	go func() {
-		err := upsSrv.ListenAndServe()
-		require.NoError(testutil.PanicT{}, err)
-	}()
+		t := testutil.PanicT{}

+		err := upsSrv.ListenAndServe()
+		require.NoError(t, err)
+	}()
 	<-startCh
 	testutil.CleanupAndRequireSuccess(t, upsSrv.Shutdown)

-	return testutil.RequireTypeAssert[*net.TCPAddr](t, upsSrv.Listener.Addr()).AddrPort()
+	return upsSrv.Listener.Addr()
 }

-func TestServer_HandleTestUpstreamDNS(t *testing.T) {
+func TestServer_handleTestUpstreaDNS(t *testing.T) {
 	goodHandler := dns.HandlerFunc(func(w dns.ResponseWriter, m *dns.Msg) {
 		err := w.WriteMsg(new(dns.Msg).SetReply(m))
 		require.NoError(testutil.PanicT{}, err)
@@ -465,38 +457,9 @@ func TestServer_HandleTestUpstreamDNS(t *testing.T) {
 		Host:   newLocalUpstreamListener(t, 0, badHandler).String(),
 	}).String()

-	const (
-		upsTimeout = 100 * time.Millisecond
+	const upsTimeout = 100 * time.Millisecond

-		hostsFileName = "hosts"
-		upstreamHost  = "custom.localhost"
-	)
-
-	hostsListener := newLocalUpstreamListener(t, 0, goodHandler)
-	hostsUps := (&url.URL{
-		Scheme: "tcp",
-		Host:   netutil.JoinHostPort(upstreamHost, int(hostsListener.Port())),
-	}).String()
-
-	hc, err := aghnet.NewHostsContainer(
-		filtering.SysHostsListID,
-		fstest.MapFS{
-			hostsFileName: &fstest.MapFile{
-				Data: []byte(hostsListener.Addr().String() + " " + upstreamHost),
-			},
-		},
-		&aghtest.FSWatcher{
-			OnEvents: func() (e <-chan struct{}) { return nil },
-			OnAdd:    func(_ string) (err error) { return nil },
-			OnClose:  func() (err error) { return nil },
-		},
-		hostsFileName,
-	)
-	require.NoError(t, err)
-
-	srv := createTestServer(t, &filtering.Config{
-		EtcHosts: hc,
-	}, ServerConfig{
+	srv := createTestServer(t, &filtering.Config{}, ServerConfig{
 		UDPListenAddrs:  []*net.UDPAddr{{}},
 		TCPListenAddrs:  []*net.TCPAddr{{}},
 		UpstreamTimeout: upsTimeout,
@@ -523,7 +486,8 @@ func TestServer_HandleTestUpstreamDNS(t *testing.T) {
 			"upstream_dns": []string{badUps},
 		},
 		wantResp: map[string]any{
-			badUps: `couldn't communicate with upstream: exchanging with ` +
+			badUps: `upstream "` + badUps + `" fails to exchange: ` +
+				`couldn't communicate with upstream: exchanging with ` +
 				badUps + ` over tcp: dns: id mismatch`,
 		},
 		name: "broken",
@@ -533,40 +497,20 @@ func TestServer_HandleTestUpstreamDNS(t *testing.T) {
 		},
 		wantResp: map[string]any{
 			goodUps: "OK",
-			badUps: `couldn't communicate with upstream: exchanging with ` +
+			badUps: `upstream "` + badUps + `" fails to exchange: ` +
+				`couldn't communicate with upstream: exchanging with ` +
 				badUps + ` over tcp: dns: id mismatch`,
 		},
 		name: "both",
-	}, {
-		body: map[string]any{
-			"upstream_dns": []string{"[/domain.example/]" + badUps},
-		},
-		wantResp: map[string]any{
-			"[/domain.example/]" + badUps: `WARNING: couldn't communicate ` +
-				`with upstream: exchanging with ` + badUps + ` over tcp: ` +
-				`dns: id mismatch`,
-		},
-		name: "domain_specific_error",
-	}, {
-		body: map[string]any{
-			"upstream_dns": []string{hostsUps},
-		},
-		wantResp: map[string]any{
-			hostsUps: "OK",
-		},
-		name: "etc_hosts",
 	}}

 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			var reqBody []byte
-			reqBody, err = json.Marshal(tc.body)
+			reqBody, err := json.Marshal(tc.body)
 			require.NoError(t, err)

 			w := httptest.NewRecorder()
-
-			var r *http.Request
-			r, err = http.NewRequest(http.MethodPost, "", bytes.NewReader(reqBody))
+			r, err := http.NewRequest(http.MethodPost, "", bytes.NewReader(reqBody))
 			require.NoError(t, err)

 			srv.handleTestUpstreamDNS(w, r)
@@ -594,15 +538,11 @@ func TestServer_HandleTestUpstreamDNS(t *testing.T) {
 		req := map[string]any{
 			"upstream_dns": []string{sleepyUps},
 		}
-
-		var reqBody []byte
-		reqBody, err = json.Marshal(req)
+		reqBody, err := json.Marshal(req)
 		require.NoError(t, err)

 		w := httptest.NewRecorder()
-
-		var r *http.Request
-		r, err = http.NewRequest(http.MethodPost, "", bytes.NewReader(reqBody))
+		r, err := http.NewRequest(http.MethodPost, "", bytes.NewReader(reqBody))
 		require.NoError(t, err)

 		srv.handleTestUpstreamDNS(w, r)
--- a/internal/dnsforward/ipset.go
+++ b/internal/dnsforward/ipset.go
@@ -110,9 +110,6 @@ func ipsFromAnswer(ans []dns.RR) (ip4s, ip6s []net.IP) {

 // process adds the resolved IP addresses to the domain's ipsets, if any.
 func (c *ipsetCtx) process(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: ipset: started processing")
-	defer log.Debug("dnsforward: ipset: finished processing")
-
 	if c.skipIpsetProcessing(dctx) {
 		return resultCodeSuccess
 	}
@@ -128,12 +125,12 @@ func (c *ipsetCtx) process(dctx *dnsContext) (rc resultCode) {
 	n, err := c.ipsetMgr.Add(host, ip4s, ip6s)
 	if err != nil {
 		// Consider ipset errors non-critical to the request.
-		log.Error("dnsforward: ipset: adding host ips: %s", err)
+		log.Error("ipset: adding host ips: %s", err)

 		return resultCodeSuccess
 	}

-	log.Debug("dnsforward: ipset: added %d new ipset entries", n)
+	log.Debug("ipset: added %d new ipset entries", n)

 	return resultCodeSuccess
 }
--- a/internal/dnsforward/msg.go
+++ b/internal/dnsforward/msg.go
@@ -26,25 +26,11 @@ func (s *Server) makeResponse(req *dns.Msg) (resp *dns.Msg) {
 	return resp
 }

-// containsIP returns true if the IP is already in the list.
-func containsIP(ips []net.IP, ip net.IP) bool {
-	for _, a := range ips {
-		if a.Equal(ip) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// ipsFromRules extracts unique non-IP addresses from the filtering result
-// rules.
+// ipsFromRules extracts non-IP addresses from the filtering result rules.
 func ipsFromRules(resRules []*filtering.ResultRule) (ips []net.IP) {
 	for _, r := range resRules {
-		// len(resRules) and len(ips) are actually small enough for O(n^2) to do
-		// not raise performance questions.
-		if ip := r.IP; ip != nil && !containsIP(ips, ip) {
-			ips = append(ips, ip)
+		if r.IP != nil {
+			ips = append(ips, r.IP)
 		}
 	}

--- a/internal/dnsforward/stats.go
+++ b/internal/dnsforward/stats.go
@@ -2,9 +2,9 @@ package dnsforward

 import (
 	"net"
+	"strings"
 	"time"

-	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/querylog"
 	"github.com/AdguardTeam/AdGuardHome/internal/stats"
@@ -17,78 +17,60 @@ import (

 // Write Stats data and logs
 func (s *Server) processQueryLogsAndStats(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing querylog and stats")
-	defer log.Debug("dnsforward: finished processing querylog and stats")
-
 	elapsed := time.Since(dctx.startTime)
 	pctx := dctx.proxyCtx

-	q := pctx.Req.Question[0]
-	host := aghnet.NormalizeDomain(q.Name)
+	shouldLog := true
+	msg := pctx.Req
+	q := msg.Question[0]
+	host := strings.ToLower(strings.TrimSuffix(q.Name, "."))
+
+	// don't log ANY request if refuseAny is enabled
+	if q.Qtype == dns.TypeANY && s.conf.RefuseAny {
+		shouldLog = false
+	}

 	ip, _ := netutil.IPAndPortFromAddr(pctx.Addr)
 	ip = slices.Clone(ip)
+
+	s.serverLock.RLock()
+	defer s.serverLock.RUnlock()
+
 	s.anonymizer.Load()(ip)

-	log.Debug("dnsforward: client ip for stats and querylog: %s", ip)
+	log.Debug("client ip: %s", ip)

 	ipStr := ip.String()
 	ids := []string{ipStr, dctx.clientID}
-	qt, cl := q.Qtype, q.Qclass

 	// Synchronize access to s.queryLog and s.stats so they won't be suddenly
 	// uninitialized while in use.  This can happen after proxy server has been
 	// stopped, but its workers haven't yet exited.
-	s.serverLock.RLock()
-	defer s.serverLock.RUnlock()
-
-	if s.shouldLog(host, qt, cl, ids) {
+	if shouldLog &&
+		s.queryLog != nil &&
+		// TODO(s.chzhen):  Use dnsforward.dnsContext when it will start
+		// containing persistent client.
+		s.queryLog.ShouldLog(host, q.Qtype, q.Qclass, ids) {
 		s.logQuery(dctx, pctx, elapsed, ip)
 	} else {
 		log.Debug(
-			"dnsforward: request %s %s %q from %s ignored; not adding to querylog",
-			dns.Class(cl),
-			dns.Type(qt),
+			"dnsforward: request %s %s from %s ignored; not logging",
+			dns.Type(q.Qtype),
 			host,
 			ip,
 		)
 	}

-	if s.shouldCountStat(host, qt, cl, ids) {
+	if s.stats != nil &&
+		// TODO(s.chzhen):  Use dnsforward.dnsContext when it will start
+		// containing persistent client.
+		s.stats.ShouldCount(host, q.Qtype, q.Qclass, ids) {
 		s.updateStats(dctx, elapsed, *dctx.result, ipStr)
-	} else {
-		log.Debug(
-			"dnsforward: request %s %s %q from %s ignored; not counting in stats",
-			dns.Class(cl),
-			dns.Type(qt),
-			host,
-			ip,
-		)
 	}

 	return resultCodeSuccess
 }

-// shouldLog returns true if the query with the given data should be logged in
-// the query log.  s.serverLock is expected to be locked.
-func (s *Server) shouldLog(host string, qt, cl uint16, ids []string) (ok bool) {
-	if qt == dns.TypeANY && s.conf.RefuseAny {
-		return false
-	}
-
-	// TODO(s.chzhen):  Use dnsforward.dnsContext when it will start containing
-	// persistent client.
-	return s.queryLog != nil && s.queryLog.ShouldLog(host, qt, cl, ids)
-}
-
-// shouldCountStat returns true if the query with the given data should be
-// counted in the statistics.  s.serverLock is expected to be locked.
-func (s *Server) shouldCountStat(host string, qt, cl uint16, ids []string) (ok bool) {
-	// TODO(s.chzhen):  Use dnsforward.dnsContext when it will start containing
-	// persistent client.
-	return s.stats != nil && s.stats.ShouldCount(host, qt, cl, ids)
-}
-
 // logQuery pushes the request details into the query log.
 func (s *Server) logQuery(
 	dctx *dnsContext,
@@ -139,10 +121,11 @@ func (s *Server) updateStats(
 	clientIP string,
 ) {
 	pctx := ctx.proxyCtx
-	e := stats.Entry{
-		Domain: aghnet.NormalizeDomain(pctx.Req.Question[0].Name),
-		Result: stats.RNotFiltered,
-		Time:   uint32(elapsed / 1000),
+	e := stats.Entry{}
+	e.Domain = strings.ToLower(pctx.Req.Question[0].Name)
+	if e.Domain != "." {
+		// Remove last ".", but save the domain as is for "." queries.
+		e.Domain = e.Domain[:len(e.Domain)-1]
 	}

 	if clientID := ctx.clientID; clientID != "" {
@@ -151,6 +134,9 @@ func (s *Server) updateStats(
 		e.Client = clientIP
 	}

+	e.Time = uint32(elapsed / 1000)
+	e.Result = stats.RNotFiltered
+
 	switch res.Reason {
 	case filtering.FilteredSafeBrowsing:
 		e.Result = stats.RSafeBrowsing
@@ -158,8 +144,7 @@ func (s *Server) updateStats(
 		e.Result = stats.RParental
 	case filtering.FilteredSafeSearch:
 		e.Result = stats.RSafeSearch
-	case
-		filtering.FilteredBlockList,
+	case filtering.FilteredBlockList,
 		filtering.FilteredInvalid,
 		filtering.FilteredBlockedService:
 		e.Result = stats.RFiltered
--- a/internal/dnsforward/upstreams.go
+++ b/internal/dnsforward/upstreams.go
@@ -1,313 +0,0 @@
-package dnsforward
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"net/url"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/AdguardTeam/dnsproxy/proxy"
-	"github.com/AdguardTeam/dnsproxy/upstream"
-	"github.com/AdguardTeam/golibs/log"
-	"github.com/AdguardTeam/golibs/netutil"
-	"github.com/AdguardTeam/golibs/stringutil"
-	"github.com/AdguardTeam/urlfilter"
-	"github.com/miekg/dns"
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
-)
-
-// loadUpstreams parses upstream DNS servers from the configured file or from
-// the configuration itself.
-func (s *Server) loadUpstreams() (upstreams []string, err error) {
-	if s.conf.UpstreamDNSFileName == "" {
-		return stringutil.FilterOut(s.conf.UpstreamDNS, IsCommentOrEmpty), nil
-	}
-
-	var data []byte
-	data, err = os.ReadFile(s.conf.UpstreamDNSFileName)
-	if err != nil {
-		return nil, fmt.Errorf("reading upstream from file: %w", err)
-	}
-
-	upstreams = stringutil.SplitTrimmed(string(data), "\n")
-
-	log.Debug("dnsforward: got %d upstreams in %q", len(upstreams), s.conf.UpstreamDNSFileName)
-
-	return stringutil.FilterOut(upstreams, IsCommentOrEmpty), nil
-}
-
-// prepareUpstreamSettings sets upstream DNS server settings.
-func (s *Server) prepareUpstreamSettings() (err error) {
-	// Use a customized set of RootCAs, because Go's default mechanism of
-	// loading TLS roots does not always work properly on some routers so we're
-	// loading roots manually and pass it here.
-	//
-	// See [aghtls.SystemRootCAs].
-	//
-	// TODO(a.garipov): Investigate if that's true.
-	upstream.RootCAs = s.conf.TLSv12Roots
-	upstream.CipherSuites = s.conf.TLSCiphers
-
-	// Load upstreams either from the file, or from the settings
-	var upstreams []string
-	upstreams, err = s.loadUpstreams()
-	if err != nil {
-		return fmt.Errorf("loading upstreams: %w", err)
-	}
-
-	s.conf.UpstreamConfig, err = s.prepareUpstreamConfig(upstreams, defaultDNS, &upstream.Options{
-		Bootstrap:    s.conf.BootstrapDNS,
-		Timeout:      s.conf.UpstreamTimeout,
-		HTTPVersions: UpstreamHTTPVersions(s.conf.UseHTTP3Upstreams),
-		PreferIPv6:   s.conf.BootstrapPreferIPv6,
-	})
-	if err != nil {
-		return fmt.Errorf("preparing upstream config: %w", err)
-	}
-
-	return nil
-}
-
-// prepareUpstreamConfig sets upstream configuration based on upstreams and
-// configuration of s.
-func (s *Server) prepareUpstreamConfig(
-	upstreams []string,
-	defaultUpstreams []string,
-	opts *upstream.Options,
-) (uc *proxy.UpstreamConfig, err error) {
-	uc, err = proxy.ParseUpstreamsConfig(upstreams, opts)
-	if err != nil {
-		return nil, fmt.Errorf("parsing upstream config: %w", err)
-	}
-
-	if len(uc.Upstreams) == 0 && defaultUpstreams != nil {
-		log.Info("dnsforward: warning: no default upstreams specified, using %v", defaultUpstreams)
-		var defaultUpstreamConfig *proxy.UpstreamConfig
-		defaultUpstreamConfig, err = proxy.ParseUpstreamsConfig(defaultUpstreams, opts)
-		if err != nil {
-			return nil, fmt.Errorf("parsing default upstreams: %w", err)
-		}
-
-		uc.Upstreams = defaultUpstreamConfig.Upstreams
-	}
-
-	if s.dnsFilter != nil && s.dnsFilter.EtcHosts != nil {
-		err = s.replaceUpstreamsWithHosts(uc, opts)
-		if err != nil {
-			return nil, fmt.Errorf("resolving upstreams with hosts: %w", err)
-		}
-	}
-
-	return uc, nil
-}
-
-// replaceUpstreamsWithHosts replaces unique upstreams with their resolved
-// versions based on the system hosts file.
-//
-// TODO(e.burkov):  This should be performed inside dnsproxy, which should
-// actually consider /etc/hosts.  See TODO on [aghnet.HostsContainer].
-func (s *Server) replaceUpstreamsWithHosts(
-	upsConf *proxy.UpstreamConfig,
-	opts *upstream.Options,
-) (err error) {
-	resolved := map[string]*upstream.Options{}
-
-	err = s.resolveUpstreamsWithHosts(resolved, upsConf.Upstreams, opts)
-	if err != nil {
-		return fmt.Errorf("resolving upstreams: %w", err)
-	}
-
-	hosts := maps.Keys(upsConf.DomainReservedUpstreams)
-	// TODO(e.burkov):  Think of extracting sorted range into an util function.
-	slices.Sort(hosts)
-	for _, host := range hosts {
-		err = s.resolveUpstreamsWithHosts(resolved, upsConf.DomainReservedUpstreams[host], opts)
-		if err != nil {
-			return fmt.Errorf("resolving upstreams reserved for %s: %w", host, err)
-		}
-	}
-
-	hosts = maps.Keys(upsConf.SpecifiedDomainUpstreams)
-	slices.Sort(hosts)
-	for _, host := range hosts {
-		err = s.resolveUpstreamsWithHosts(resolved, upsConf.SpecifiedDomainUpstreams[host], opts)
-		if err != nil {
-			return fmt.Errorf("resolving upstreams specific for %s: %w", host, err)
-		}
-	}
-
-	return nil
-}
-
-// resolveUpstreamsWithHosts resolves the IP addresses of each of the upstreams
-// and replaces those both in upstreams and resolved.  Upstreams that failed to
-// resolve are placed to resolved as-is.  This function only returns error of
-// upstreams closing.
-func (s *Server) resolveUpstreamsWithHosts(
-	resolved map[string]*upstream.Options,
-	upstreams []upstream.Upstream,
-	opts *upstream.Options,
-) (err error) {
-	for i := range upstreams {
-		u := upstreams[i]
-		addr := u.Address()
-		host := extractUpstreamHost(addr)
-
-		withIPs, ok := resolved[host]
-		if !ok {
-			ips := s.resolveUpstreamHost(host)
-			if len(ips) == 0 {
-				resolved[host] = nil
-
-				return nil
-			}
-
-			sortNetIPAddrs(ips, opts.PreferIPv6)
-
-			withIPs = opts.Clone()
-			withIPs.ServerIPAddrs = ips
-			resolved[host] = withIPs
-		} else if withIPs == nil {
-			continue
-		}
-
-		if err = u.Close(); err != nil {
-			return fmt.Errorf("closing upstream %s: %w", addr, err)
-		}
-
-		upstreams[i], err = upstream.AddressToUpstream(addr, withIPs)
-		if err != nil {
-			return fmt.Errorf("replacing upstream %s with resolved %s: %w", addr, host, err)
-		}
-
-		log.Debug("dnsforward: using %s for %s", withIPs.ServerIPAddrs, upstreams[i].Address())
-	}
-
-	return nil
-}
-
-// extractUpstreamHost returns the hostname of addr without port with an
-// assumption that any address passed here has already been successfully parsed
-// by [upstream.AddressToUpstream].  This function essentially mirrors the logic
-// of [upstream.AddressToUpstream], see TODO on [replaceUpstreamsWithHosts].
-func extractUpstreamHost(addr string) (host string) {
-	var err error
-	if strings.Contains(addr, "://") {
-		var u *url.URL
-		u, err = url.Parse(addr)
-		if err != nil {
-			log.Debug("dnsforward: parsing upstream %s: %s", addr, err)
-
-			return addr
-		}
-
-		return u.Hostname()
-	}
-
-	// Probably, plain UDP upstream defined by address or address:port.
-	host, err = netutil.SplitHost(addr)
-	if err != nil {
-		return addr
-	}
-
-	return host
-}
-
-// resolveUpstreamHost returns the version of ups with IP addresses from the
-// system hosts file placed into its options.
-func (s *Server) resolveUpstreamHost(host string) (addrs []net.IP) {
-	req := &urlfilter.DNSRequest{
-		Hostname: host,
-		DNSType:  dns.TypeA,
-	}
-	aRes, _ := s.dnsFilter.EtcHosts.MatchRequest(req)
-
-	req.DNSType = dns.TypeAAAA
-	aaaaRes, _ := s.dnsFilter.EtcHosts.MatchRequest(req)
-
-	var ips []net.IP
-	for _, rw := range append(aRes.DNSRewrites(), aaaaRes.DNSRewrites()...) {
-		dr := rw.DNSRewrite
-		if dr == nil || dr.Value == nil {
-			continue
-		}
-
-		if ip, ok := dr.Value.(net.IP); ok {
-			ips = append(ips, ip)
-		}
-	}
-
-	return ips
-}
-
-// sortNetIPAddrs sorts addrs in accordance with the protocol preferences.
-// Invalid addresses are sorted near the end.
-//
-// TODO(e.burkov):  This function taken from dnsproxy, which also already
-// contains a few similar functions.  Think of moving to golibs.
-func sortNetIPAddrs(addrs []net.IP, preferIPv6 bool) {
-	l := len(addrs)
-	if l <= 1 {
-		return
-	}
-
-	slices.SortStableFunc(addrs, func(addrA, addrB net.IP) (sortsBefore bool) {
-		switch len(addrA) {
-		case net.IPv4len, net.IPv6len:
-			switch len(addrB) {
-			case net.IPv4len, net.IPv6len:
-				// Go on.
-			default:
-				return true
-			}
-		default:
-			return false
-		}
-
-		if aIs4, bIs4 := addrA.To4() != nil, addrB.To4() != nil; aIs4 != bIs4 {
-			if aIs4 {
-				return !preferIPv6
-			}
-
-			return preferIPv6
-		}
-
-		return bytes.Compare(addrA, addrB) < 0
-	})
-}
-
-// UpstreamHTTPVersions returns the HTTP versions for upstream configuration
-// depending on configuration.
-func UpstreamHTTPVersions(http3 bool) (v []upstream.HTTPVersion) {
-	if !http3 {
-		return upstream.DefaultHTTPVersions
-	}
-
-	return []upstream.HTTPVersion{
-		upstream.HTTPVersion3,
-		upstream.HTTPVersion2,
-		upstream.HTTPVersion11,
-	}
-}
-
-// setProxyUpstreamMode sets the upstream mode and related settings in conf
-// based on provided parameters.
-func setProxyUpstreamMode(
-	conf *proxy.Config,
-	allServers bool,
-	fastestAddr bool,
-	fastestTimeout time.Duration,
-) {
-	if allServers {
-		conf.UpstreamMode = proxy.UModeParallel
-	} else if fastestAddr {
-		conf.UpstreamMode = proxy.UModeFastestAddr
-		conf.FastestPingTimeout = fastestTimeout
-	} else {
-		conf.UpstreamMode = proxy.UModeLoadBalance
-	}
-}
--- a/internal/filtering/blocked.go
+++ b/internal/filtering/blocked.go
@@ -2,7 +2,6 @@ package filtering

 import (
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"time"

@@ -56,29 +55,11 @@ type BlockedServices struct {
 	IDs []string `yaml:"ids"`
 }

-// Clone returns a deep copy of blocked services.
-func (s *BlockedServices) Clone() (c *BlockedServices) {
-	if s == nil {
-		return nil
-	}
+// BlockedSvcKnown returns true if a blocked service ID is known.
+func BlockedSvcKnown(s string) (ok bool) {
+	_, ok = serviceRules[s]

-	return &BlockedServices{
-		Schedule: s.Schedule.Clone(),
-		IDs:      slices.Clone(s.IDs),
-	}
-}
-
-// Validate returns an error if blocked services contain unknown service ID.  s
-// must not be nil.
-func (s *BlockedServices) Validate() (err error) {
-	for _, id := range s.IDs {
-		_, ok := serviceRules[id]
-		if !ok {
-			return fmt.Errorf("unknown blocked-service %q", id)
-		}
-	}
-
-	return nil
+	return ok
 }

 // ApplyBlockedServices - set blocked services settings for this DNS request
--- a/internal/filtering/filter.go
+++ b/internal/filtering/filter.go
@@ -1,7 +1,10 @@
 package filtering

 import (
+	"bufio"
+	"bytes"
 	"fmt"
+	"hash/crc32"
 	"io"
 	"net/http"
 	"os"
@@ -11,7 +14,6 @@ import (
 	"time"

 	"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
-	"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/stringutil"
@@ -27,9 +29,9 @@ const filterDir = "filters"
 // TODO(e.burkov):  Use more deterministic approach.
 var nextFilterID = time.Now().Unix()

-// FilterYAML represents a filter list in the configuration file.
+// FilterYAML respresents a filter list in the configuration file.
 //
-// TODO(e.burkov):  Investigate if the field ordering is important.
+// TODO(e.burkov):  Investigate if the field oredering is important.
 type FilterYAML struct {
 	Enabled     bool
 	URL         string    // URL or a file path
@@ -211,7 +213,7 @@ func (d *DNSFilter) loadFilters(array []FilterYAML) {

 		err := d.load(filter)
 		if err != nil {
-			log.Error("filtering: loading filter %d: %s", filter.ID, err)
+			log.Error("Couldn't load filter %d contents due to %s", filter.ID, err)
 		}
 	}
 }
@@ -336,8 +338,7 @@ func (d *DNSFilter) refreshFiltersArray(filters *[]FilterYAML, force bool) (int,
 		updateFlags = append(updateFlags, updated)
 		if err != nil {
 			nfail++
-			log.Info("filtering: updating filter from url %q: %s\n", uf.URL, err)
-
+			log.Printf("Failed to update filter %s: %s\n", uf.URL, err)
 			continue
 		}
 	}
@@ -366,13 +367,7 @@ func (d *DNSFilter) refreshFiltersArray(filters *[]FilterYAML, force bool) (int,
 				continue
 			}

-			log.Info(
-				"filtering: updated filter %d; rule count: %d (was %d)",
-				f.ID,
-				uf.RulesCount,
-				f.RulesCount,
-			)
-
+			log.Info("Updated filter #%d.  Rules: %d -> %d", f.ID, f.RulesCount, uf.RulesCount)
 			f.Name = uf.Name
 			f.RulesCount = uf.RulesCount
 			f.checksum = uf.checksum
@@ -402,10 +397,9 @@ func (d *DNSFilter) refreshFiltersArray(filters *[]FilterYAML, force bool) (int,
 //
 // TODO(a.garipov, e.burkov): What the hell?
 func (d *DNSFilter) refreshFiltersIntl(block, allow, force bool) (int, bool) {
-	updNum := 0
-	log.Debug("filtering: starting updating")
-	defer func() { log.Debug("filtering: finished updating, %d updated", updNum) }()
+	log.Debug("filtering: updating...")

+	updNum := 0
 	var lists []FilterYAML
 	var toUpd []bool
 	isNetErr := false
@@ -443,9 +437,131 @@ func (d *DNSFilter) refreshFiltersIntl(block, allow, force bool) (int, bool) {
 		}
 	}

+	log.Debug("filtering: update finished: %d lists updated", updNum)
+
 	return updNum, false
 }

+// isPrintableText returns true if data is printable UTF-8 text with CR, LF, TAB
+// characters.
+//
+// TODO(e.burkov):  Investigate the purpose of this and improve the
+// implementation.  Perhaps, use something from the unicode package.
+func isPrintableText(data string) (ok bool) {
+	for _, c := range []byte(data) {
+		if (c >= ' ' && c != 0x7f) || c == '\n' || c == '\r' || c == '\t' {
+			continue
+		}
+
+		return false
+	}
+
+	return true
+}
+
+// scanLinesWithBreak is essentially a [bufio.ScanLines] which keeps trailing
+// line breaks.
+func scanLinesWithBreak(data []byte, atEOF bool) (advance int, token []byte, err error) {
+	if atEOF && len(data) == 0 {
+		return 0, nil, nil
+	}
+
+	if i := bytes.IndexByte(data, '\n'); i >= 0 {
+		return i + 1, data[0 : i+1], nil
+	}
+
+	if atEOF {
+		return len(data), data, nil
+	}
+
+	// Request more data.
+	return 0, nil, nil
+}
+
+// parseFilter copies filter's content from src to dst and returns the number of
+// rules, number of bytes written, checksum, and title of the parsed list.  dst
+// must not be nil.
+func (d *DNSFilter) parseFilter(
+	src io.Reader,
+	dst io.Writer,
+) (rulesNum, written int, checksum uint32, title string, err error) {
+	scanner := bufio.NewScanner(src)
+	scanner.Split(scanLinesWithBreak)
+
+	titleFound := false
+	for n := 0; scanner.Scan(); written += n {
+		line := scanner.Text()
+		var isRule bool
+		var likelyTitle string
+		isRule, likelyTitle, err = d.parseFilterLine(line, !titleFound, written == 0)
+		if err != nil {
+			return 0, written, 0, "", err
+		}
+
+		if isRule {
+			rulesNum++
+		} else if likelyTitle != "" {
+			title, titleFound = likelyTitle, true
+		}
+
+		checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
+
+		n, err = dst.Write([]byte(line))
+		if err != nil {
+			return 0, written, 0, "", fmt.Errorf("writing filter line: %w", err)
+		}
+	}
+
+	if err = scanner.Err(); err != nil {
+		return 0, written, 0, "", fmt.Errorf("scanning filter contents: %w", err)
+	}
+
+	return rulesNum, written, checksum, title, nil
+}
+
+// parseFilterLine returns true if the passed line is a rule.  line is
+// considered a rule if it's not a comment and contains no title.
+func (d *DNSFilter) parseFilterLine(
+	line string,
+	lookForTitle bool,
+	testHTML bool,
+) (isRule bool, title string, err error) {
+	if !isPrintableText(line) {
+		return false, "", errors.Error("filter contains non-printable characters")
+	}
+
+	line = strings.TrimSpace(line)
+	if line == "" || line[0] == '#' {
+		return false, "", nil
+	}
+
+	if testHTML && isHTML(line) {
+		return false, "", errors.Error("data is HTML, not plain text")
+	}
+
+	if line[0] == '!' && lookForTitle {
+		match := d.filterTitleRegexp.FindStringSubmatch(line)
+		if len(match) > 1 {
+			title = match[1]
+		}
+
+		return false, title, nil
+	}
+
+	return true, "", nil
+}
+
+// isHTML returns true if the line contains HTML tags instead of plain text.
+// line shouldn have no leading space symbols.
+//
+// TODO(ameshkov):  It actually gives too much false-positives.  Perhaps, just
+// check if trimmed string begins with angle bracket.
+func isHTML(line string) (ok bool) {
+	line = strings.ToLower(line)
+
+	return strings.HasPrefix(line, "<html") || strings.HasPrefix(line, "<!doctype")
+}
+
 // update refreshes filter's content and a/mtimes of it's file.
 func (d *DNSFilter) update(filter *FilterYAML) (b bool, err error) {
 	b, err = d.updateIntl(filter)
@@ -457,7 +573,7 @@ func (d *DNSFilter) update(filter *FilterYAML) (b bool, err error) {
 			filter.LastUpdated,
 		)
 		if chErr != nil {
-			log.Error("filtering: os.Chtimes(): %s", chErr)
+			log.Error("os.Chtimes(): %v", chErr)
 		}
 	}

@@ -466,12 +582,14 @@ func (d *DNSFilter) update(filter *FilterYAML) (b bool, err error) {

 // finalizeUpdate closes and gets rid of temporary file f with filter's content
 // according to updated.  It also saves new values of flt's name, rules number
-// and checksum if succeeded.
+// and checksum if sucсeeded.
 func (d *DNSFilter) finalizeUpdate(
 	file *os.File,
 	flt *FilterYAML,
 	updated bool,
-	res *rulelist.ParseResult,
+	name string,
+	rnum int,
+	cs uint32,
 ) (err error) {
 	tmpFileName := file.Name()

@@ -484,24 +602,23 @@ func (d *DNSFilter) finalizeUpdate(
 	}

 	if !updated {
-		log.Debug("filtering: filter %d from url %q has no changes, skipping", flt.ID, flt.URL)
+		log.Tracef("filter #%d from %s has no changes, skip", flt.ID, flt.URL)

 		return os.Remove(tmpFileName)
 	}

 	fltPath := flt.Path(d.DataDir)

-	log.Info("filtering: saving contents of filter %d into %q", flt.ID, fltPath)
+	log.Printf("saving contents of filter #%d into %s", flt.ID, fltPath)

-	// Don't use renameio or maybe packages, since those will require loading
-	// the whole filter content to the memory on Windows.
+	// Don't use renamio or maybe packages, since those will require loading the
+	// whole filter content to the memory on Windows.
 	err = os.Rename(tmpFileName, fltPath)
 	if err != nil {
 		return errors.WithDeferred(err, os.Remove(tmpFileName))
 	}

-	flt.Name = aghalg.Coalesce(flt.Name, res.Title)
-	flt.checksum, flt.RulesCount = res.Checksum, res.RulesCount
+	flt.Name, flt.checksum, flt.RulesCount = aghalg.Coalesce(flt.Name, name), cs, rnum

 	return nil
 }
@@ -509,9 +626,11 @@ func (d *DNSFilter) finalizeUpdate(
 // updateIntl updates the flt rewriting it's actual file.  It returns true if
 // the actual update has been performed.
 func (d *DNSFilter) updateIntl(flt *FilterYAML) (ok bool, err error) {
-	log.Debug("filtering: downloading update for filter %d from %q", flt.ID, flt.URL)
+	log.Tracef("downloading update for filter %d from %s", flt.ID, flt.URL)

-	var res *rulelist.ParseResult
+	var name string
+	var rnum, n int
+	var cs uint32

 	var tmpFile *os.File
 	tmpFile, err = os.CreateTemp(filepath.Join(d.DataDir, filterDir), "")
@@ -519,14 +638,9 @@ func (d *DNSFilter) updateIntl(flt *FilterYAML) (ok bool, err error) {
 		return false, err
 	}
 	defer func() {
-		finErr := d.finalizeUpdate(tmpFile, flt, ok, res)
+		finErr := d.finalizeUpdate(tmpFile, flt, ok, name, rnum, cs)
 		if ok && finErr == nil {
-			log.Info(
-				"filtering: updated filter %d: %d bytes, %d rules",
-				flt.ID,
-				res.BytesWritten,
-				res.RulesCount,
-			)
+			log.Printf("updated filter %d: %d bytes, %d rules", flt.ID, n, rnum)

 			return
 		}
@@ -547,14 +661,14 @@ func (d *DNSFilter) updateIntl(flt *FilterYAML) (ok bool, err error) {
 		var resp *http.Response
 		resp, err = d.HTTPClient.Get(flt.URL)
 		if err != nil {
-			log.Info("filtering: requesting filter from %q: %s, skipping", flt.URL, err)
+			log.Printf("requesting filter from %s, skip: %s", flt.URL, err)

 			return false, err
 		}
 		defer func() { err = errors.WithDeferred(err, resp.Body.Close()) }()

 		if resp.StatusCode != http.StatusOK {
-			log.Info("filtering got status code %d from %q, skipping", resp.StatusCode, flt.URL)
+			log.Printf("got status code %d from %s, skip", resp.StatusCode, flt.URL)

 			return false, fmt.Errorf("got status code %d, want %d", resp.StatusCode, http.StatusOK)
 		}
@@ -571,20 +685,16 @@ func (d *DNSFilter) updateIntl(flt *FilterYAML) (ok bool, err error) {
 		r = f
 	}

-	bufPtr := d.bufPool.Get().(*[]byte)
-	defer d.bufPool.Put(bufPtr)
+	rnum, n, cs, name, err = d.parseFilter(r, tmpFile)

-	p := rulelist.NewParser()
-	res, err = p.Parse(tmpFile, r, *bufPtr)
-
-	return res.Checksum != flt.checksum && err == nil, err
+	return cs != flt.checksum && err == nil, err
 }

 // loads filter contents from the file in dataDir
 func (d *DNSFilter) load(flt *FilterYAML) (err error) {
 	fileName := flt.Path(d.DataDir)

-	log.Debug("filtering: loading filter %d from %q", flt.ID, fileName)
+	log.Debug("filtering: loading filter %d from %s", flt.ID, fileName)

 	file, err := os.Open(fileName)
 	if errors.Is(err, os.ErrNotExist) {
@@ -600,18 +710,14 @@ func (d *DNSFilter) load(flt *FilterYAML) (err error) {
 		return fmt.Errorf("getting filter file stat: %w", err)
 	}

-	log.Debug("filtering: file %q, id %d, length %d", fileName, flt.ID, st.Size())
+	log.Debug("filtering: file %s, id %d, length %d", fileName, flt.ID, st.Size())

-	bufPtr := d.bufPool.Get().(*[]byte)
-	defer d.bufPool.Put(bufPtr)
-
-	p := rulelist.NewParser()
-	res, err := p.Parse(io.Discard, file, *bufPtr)
+	rulesCount, _, checksum, _, err := d.parseFilter(file, io.Discard)
 	if err != nil {
 		return fmt.Errorf("parsing filter file: %w", err)
 	}

-	flt.RulesCount, flt.checksum, flt.LastUpdated = res.RulesCount, res.Checksum, st.ModTime()
+	flt.RulesCount, flt.checksum, flt.LastUpdated = rulesCount, checksum, st.ModTime()

 	return nil
 }
@@ -653,9 +759,8 @@ func (d *DNSFilter) enableFiltersLocked(async bool) {
 		})
 	}

-	err := d.setFilters(filters, allowFilters, async)
-	if err != nil {
-		log.Error("filtering: enabling filters: %s", err)
+	if err := d.SetFilters(filters, allowFilters, async); err != nil {
+		log.Debug("enabling filters: %s", err)
 	}

 	d.SetEnabled(d.FilteringEnabled)
--- a/internal/filtering/filtering.go
+++ b/internal/filtering/filtering.go
@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"runtime/debug"
 	"strings"
@@ -17,7 +18,6 @@ import (

 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
-	"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/mathutil"
@@ -170,15 +170,6 @@ type Checker interface {

 // DNSFilter matches hostnames and DNS requests against filtering rules.
 type DNSFilter struct {
-	// bufPool is a pool of buffers used for filtering-rule list parsing.
-	bufPool *sync.Pool
-
-	rulesStorage    *filterlist.RuleStorage
-	filteringEngine *urlfilter.DNSEngine
-
-	rulesStorageAllow    *filterlist.RuleStorage
-	filteringEngineAllow *urlfilter.DNSEngine
-
 	safeSearch SafeSearch

 	// safeBrowsingChecker is the safe browsing hash-prefix checker.
@@ -187,6 +178,12 @@ type DNSFilter struct {
 	// parentalControl is the parental control hash-prefix checker.
 	parentalControlChecker Checker

+	rulesStorage    *filterlist.RuleStorage
+	filteringEngine *urlfilter.DNSEngine
+
+	rulesStorageAllow    *filterlist.RuleStorage
+	filteringEngineAllow *urlfilter.DNSEngine
+
 	engineLock sync.RWMutex

 	Config // for direct access by library users, even a = assignment
@@ -199,6 +196,12 @@ type DNSFilter struct {

 	refreshLock *sync.Mutex

+	// filterTitleRegexp is the regular expression to retrieve a name of a
+	// filter list.
+	//
+	// TODO(e.burkov):  Don't use regexp for such a simple text processing task.
+	filterTitleRegexp *regexp.Regexp
+
 	hostCheckers []hostChecker
 }

@@ -336,12 +339,12 @@ func cloneRewrites(entries []*LegacyRewrite) (clone []*LegacyRewrite) {
 	return clone
 }

-// setFilters sets new filters, synchronously or asynchronously.  When filters
+// SetFilters sets new filters, synchronously or asynchronously.  When filters
 // are set asynchronously, the old filters continue working until the new
 // filters are ready.
 //
 // In this case the caller must ensure that the old filter files are intact.
-func (d *DNSFilter) setFilters(blockFilters, allowFilters []Filter, async bool) error {
+func (d *DNSFilter) SetFilters(blockFilters, allowFilters []Filter, async bool) error {
 	if async {
 		params := filtersInitializerParams{
 			allowFilters: allowFilters,
@@ -367,7 +370,14 @@ func (d *DNSFilter) setFilters(blockFilters, allowFilters []Filter, async bool)
 		return nil
 	}

-	return d.initFiltering(allowFilters, blockFilters)
+	err := d.initFiltering(allowFilters, blockFilters)
+	if err != nil {
+		log.Error("filtering: can't initialize filtering subsystem: %s", err)
+
+		return err
+	}
+
+	return nil
 }

 // Starts initializing new filters by signal from channel
@@ -376,8 +386,7 @@ func (d *DNSFilter) filtersInitializer() {
 		params := <-d.filtersInitializerChan
 		err := d.initFiltering(params.allowFilters, params.blockFilters)
 		if err != nil {
-			log.Error("filtering: initializing: %s", err)
-
+			log.Error("Can't initialize filtering subsystem: %s", err)
 			continue
 		}
 	}
@@ -510,7 +519,7 @@ func (d *DNSFilter) matchSysHosts(
 	dnsres, _ := d.EtcHosts.MatchRequest(&urlfilter.DNSRequest{
 		Hostname:         host,
 		SortedClientTags: setts.ClientTags,
-		// TODO(e.burkov):  Wait for urlfilter update to pass netip.Addr.
+		// TODO(e.burkov):  Wait for urlfilter update to pass net.IP.
 		ClientIP:   setts.ClientIP.String(),
 		ClientName: setts.ClientName,
 		DNSType:    qtype,
@@ -709,7 +718,7 @@ func newRuleStorage(filters []Filter) (rs *filterlist.RuleStorage, err error) {
 }

 // Initialize urlfilter objects.
-func (d *DNSFilter) initFiltering(allowFilters, blockFilters []Filter) (err error) {
+func (d *DNSFilter) initFiltering(allowFilters, blockFilters []Filter) error {
 	rulesStorage, err := newRuleStorage(blockFilters)
 	if err != nil {
 		return err
@@ -736,8 +745,7 @@ func (d *DNSFilter) initFiltering(allowFilters, blockFilters []Filter) (err erro

 	// Make sure that the OS reclaims memory as soon as possible.
 	debug.FreeOSMemory()
-
-	log.Debug("filtering: initialized filtering engine")
+	log.Debug("initialized filtering engine")

 	return nil
 }
@@ -941,14 +949,8 @@ func InitModule() {
 // be non-nil.
 func New(c *Config, blockFilters []Filter) (d *DNSFilter, err error) {
 	d = &DNSFilter{
-		bufPool: &sync.Pool{
-			New: func() (buf any) {
-				bufVal := make([]byte, rulelist.DefaultRuleBufSize)
-
-				return &bufVal
-			},
-		},
 		refreshLock:            &sync.Mutex{},
+		filterTitleRegexp:      regexp.MustCompile(`^! Title: +(.*)$`),
 		safeBrowsingChecker:    c.SafeBrowsingChecker,
 		parentalControlChecker: c.ParentalControlChecker,
 	}
@@ -986,11 +988,17 @@ func New(c *Config, blockFilters []Filter) (d *DNSFilter, err error) {
 	}

 	if d.BlockedServices != nil {
-		err = d.BlockedServices.Validate()
+		bsvcs := []string{}
+		for _, s := range d.BlockedServices.IDs {
+			if !BlockedSvcKnown(s) {
+				log.Debug("skipping unknown blocked-service %q", s)

-		if err != nil {
-			return nil, fmt.Errorf("filtering: %w", err)
+				continue
+			}
+
+			bsvcs = append(bsvcs, s)
 		}
+		d.BlockedServices.IDs = bsvcs
 	}

 	if blockFilters != nil {
@@ -1045,7 +1053,7 @@ func (d *DNSFilter) checkSafeBrowsing(

 	if log.GetLevel() >= log.DEBUG {
 		timer := log.StartTimer()
-		defer timer.LogElapsed("filtering: safebrowsing lookup for %q", host)
+		defer timer.LogElapsed("safebrowsing lookup for %q", host)
 	}

 	res = Result{
@@ -1077,7 +1085,7 @@ func (d *DNSFilter) checkParental(

 	if log.GetLevel() >= log.DEBUG {
 		timer := log.StartTimer()
-		defer timer.LogElapsed("filtering: parental lookup for %q", host)
+		defer timer.LogElapsed("parental lookup for %q", host)
 	}

 	res = Result{
--- a/internal/filtering/filtering_test.go
+++ b/internal/filtering/filtering_test.go
@@ -547,7 +547,7 @@ func TestWhitelist(t *testing.T) {
 	}}
 	d, setts := newForTest(t, nil, filters)

-	err := d.setFilters(filters, whiteFilters, false)
+	err := d.SetFilters(filters, whiteFilters, false)
 	require.NoError(t, err)

 	t.Cleanup(d.Close)
--- a/internal/filtering/hashprefix/cache.go
+++ b/internal/filtering/hashprefix/cache.go
@@ -25,7 +25,7 @@ func toCacheItem(data []byte) *cacheItem {
 	t := time.Unix(int64(binary.BigEndian.Uint64(data)), 0)

 	data = data[expirySize:]
-	hashes := make([]hostnameHash, 0, len(data)/hashSize)
+	hashes := make([]hostnameHash, len(data)/hashSize)

 	for i := 0; i < len(data); i += hashSize {
 		var hash hostnameHash
@@ -41,13 +41,12 @@ func toCacheItem(data []byte) *cacheItem {

 // fromCacheItem encodes cacheItem into data.
 func fromCacheItem(item *cacheItem) (data []byte) {
-	data = make([]byte, 0, len(item.hashes)*hashSize+expirySize)
-
+	data = make([]byte, len(item.hashes)*hashSize+expirySize)
 	expiry := item.expiry.Unix()
-	data = binary.BigEndian.AppendUint64(data, uint64(expiry))
+	binary.BigEndian.PutUint64(data[:expirySize], uint64(expiry))

 	for _, v := range item.hashes {
-		// nolint:looppointer // The subslice of v is used for a copy.
+		// nolint:looppointer // The subsilce is used for a copy.
 		data = append(data, v[:]...)
 	}

@@ -63,7 +62,7 @@ func (c *Checker) findInCache(

 	i := 0
 	for _, hash := range hashes {
-		// nolint:looppointer // The has subslice is used for a cache lookup.
+		// nolint:looppointer // The subsilce is used for a safe cache lookup.
 		data := c.cache.Get(hash[:prefixLen])
 		if data == nil {
 			hashes[i] = hash
@@ -98,36 +97,34 @@ func (c *Checker) storeInCache(hashesToRequest, respHashes []hostnameHash) {

 	for _, hash := range respHashes {
 		var pref prefix
-		// nolint:looppointer // The hash subslice is used for a copy.
+		// nolint:looppointer // The subsilce is used for a copy.
 		copy(pref[:], hash[:])

 		hashToStore[pref] = append(hashToStore[pref], hash)
 	}

 	for pref, hash := range hashToStore {
-		c.setCache(pref, hash)
+		// nolint:looppointer // The subsilce is used for a safe cache lookup.
+		c.setCache(pref[:], hash)
 	}

 	for _, hash := range hashesToRequest {
-		// nolint:looppointer // The hash subslice is used for a cache lookup.
-		val := c.cache.Get(hash[:prefixLen])
+		// nolint:looppointer // The subsilce is used for a safe cache lookup.
+		pref := hash[:prefixLen]
+		val := c.cache.Get(pref)
 		if val == nil {
-			var pref prefix
-			// nolint:looppointer // The hash subslice is used for a copy.
-			copy(pref[:], hash[:])
-
 			c.setCache(pref, nil)
 		}
 	}
 }

 // setCache stores hash in cache.
-func (c *Checker) setCache(pref prefix, hashes []hostnameHash) {
+func (c *Checker) setCache(pref []byte, hashes []hostnameHash) {
 	item := &cacheItem{
 		expiry: time.Now().Add(c.cacheTime),
 		hashes: hashes,
 	}

-	c.cache.Set(pref[:], fromCacheItem(item))
+	c.cache.Set(pref, fromCacheItem(item))
 	log.Debug("%s: stored in cache: %v", c.svc, pref)
 }
--- a/internal/filtering/hashprefix/cache_internal_test.go
+++ b/internal/filtering/hashprefix/cache_internal_test.go
@@ -1,44 +0,0 @@
-package hashprefix
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCacheItem(t *testing.T) {
-	item := &cacheItem{
-		expiry: time.Unix(0x01_23_45_67_89_AB_CD_EF, 0),
-		hashes: []hostnameHash{{
-			0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-			0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-			0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-			0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-		}, {
-			0x01, 0x03, 0x05, 0x07, 0x02, 0x04, 0x06, 0x08,
-			0x01, 0x03, 0x05, 0x07, 0x02, 0x04, 0x06, 0x08,
-			0x01, 0x03, 0x05, 0x07, 0x02, 0x04, 0x06, 0x08,
-			0x01, 0x03, 0x05, 0x07, 0x02, 0x04, 0x06, 0x08,
-		}},
-	}
-
-	wantData := []byte{
-		0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
-		0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-		0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-		0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-		0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-		0x01, 0x03, 0x05, 0x07, 0x02, 0x04, 0x06, 0x08,
-		0x01, 0x03, 0x05, 0x07, 0x02, 0x04, 0x06, 0x08,
-		0x01, 0x03, 0x05, 0x07, 0x02, 0x04, 0x06, 0x08,
-		0x01, 0x03, 0x05, 0x07, 0x02, 0x04, 0x06, 0x08,
-	}
-
-	gotData := fromCacheItem(item)
-	assert.Equal(t, wantData, gotData)
-
-	newItem := toCacheItem(gotData)
-	gotData = fromCacheItem(newItem)
-	assert.Equal(t, wantData, gotData)
-}
--- a/internal/filtering/hashprefix/hashprefix.go
+++ b/internal/filtering/hashprefix/hashprefix.go
@@ -173,7 +173,7 @@ func (c *Checker) getQuestion(hashes []hostnameHash) (q string) {
 	b := &strings.Builder{}

 	for _, hash := range hashes {
-		// nolint:looppointer // The hash subslice is used for hex encoding.
+		// nolint:looppointer // The subsilce is used for safe hex encoding.
 		stringutil.WriteToBuilder(b, hex.EncodeToString(hash[:prefixLen]), ".")
 	}

--- a/internal/filtering/http.go
+++ b/internal/filtering/http.go
@@ -95,7 +95,7 @@ func (d *DNSFilter) handleFilteringAddURL(w http.ResponseWriter, r *http.Request
 			r,
 			w,
 			http.StatusBadRequest,
-			"Couldn't fetch filter from URL %q: %s",
+			"Couldn't fetch filter from url %s: %s",
 			filt.URL,
 			err,
 		)
@@ -169,7 +169,7 @@ func (d *DNSFilter) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Requ
 		deleted = (*filters)[delIdx]
 		p := deleted.Path(d.DataDir)
 		err = os.Rename(p, p+".old")
-		if err != nil && !errors.Is(err, os.ErrNotExist) {
+		if err != nil {
 			log.Error("deleting filter %d: renaming file %q: %s", deleted.ID, p, err)

 			return
--- a/internal/filtering/rewrites.go
+++ b/internal/filtering/rewrites.go
@@ -122,7 +122,7 @@ func matchDomainWildcard(host, wildcard string) (ok bool) {
 	return isWildcard(wildcard) && strings.HasSuffix(host, wildcard[1:])
 }

-// legacyRewriteSortsBefore sorts rewrites according to the following priority:
+// legacyRewriteSortsBefore sorts rewirtes according to the following priority:
 //
 //  1. A and AAAA > CNAME;
 //  2. wildcard > exact;
--- a/internal/filtering/rulelist/error.go
+++ b/internal/filtering/rulelist/error.go
@@ -1,9 +0,0 @@
-package rulelist
-
-import "github.com/AdguardTeam/golibs/errors"
-
-// ErrHTML is returned by [Parser.Parse] if the data is likely to be HTML.
-//
-// TODO(a.garipov): This error is currently returned to the UI.  Stop that and
-// make it all-lowercase.
-const ErrHTML errors.Error = "data is HTML, not plain text"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dimitry Kolyshev	94458c5658	Merge remote-tracking branch 'origin/master' into 3389-querylog-export # Conflicts: # CHANGELOG.md	2023-06-22 13:28:17 +04:00
Dimitry Kolyshev	6fea435d89	Merge remote-tracking branch 'origin/master' into 3389-querylog-export # Conflicts: # CHANGELOG.md	2023-06-15 14:40:06 +04:00
Dimitry Kolyshev	05706bd7ea	querylog: bench search	2023-06-15 14:38:44 +04:00
Dimitry Kolyshev	00327757e1	querylog: bench search	2023-06-14 12:07:16 +04:00
Dimitry Kolyshev	5f0e53ded7	home: write timeout middleware	2023-06-14 10:51:17 +04:00
Dimitry Kolyshev	5cd4ce766d	Merge remote-tracking branch 'origin/master' into 3389-querylog-export	2023-06-14 10:08:11 +04:00
Dimitry Kolyshev	e695fd9885	querylog: timeout revert	2023-06-14 10:07:22 +04:00
Dimitry Kolyshev	c43053e7d2	querylog: timeout	2023-06-13 14:36:31 +04:00
Dimitry Kolyshev	86e25944b3	querylog: imp code	2023-06-13 13:08:15 +04:00
Dimitry Kolyshev	fd7260f6de	Merge remote-tracking branch 'origin/master' into 3389-querylog-export # Conflicts: # CHANGELOG.md	2023-06-13 10:38:17 +04:00
Dimitry Kolyshev	c591e46254	querylog: imp code	2023-06-02 15:26:04 +03:00
Dimitry Kolyshev	66d9ea7cca	querylog: imp docs	2023-06-02 15:15:37 +03:00
Dimitry Kolyshev	dafc785845	querylog: imp code docs	2023-06-02 12:09:50 +03:00
Dimitry Kolyshev	e9b17891bb	Merge remote-tracking branch 'origin/master' into 3389-querylog-export	2023-06-02 12:00:57 +03:00
Dimitry Kolyshev	0b27f048a7	querylog: imp code	2023-05-31 16:26:56 +03:00
Dimitry Kolyshev	649454e77b	querylog: imp code	2023-05-31 15:11:33 +03:00
Dimitry Kolyshev	ca22d8524d	all: imp docs	2023-05-31 15:11:15 +03:00
Dimitry Kolyshev	07f4f0474c	all: imp docs	2023-05-31 12:06:13 +03:00
Dimitry Kolyshev	8813e135b6	querylog: export	2023-05-31 11:49:15 +03:00
Dimitry Kolyshev	f4f2c11eb9	all: export querylog docs	2023-05-29 13:29:41 +03:00