all: upd chlog

Squashed commit of the following:

commit 284190f748345c7556e60b67f051ec5f6f080948
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 6 19:36:00 2023 +0300

    all: sync with master; upd chlog

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.23.4'
+  'GO_VERSION': '1.23.2'
   'NODE_VERSION': '16'
 
 'on':
@@ -95,7 +95,7 @@
         'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
         'restore-keys': '${{ runner.os }}-node-'
     - 'name': 'Set up Snapcraft'
-      'run': 'sudo snap install snapcraft --classic'
+      'run': 'sudo apt-get -yq --no-install-suggests --no-install-recommends install snapcraft'
     - 'name': 'Set up QEMU'
       'uses': 'docker/setup-qemu-action@v1'
     - 'name': 'Set up Docker Buildx'

.github/workflows/lint.yml

@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.23.4'
+  'GO_VERSION': '1.23.2'
 
 'on':
   'push':

.gitignore

@@ -1,8 +1,3 @@
-# This comment is used to simplify checking local copies of the file.  Bump
-# this number every time a significant change is made to this file.
-#
-# AdGuard-Project-Version: 1
-
 # Please, DO NOT put your text editors' temporary files here.  The more are
 # added, the harder it gets to maintain and manage projects' gitignores.  Put
 # them into your global gitignore file instead.
@@ -13,7 +8,6 @@
 # bottom to make sure they take effect.
 *.db
 *.log
-*.out
 *.snap
 *.test
 /agh-backup/
@@ -27,7 +21,6 @@
 /launchpad_credentials
 /querylog.json*
 /snapcraft_login
-/test-reports/
 AdGuardHome
 AdGuardHome.exe
 AdGuardHome.yaml*

CHANGELOG.md

@@ -16,76 +16,23 @@ TODO(a.garipov): Use the common markdown formatting tools.
 ## [Unreleased]
 
 <!--
-## [v0.107.55] - 2024-11-09 (APPROX.)
+## [v0.108.0] - TBA
 
-See also the [v0.107.55 GitHub milestone][ms-v0.107.55].
+## [v0.107.54] - 2024-10-03 (APPROX.)
 
-[ms-v0.107.55]: https://github.com/AdguardTeam/AdGuardHome/milestone/90?closed=1
+See also the [v0.107.54 GitHub milestone][ms-v0.107.54].
+
+[ms-v0.107.54]: https://github.com/AdguardTeam/AdGuardHome/milestone/89?closed=1
 
 NOTE: Add new changes BELOW THIS COMMENT.
 -->
 
-### Security
-
-- The permission check and migration on Windows has been fixed to use the
-  Windows security model more accurately ([#7400]).
-- Go version has been updated to prevent the possibility of exploiting the Go
-  vulnerabilities fixed in [1.23.4][go-1.23.4].
-- The release executables are now signed.
-
-### Added
-
-- The `--no-permcheck` command-line option to disable checking and migration of
-  permissions for the security-sensitive files and directories, which caused
-  issues on Windows ([#7400]).
-
-### Fixed
-
-- Goroutine leak during the upstream DNS server test ([#7357]).
-- Goroutine leak during configuration update resulting in increased response
-  time ([#6818]).
-
-[#6818]: https://github.com/AdguardTeam/AdGuardHome/issues/6818
-[#7357]: https://github.com/AdguardTeam/AdGuardHome/issues/7357
-[#7400]: https://github.com/AdguardTeam/AdGuardHome/issues/7400
-
-[go-1.23.4]: https://groups.google.com/g/golang-announce/c/3DyiMkYx4Fo
-
 <!--
 NOTE: Add new changes ABOVE THIS COMMENT.
 -->
 
 
 
-## [v0.107.54] - 2024-11-06
-
-See also the [v0.107.54 GitHub milestone][ms-v0.107.54].
-
-### Security
-
-- Incorrect handling of sensitive files permissions on Windows ([#7314]).
-
-### Changed
-
-- Improved filtering performance ([#6818]).
-
-### Fixed
-
-- Repetitive statistics log messages ([#7338]).
-- Custom client cache ([#7250]).
-- Missing runtime clients with information from the system hosts file on first
-  AdGuard Home start ([#7315]).
-
-[#6818]: https://github.com/AdguardTeam/AdGuardHome/issues/6818
-[#7250]: https://github.com/AdguardTeam/AdGuardHome/issues/7250
-[#7314]: https://github.com/AdguardTeam/AdGuardHome/issues/7314
-[#7315]: https://github.com/AdguardTeam/AdGuardHome/issues/7315
-[#7338]: https://github.com/AdguardTeam/AdGuardHome/issues/7338
-
-[ms-v0.107.54]: https://github.com/AdguardTeam/AdGuardHome/milestone/89?closed=1
-
-
-
 ## [v0.107.53] - 2024-10-03
 
 See also the [v0.107.53 GitHub milestone][ms-v0.107.53].
@@ -3197,12 +3144,11 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
 
 
 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.55...HEAD
-[v0.107.55]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.54...v0.107.55
--->
-
 [Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.54...HEAD
 [v0.107.54]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.53...v0.107.54
+-->
+
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.53...HEAD
 [v0.107.53]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.52...v0.107.53
 [v0.107.52]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.51...v0.107.52
 [v0.107.51]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.50...v0.107.51

Makefile

@@ -1,14 +1,14 @@
 # Keep the Makefile POSIX-compliant.  We currently allow hyphens in
 # target names, but that may change in the future.
 #
-# See https://pubs.opengroup.org/onlinepubs/9799919799/utilities/make.html.
+# See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html.
 .POSIX:
 
 # This comment is used to simplify checking local copies of the
 # Makefile.  Bump this number every time a significant change is made to
 # this Makefile.
 #
-# AdGuard-Project-Version: 9
+# AdGuard-Project-Version: 6
 
 # Don't name these macros "GO" etc., because GNU Make apparently makes
 # them exported environment variables with the literal value of
@@ -22,12 +22,13 @@ VERBOSE.MACRO = $${VERBOSE:-0}
 
 CHANNEL = development
 CLIENT_DIR = client
+COMMIT = $$( git rev-parse --short HEAD )
 DEPLOY_SCRIPT_PATH = not/a/real/path
 DIST_DIR = dist
 GOAMD64 = v1
 GOPROXY = https://proxy.golang.org|direct
+GOTOOLCHAIN = go1.23.2
 GOTELEMETRY = off
-GOTOOLCHAIN = go1.23.4
 GPG_KEY = devteam@adguard.com
 GPG_KEY_PASSPHRASE = not-a-real-password
 NPM = npm
@@ -35,7 +36,6 @@ NPM_FLAGS = --prefix $(CLIENT_DIR)
 NPM_INSTALL_FLAGS = $(NPM_FLAGS) --quiet --no-progress --ignore-engines\
 	--ignore-optional --ignore-platform --ignore-scripts
 RACE = 0
-REVISION = $${REVISION:-$$(git rev-parse --short HEAD)}
 SIGN = 1
 SIGNER_API_KEY = not-a-real-key
 VERSION = v0.0.0
@@ -60,6 +60,7 @@ BUILD_RELEASE_DEPS_1 = go-deps
 
 ENV = env\
 	CHANNEL='$(CHANNEL)'\
+	COMMIT='$(COMMIT)'\
 	DEPLOY_SCRIPT_PATH='$(DEPLOY_SCRIPT_PATH)' \
 	DIST_DIR='$(DIST_DIR)'\
 	GO="$(GO.MACRO)"\
@@ -69,19 +70,17 @@ ENV = env\
 	GOTOOLCHAIN='$(GOTOOLCHAIN)'\
 	GPG_KEY='$(GPG_KEY)'\
 	GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\
-	NEXTAPI='$(NEXTAPI)'\
 	PATH="$${PWD}/bin:$$( "$(GO.MACRO)" env GOPATH )/bin:$${PATH}"\
 	RACE='$(RACE)'\
-	REVISION='$(REVISION)'\
 	SIGN='$(SIGN)'\
 	SIGNER_API_KEY='$(SIGNER_API_KEY)' \
+	NEXTAPI='$(NEXTAPI)'\
 	VERBOSE="$(VERBOSE.MACRO)"\
 	VERSION="$(VERSION)"\
 
 # Keep the line above blank.
 
 ENV_MISC = env\
-	PATH="$${PWD}/bin:$$("$(GO.MACRO)" env GOPATH)/bin:$${PATH}"\
 	VERBOSE="$(VERBOSE.MACRO)"\
 
 # Keep the line above blank.
@@ -90,8 +89,6 @@ ENV_MISC = env\
 # full build.
 build: deps quick-build
 
-init: ; git config core.hooksPath ./scripts/hooks
-
 quick-build: js-build go-build
 
 deps: js-deps go-deps
@@ -105,6 +102,9 @@ build-docker: ; $(ENV) "$(SHELL)" ./scripts/make/build-docker.sh
 build-release: $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT))
 	$(ENV) "$(SHELL)" ./scripts/make/build-release.sh
 
+clean: ; $(ENV) "$(SHELL)" ./scripts/make/clean.sh
+init:  ; git config core.hooksPath ./scripts/hooks
+
 js-build: ; $(NPM) $(NPM_FLAGS) run build-prod
 js-deps:  ; $(NPM) $(NPM_INSTALL_FLAGS) ci
 js-lint:  ; $(NPM) $(NPM_FLAGS) run lint
@@ -127,16 +127,17 @@ go-check: go-tools go-lint go-test
 # A quick check to make sure that all operating systems relevant to the
 # development of the project can be typechecked and built successfully.
 go-os-check:
-	$(ENV) GOOS='darwin'  "$(GO.MACRO)" vet ./internal/...
-	$(ENV) GOOS='freebsd' "$(GO.MACRO)" vet ./internal/...
-	$(ENV) GOOS='openbsd' "$(GO.MACRO)" vet ./internal/...
-	$(ENV) GOOS='linux'   "$(GO.MACRO)" vet ./internal/...
-	$(ENV) GOOS='windows' "$(GO.MACRO)" vet ./internal/...
+	env GOOS='darwin'  "$(GO.MACRO)" vet ./internal/...
+	env GOOS='freebsd' "$(GO.MACRO)" vet ./internal/...
+	env GOOS='openbsd' "$(GO.MACRO)" vet ./internal/...
+	env GOOS='linux'   "$(GO.MACRO)" vet ./internal/...
+	env GOOS='windows' "$(GO.MACRO)" vet ./internal/...
+
+
+openapi-lint: ; cd ./openapi/ && $(YARN) test
+openapi-show: ; cd ./openapi/ && $(YARN) start
 
 txt-lint: ; $(ENV) "$(SHELL)" ./scripts/make/txt-lint.sh
 
 md-lint:  ; $(ENV_MISC) "$(SHELL)" ./scripts/make/md-lint.sh
 sh-lint:  ; $(ENV_MISC) "$(SHELL)" ./scripts/make/sh-lint.sh
-
-openapi-lint: ; cd ./openapi/ && $(YARN) test
-openapi-show: ; cd ./openapi/ && $(YARN) start

README.md

@@ -114,7 +114,7 @@ If you're running **Linux,** there's a secure and easy way to install AdGuard Ho
 
 [Docker Hub]: https://hub.docker.com/r/adguard/adguardhome
 [Snap Store]: https://snapcraft.io/adguard-home
-[wiki-start]: https://adguard-dns.io/kb/adguard-home/getting-started/
+[wiki-start]: https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started
 
 ### <a href="#guides" id="guides" name="guides">Guides</a>
 

bamboo-specs/release.yaml

@@ -8,7 +8,7 @@
 'variables':
     'channel': 'edge'
     'dockerFrontend': 'adguard/home-js-builder:2.0'
-    'dockerGo': 'adguard/go-builder:1.23.4--1'
+    'dockerGo': 'adguard/go-builder:1.23.2--1'
 
 'stages':
   - 'Build frontend':
@@ -142,15 +142,13 @@
                 # Install Qemu, create builder.
                 docker version -f '{{ .Server.Experimental }}'
                 docker buildx rm buildx-builder || :
-                docker buildx create \
-                    --name buildx-builder \
-                    --driver docker-container \
-                    --use
+                docker buildx create --name buildx-builder --driver docker-container\
+                                --use
                 docker buildx inspect --bootstrap
 
                 # Login to DockerHub.
-                docker login -u="${bamboo.dockerHubUsername}" \
-                    -p="${bamboo.dockerHubPassword}"
+                docker login -u="${bamboo.dockerHubUsername}"\
+                        -p="${bamboo.dockerHubPassword}"
 
                 # Boot the builder.
                 docker buildx inspect --bootstrap
@@ -159,14 +157,14 @@
                 docker info
 
                 # Prepare and push the build.
-                env \
-                    CHANNEL="${bamboo.channel}" \
-                    REVISION="${bamboo.repository.revision.number}" \
-                    DIST_DIR='dist' \
-                    DOCKER_IMAGE_NAME='adguard/adguardhome' \
-                    DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true" \
-                    VERBOSE='1' \
-                    sh ./scripts/make/build-docker.sh
+                env\
+                        CHANNEL="${bamboo.channel}"\
+                        COMMIT="${bamboo.repository.revision.number}"\
+                        DIST_DIR='dist'\
+                        DOCKER_IMAGE_NAME='adguard/adguardhome'\
+                        DOCKER_OUTPUT="type=image,name=adguard/adguardhome,push=true"\
+                        VERBOSE='1'\
+                        sh ./scripts/make/build-docker.sh
             'environment':
                 DOCKER_CLI_EXPERIMENTAL=enabled
     'final-tasks':
@@ -278,7 +276,7 @@
         'variables':
             'channel': 'beta'
             'dockerFrontend': 'adguard/home-js-builder:2.0'
-            'dockerGo': 'adguard/go-builder:1.23.4--1'
+            'dockerGo': 'adguard/go-builder:1.23.2--1'
     # release-vX.Y.Z branches are the branches from which the actual final
     # release is built.
   - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -294,4 +292,4 @@
         'variables':
             'channel': 'release'
             'dockerFrontend': 'adguard/home-js-builder:2.0'
-            'dockerGo': 'adguard/go-builder:1.23.4--1'
+            'dockerGo': 'adguard/go-builder:1.23.2--1'

bamboo-specs/test.yaml

@@ -6,7 +6,7 @@
     'name': 'AdGuard Home - Build and run tests'
 'variables':
     'dockerFrontend': 'adguard/home-js-builder:2.0'
-    'dockerGo': 'adguard/go-builder:1.23.4--1'
+    'dockerGo': 'adguard/go-builder:1.23.2--1'
     'channel': 'development'
 
 'stages':
@@ -196,5 +196,5 @@
         # may need to build a few of these.
         'variables':
             'dockerFrontend': 'adguard/home-js-builder:2.0'
-            'dockerGo': 'adguard/go-builder:1.23.4--1'
+            'dockerGo': 'adguard/go-builder:1.23.2--1'
             'channel': 'candidate'

client/src/__locales/de.json

@@ -641,7 +641,7 @@
     "show_processed_responses": "Verarbeitet",
     "blocked_safebrowsing": "Gesperrt durch Internetsicherheit",
     "blocked_adult_websites": "Gesperrt durch Kindersicherung",
-    "blocked_threats": "Gesperrte Bedrohungen",
+    "blocked_threats": "Bedrohungen blockiert",
     "allowed": "Zugelassen",
     "filtered": "Gefiltert",
     "rewritten": "Umgeschrieben",

client/src/__locales/fi.json

@@ -542,7 +542,7 @@
     "stats_params": "Tilastoinnin määritys",
     "config_successfully_saved": "Asetukset tallennettiin",
     "interval_6_hour": "6 tuntia",
-    "interval_24_hour": "24 tunnilta",
+    "interval_24_hour": "24 tuntia",
     "interval_days": "{{count}} päivä",
     "interval_days_plural": "{{count}} päivää",
     "domain": "Verkkotunnus",

client/src/__locales/pl.json

@@ -122,7 +122,7 @@
     "stats_query_domain": "Najczęściej wyszukiwane domeny",
     "for_last_hours": "w ciągu ostatniej {{count}} godziny",
     "for_last_hours_plural": "w ciągu ostatnich {{count}} godzin",
-    "for_last_days": "za ostatni {{count}} dzień",
+    "for_last_days": "za ostatni dzień {{count}}",
     "for_last_days_plural": "z ostatnich {{count}} dni",
     "stats_disabled": "Statystyki zostały wyłączone. Można je włączyć na <0>stronie ustawień</0>.",
     "stats_disabled_short": "Statystyki zostały wyłączone",
@@ -130,7 +130,7 @@
     "requests_count": "Licznik żądań",
     "top_blocked_domains": "Najpopularniejsze zablokowane domeny",
     "top_clients": "Główni klienci",
-    "no_clients_found": "Nie znaleziono klientów",
+    "no_clients_found": "Nie znaleziono klienta",
     "general_statistics": "Ogólne statystyki",
     "top_upstreams": "Często żądane serwery nadrzędne",
     "no_upstreams_data_found": "Brak danych dotyczących serwerów nadrzędnych",

client/src/__locales/si-lk.json

@@ -7,7 +7,7 @@
     "local_ptr_desc": "ස්ථානීය PTR විමසුම් සඳහා ඇඩ්ගාර්ඩ් හෝම් භාවිතා කරන ව.නා.ප. සේවාදායක. මෙම සේවාදායක පුද්ගලික අ.ජා.කෙ. ලිපින පරාසවල PTR විමසුම් විසඳීමට භාවිතා කරයි, උදාහරණයක් ලෙස ප්‍රතිවර්ත ව.නා.ප. භාවිතයෙන් \"192.168.12.34\". මෙය සකසා නැති නම්, ඇඩ්ගාර්ඩ් හෝම් හි ලිපින සඳහා හැරුනු විට ඔබගේ මෙහෙයුම් පද්ධතියේ පෙරනිමි ව.නා.ප. විසදුම්වල ලිපින භාවිතා කරයි.",
     "local_ptr_default_resolver": "පෙරනිමි පරිදි, ඇඩ්ගාර්ඩ් හෝම් පහත ප්‍රතිවර්ත ව.නා.ප. පිළිවිසඳු භාවිතා කරයි: {{ip}}.",
     "local_ptr_no_default_resolver": "ඇඩ්ගාර්ඩ් හෝම් හට මෙම පද්ධතිය සඳහා සුදුසු පුද්ගලික ප්‍රතිවර්ත ව.නා.ප. පිළිවිසඳු නිශ්චය කරගත නොහැකි විය.",
-    "local_ptr_placeholder": "පේළියකට අ.ජා.කෙ. ලිපිනය බැගින් ලියන්න",
+    "local_ptr_placeholder": "පේළියකට එක් සේවාදායක ලිපිනය බැගින් යොදන්න",
     "resolve_clients_title": "අනුග්‍රාහකවල අ.ජා.කෙ. ලිපින ප්‍රතිවර්ත විසඳීම සබල කරන්න",
     "use_private_ptr_resolvers_title": "පෞද්. ප්‍රතිවර්ත ව.නා.ප. පිළිවිසඳු භාවිතය",
     "check_dhcp_servers": "ග.ධා.වි.කෙ. සේවාදායක පරීක්‍ෂා කරන්න",
@@ -102,6 +102,7 @@
     "stats_malware_phishing": "අවහිර කළ ද්වේශාංග/තතුබෑම්",
     "stats_adult": "අවහිර කළ වැඩිහිටි වියමන අඩවි",
     "stats_query_domain": "ප්‍රචලිත විමසන ලද වසම්",
+    "for_last_24_hours": "පසුගිය පැය 24 සඳහා",
     "for_last_days": "පසුගිය දවස් {{count}} සඳහා",
     "for_last_days_plural": "පසුගිය දවස් {{count}} සඳහා",
     "stats_disabled": "සංඛ්‍යාලේඛන අබල කර ඇත. එය <0>සැකසුම් පිටුවෙන්</0> සබල කළ හැකිය.",
@@ -114,15 +115,13 @@
     "general_statistics": "පොදු සංඛ්‍යාලේඛන",
     "number_of_dns_query_days": "පසුගිය දවස් {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
     "number_of_dns_query_days_plural": "පසුගිය දවස් {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
-    "number_of_dns_query_hours": "පසුගිය පැය {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
-    "number_of_dns_query_hours_plural": "පසුගිය පැය {{count}} සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
+    "number_of_dns_query_24_hours": "පසුගිය පැය 24 සඳහා සැකසූ ව.නා.ප. විමසුම් ගණන",
     "number_of_dns_query_blocked_24_hours": "දැන්වීම් වාරණ පෙරහන් සහ සත්කාරක වාරණ ලැයිස්තු මගින් අවහිර කළ ව.නා.ප. ඉල්ලීම් ගණන",
     "number_of_dns_query_blocked_24_hours_by_sec": "ඇඩ්ගාර්ඩ් පිරික්සුම් ආරක්‍ෂණ ඒකකය මගින් අවහිර කළ ව.නා.ප. ඉල්ලීම් ගණන",
     "number_of_dns_query_blocked_24_hours_adult": "අවහිර කළ වැඩිහිටි වියමන අඩවි ගණන",
     "enforced_save_search": "ආරක්‍ෂිත සෙවීම බලාත්මක කළ",
     "number_of_dns_query_to_safe_search": "ආරක්‍ෂිත සෙවීම බලාත්මක කළ සෙවුම් යන්ත්‍ර සඳහා ව.නා.ප. ඉල්ලීම් ගණන",
     "average_processing_time": "සාමාන්‍ය සැකසුම් කාලය",
-    "response_time": "ප්‍රතිචාර කාලය",
     "average_processing_time_hint": "ව.නා.ප. ඉල්ලීමක් සැකසීමේ සාමාන්‍ය කාලය මිලි තත්පර වලින්",
     "block_domain_use_filters_and_hosts": "පෙරහන් හා සත්කාරක ගොනු භාවිතයෙන් වසම් අවහිර කරන්න",
     "filters_block_toggle_hint": "ඔබට අවහිර කිරීමේ නීති <a>පෙරහන්</a> තුළ පිහිටුවිය හැකිය.",
@@ -131,7 +130,7 @@
     "use_adguard_parental": "ඇඩ්ගාර්ඩ් දෙමාපිය පාලන වියමන සේවාව භාවිතා කරන්න",
     "use_adguard_parental_hint": "වසමේ වැඩිහිටියන්ට අදාල කරුණු අඩංගු දැයි ඇඩ්ගාර්ඩ් හෝම් විසින් පරීක්‍ෂා කරනු ඇත. එය පිරික්සුම් ආරක්‍ෂණ වියමන සේවාව මෙන් රහස්‍යතා හිතකාමී යෙ.ක්‍ර. අ.මු. (API) භාවිතා කරයි.",
     "enforce_safe_search": "ආරක්‍ෂිත සෙවුම භාවිතා කරන්න",
-    "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් පහත සෙවුම් යන්ත්‍ර තුළ ආරක්‍ෂිත සෙවුම බලාත්මක කරනු ඇත: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, එකොසියා, යාන්ඩෙක්ස් සහ පික්සාබේ.",
+    "enforce_save_search_hint": "ඇඩ්ගාර්ඩ් හෝම් පහත සෙවුම් යන්ත්‍ර තුළ ආරක්‍ෂිත සෙවුම බලාත්මක කරනු ඇත: ගූගල්, යූටියුබ්, බින්ග්, ඩක්ඩක්ගෝ, යාන්ඩෙක්ස් සහ පික්සාබේ.",
     "no_servers_specified": "සේවාදායක කිසිවක් නිශ්චිතව දක්වා නැත",
     "general_settings": "පොදු සැකසුම්",
     "dns_settings": "ව.නා.ප. සැකසුම්",
@@ -197,14 +196,12 @@
     "example_comment_hash": "# එසේම අදහස් දැක්වීමක්.",
     "example_regex_meaning": "නිශ්චිතව දක්වා ඇති නිත්‍ය වාක්‍යවිධියට ගැළපෙන වසම් වෙත ප්‍රවේශය අවහිර කරයි.",
     "example_upstream_regular": "සාමාන්‍ය ව.නා.ප. (UDP හරහා);",
-    "example_upstream_regular_port": "සාමාන්‍ය ව.නා.ප. (UDP හරහා, තොට සමඟ);",
     "example_upstream_udp": "සාමාන්‍ය ව.නා.ප. (UDP, සත්කාරක-නම හරහා);",
     "example_upstream_dot": "සංකේතිත <0>TLS-මගින්-ව.නා.ප.</0>;",
     "example_upstream_doh": "සංකේතිත <0>HTTPS-මගින්-ව.නා.ප.</0>;",
     "example_upstream_doq": "සංකේතිත <0>QUIC-මගින්-ව.නා.ප.</0>;",
     "example_upstream_sdns": "<1>DNSCrypt</1> හෝ <2>HTTPS-මගින්-ව.නා.ප.</2> පිළිවිසඳු සඳහා <0>ව.නා.ප. මුද්දර</0>;",
     "example_upstream_tcp": "සාමාන්‍ය ව.නා.ප. (TCP/ස.පා.කෙ. හරහා);",
-    "example_upstream_tcp_port": "සාමාන්‍ය ව.නා.ප. (TCP හරහා, තොට සමඟ);",
     "example_upstream_tcp_hostname": "සාමාන්‍ය ව.නා.ප. (ස.පා.කෙ., සත්කාරක-නම හරහා);",
     "all_lists_up_to_date_toast": "සියළුම ලැයිස්තු දැනටමත් යාවත්කාලීනයි",
     "dns_test_ok_toast": "සඳහන් කළ ව.නා.ප. සේවාදායක නිවැරදිව ක්‍රියා කරයි",
@@ -278,7 +275,6 @@
     "edns_use_custom_ip": "EDNS සඳහා අභිරුචි අ.ජා.කෙ. යොදාගන්න",
     "edns_use_custom_ip_desc": "EDNS සඳහා අභිරුචි අ.ජා.කෙ. භාවිතයට ඉඩදෙන්න",
     "rate_limit_desc": "එක් අනුග්‍රාහකයකට ඉඩ දී ඇති තත්පරයට ඉල්ලීම් ගණන. එය 0 ලෙස සැකසීම යනුවෙන් අදහස් කරන්නේ සීමාවක් නැති බවයි.",
-    "rate_limit_whitelist_placeholder": "පේළියකට අ.ජා.කෙ. ලිපිනය බැගින් ලියන්න",
     "blocking_ipv4_desc": "අවහිර කළ A ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
     "blocking_ipv6_desc": "අවහිර කළ AAAA ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
     "blocking_mode_default": "පොදු: දැන්වීම් අවහිර කරන ආකාරයේ නීතියක් මගින් අවහිර කළ විට REFUSED සමඟ ප්‍රතිචාර දක්වයි; /etc/host-style ආකාරයේ නීතියක් මගින් අවහිර කළ විට නීතියේ දක්වා ඇති අ.ජා.කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි",
@@ -509,8 +505,8 @@
     "statistics_enable": "සංඛ්‍යාලේඛන සබල කරන්න",
     "ignore_domains": "නොසලකන වසම් (පේළියකට එක බැගින්)",
     "ignore_domains_title": "නොසලකන වසම්",
-    "ignore_domains_desc_stats": "මෙම නීති වලට ගැළපෙන විමසුම් සංඛ්‍යාලේඛනයට නොලියැවෙයි",
-    "ignore_domains_desc_query": "විමසුම් සටහනට මෙම නීති වලට ගැළපෙන විමසුම් නොලියැවෙයි",
+    "ignore_domains_desc_stats": "සංඛ්‍යාලේඛනයෙහි මෙම වසම් සඳහා විමසුම් නොලියැවෙයි",
+    "ignore_domains_desc_query": "විමසුම් සටහනෙහි මෙම වසම් සඳහා විමසුම් නොලියැවෙයි",
     "interval_hours": "පැය {{count}}",
     "interval_hours_plural": "පැය {{count}}",
     "filters_configuration": "පෙරහන් වින්‍යාසය",
@@ -619,8 +615,8 @@
     "use_saved_key": "පෙර සුරැකි යතුර භාවිතා කරන්න",
     "parental_control": "දෙමාපිය පාලනය",
     "safe_browsing": "ආරක්‍ෂිත පිරික්සුම",
-    "served_from_cache_label": "නිහිතයෙන් සැපයිණි",
-    "form_error_password_length": "මුරපදය අකුරු {{min}} සහ {{value}} ක් අතර විය යුතුය",
+    "served_from_cache": "{{value}} <i>(නිහිතයෙන් ගැනිණි)</i>",
+    "form_error_password_length": "මුරපදය අවම වශයෙන් අකුරු {{value}} ක් දිගු විය යුතුමයි",
     "anonymizer_notification": "<0>සටහන:</0> අ.ජා.කෙ. නිර්නාමිකකරණය සබලයි. ඔබට එය <1>පොදු සැකසුම්</1> හරහා අබල කිරීමට හැකිය .",
     "confirm_dns_cache_clear": "ඔබට ව.නා.ප. නිහිතය හිස් කිරීමට වුවමනාද?",
     "cache_cleared": "ව.නා.ප. නිහිතය හිස් කෙරිණි",
@@ -650,7 +646,6 @@
     "log_and_stats_section_label": "විමසුම් සටහන හා සංඛ්‍යාලේඛන",
     "ignore_query_log": "විමසුම් සටහනට මෙම අනුග්‍රාහකය යොදන්න එපා",
     "ignore_statistics": "සංඛ්‍යාලේඛනයට මෙම අනුග්‍රාහකය යොදන්න එපා",
-    "schedule_services": "සේවා අවහිර විරාමය",
     "schedule_invalid_select": "ආරම්භක වේලාව අවසන් වේලාවට කලින් විය යුතුය",
     "schedule_select_days": "දවස් තෝරන්න",
     "schedule_timezone": "වේලා කලාපයක් තෝරන්න",

client/src/__locales/sv.json

@@ -461,7 +461,7 @@
     "form_enter_mac": "Skriv in MAC",
     "form_enter_id": "Ange identifierare",
     "form_add_id": "Lägg till identifierare",
-    "form_client_name": "Ange klientnamn",
+    "form_client_name": "Skriv in klientnamn",
     "name": "Namn",
     "client_name": "Klient {{id}}",
     "client_global_settings": "Använda globala inställningar",
@@ -674,6 +674,7 @@
     "use_saved_key": "Använd den tidigare sparade nyckeln",
     "parental_control": "Föräldrakontroll",
     "safe_browsing": "Säker surfning",
+    "served_from_cache": "{{value}} <i>(levereras från cache)</i>",
     "form_error_password_length": "Lösenordet måste vara {{min}} till {{max}} tecken långt",
     "anonymizer_notification": "<0>Observera:</0> IP-anonymisering är aktiverad. Du kan inaktivera den i <1>Allmänna inställningar</1>.",
     "confirm_dns_cache_clear": "Är du säker på att du vill rensa DNS-cache?",

client/src/helpers/filters/filters.ts

@@ -238,12 +238,6 @@ export default {
             "homepage": "https://github.com/hagezi/dns-blocklists",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_51.txt"
         },
-        "hagezi_samsung_tracker_blocklist": {
-            "name": "HaGeZi's Samsung Tracker Blocklist",
-            "categoryId": "other",
-            "homepage": "https://github.com/hagezi/dns-blocklists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_61.txt"
-        },
         "hagezi_the_worlds_most_abused_tlds": {
             "name": "HaGeZi's The World's Most Abused TLDs",
             "categoryId": "security",
@@ -262,12 +256,6 @@ export default {
             "homepage": "https://github.com/hagezi/dns-blocklists",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_49.txt"
         },
-        "hagezi_windows_office_tracker_blocklist": {
-            "name": "HaGeZi's Windows/Office Tracker Blocklist",
-            "categoryId": "other",
-            "homepage": "https://github.com/hagezi/dns-blocklists",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_63.txt"
-        },
         "hagezi_xiaomi_tracking_blocklist": {
             "name": "HaGeZi's Xiaomi Tracker Blocklist",
             "categoryId": "other",
@@ -358,17 +346,17 @@ export default {
             "homepage": "https://github.com/uBlockOrigin/uAssets",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_50.txt"
         },
-        "ukrainian_security_filter": {
-            "name": "Ukrainian Security Filter",
-            "categoryId": "other",
-            "homepage": "https://github.com/braveinnovators/ukrainian-security-filter",
-            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_62.txt"
-        },
         "urlhaus_filter_online": {
             "name": "Malicious URL Blocklist (URLHaus)",
             "categoryId": "security",
             "homepage": "https://urlhaus.abuse.ch/",
             "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt"
+        },
+        "windowsspyblocker_hosts_spy_rules": {
+            "name": "WindowsSpyBlocker - Hosts spy rules",
+            "categoryId": "other",
+            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
+            "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_23.txt"
         }
     }
 }

client/src/helpers/trackers/trackers.json

@@ -1,5 +1,5 @@
 {
-	"timeUpdated": "2024-12-03T12:12:08.316Z",
+	"timeUpdated": "2024-09-30T10:04:46.112Z",
 	"categories": {
 		"0": "audio_video_player",
 		"1": "comments",
@@ -2515,13 +2515,6 @@
 			"url": "http://www.ancoramediasolutions.com/",
 			"companyId": "ancora"
 		},
-		"android": {
-			"name": "Android",
-			"categoryId": 101,
-			"url": "https://www.android.com/",
-			"companyId": "google",
-			"source": "AdGuard"
-		},
 		"anetwork": {
 			"name": "Anetwork",
 			"categoryId": 4,
@@ -8202,7 +8195,7 @@
 		"google_dns": {
 			"name": "Google DNS",
 			"categoryId": 10,
-			"url": "https://dns.google/",
+			"url": "hhttps://dns.google/",
 			"companyId": "google",
 			"source": "AdGuard"
 		},
@@ -13987,13 +13980,6 @@
 			"url": "http://prostor-lite.ru/",
 			"companyId": "prostor"
 		},
-		"proton_ag": {
-			"name": "Proton AG",
-			"categoryId": 2,
-			"url": "https://proton.me/",
-			"companyId": "proton_foundation",
-			"source": "AdGuard"
-		},
 		"provide_support": {
 			"name": "Provide Support",
 			"categoryId": 2,
@@ -15668,7 +15654,7 @@
 		"shareaholic": {
 			"name": "Shareaholic",
 			"categoryId": 6,
-			"url": "https://www.shareaholic.com/",
+			"url": "hhttps://www.shareaholic.com/",
 			"companyId": "shareaholic"
 		},
 		"shareasale": {
@@ -20841,7 +20827,6 @@
 		"anametrix.net": "anametrix",
 		"ancestrycdn.com": "ancestry_cdn",
 		"ancoraplatform.com": "ancora",
-		"android.com": "android",
 		"anetwork.ir": "anetwork",
 		"aniview.com": "aniview.com",
 		"a-ads.com": "anonymousads",
@@ -21887,7 +21872,6 @@
 		"fastly-insights.com": "fastly_insights",
 		"fastly.net": "fastlylb.net",
 		"fastlylb.net": "fastlylb.net",
-		"fastly-edge.com": "fastlylb.net",
 		"fastly-masque.net": "fastlylb.net",
 		"fastpic.ru": "fastpic.ru",
 		"fmpub.net": "federated_media",
@@ -23336,7 +23320,6 @@
 		"mrskincash.com": "mrskincash",
 		"a-msedge.net": "msedge",
 		"b-msedge.net": "msedge",
-		"dual-s-msedge.net": "msedge",
 		"e-msedge.net": "msedge",
 		"k-msedge.net": "msedge",
 		"l-msedge.net": "msedge",
@@ -23783,7 +23766,6 @@
 		"tr.prospecteye.com": "prospecteye",
 		"prosperent.com": "prosperent",
 		"prostor-lite.ru": "prostor",
-		"reports.proton.me": "proton_ag",
 		"providesupport.com": "provide_support",
 		"proximic.com": "proximic",
 		"proxistore.com": "proxistore.com",

go.mod

@@ -1,25 +1,24 @@
 module github.com/AdguardTeam/AdGuardHome
 
-go 1.23.4
+go 1.23.2
 
 require (
-	github.com/AdguardTeam/dnsproxy v0.73.4
-	github.com/AdguardTeam/golibs v0.30.5
-	github.com/AdguardTeam/urlfilter v0.20.0
+	github.com/AdguardTeam/dnsproxy v0.73.2
+	github.com/AdguardTeam/golibs v0.27.0
+	github.com/AdguardTeam/urlfilter v0.19.0
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/ameshkov/dnscrypt/v2 v2.3.0
 	github.com/bluele/gcache v0.0.2
 	github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500
 	github.com/digineo/go-ipset/v2 v2.2.1
-	github.com/fsnotify/fsnotify v1.8.0
-	// TODO(e.burkov): This package is deprecated; find a new one or use our
-	// own code for that.  Perhaps, use gopacket.
-	github.com/go-ping/ping v1.2.0
+	github.com/dimfeld/httptreemux/v5 v5.5.0
+	github.com/fsnotify/fsnotify v1.7.0
+	github.com/go-ping/ping v1.1.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/gopacket v1.1.19
 	github.com/google/renameio/v2 v2.0.0
 	github.com/google/uuid v1.6.0
-	github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475
+	github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49
 	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
@@ -28,15 +27,15 @@ 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.62
-	github.com/quic-go/quic-go v0.48.2
-	github.com/stretchr/testify v1.10.0
+	github.com/miekg/dns v1.1.61
+	github.com/quic-go/quic-go v0.47.0
+	github.com/stretchr/testify v1.9.0
 	github.com/ti-mo/netfilter v0.5.2
-	go.etcd.io/bbolt v1.3.11
-	golang.org/x/crypto v0.29.0
-	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
-	golang.org/x/net v0.31.0
-	golang.org/x/sys v0.28.0
+	go.etcd.io/bbolt v1.3.10
+	golang.org/x/crypto v0.26.0
+	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
+	golang.org/x/net v0.28.0
+	golang.org/x/sys v0.24.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	howett.net/plist v1.0.1
@@ -49,19 +48,22 @@ require (
 	github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect
+	github.com/google/pprof v0.0.0-20240521024322-9665fa269a30 // indirect
 	github.com/mdlayher/socket v0.5.1 // indirect
-	github.com/onsi/ginkgo/v2 v2.21.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.17.3 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
-	go.uber.org/mock v0.5.0 // indirect
-	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
-	golang.org/x/tools v0.27.0 // indirect
-	gonum.org/v1/gonum v0.15.1 // indirect
+	go.uber.org/mock v0.4.0 // indirect
+	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
+	gonum.org/v1/gonum v0.15.0 // indirect
 )
+
+// TODO(a.garipov): Remove once https://github.com/quic-go/quic-go/pull/4685 is merged.
+replace github.com/quic-go/quic-go => github.com/ainar-g/quic-go v0.0.0-20240930125330-446bd86056fd

go.sum

@@ -1,15 +1,17 @@
-github.com/AdguardTeam/dnsproxy v0.73.4 h1:FTIXX34wQqePjtWUD1I4QfWTq2B2N1gfOW/TzZDdR4o=
-github.com/AdguardTeam/dnsproxy v0.73.4/go.mod h1:18ssqhDgOCiVIwYmmVuXVM05wSwrzkO2yjKhVRWJX/g=
-github.com/AdguardTeam/golibs v0.30.5 h1:xqat/N9o/V/AnakaWpqq+fGU/qJhKtL4A2pj66kC+TE=
-github.com/AdguardTeam/golibs v0.30.5/go.mod h1:2wOvoAsubo/REnBiuu/YWYmkkzyFR52/QljMdQ2R58M=
-github.com/AdguardTeam/urlfilter v0.20.0 h1:X32qiuVCVd8WDYCEsbdZKfXMzwdVqrdulamtUi4rmzs=
-github.com/AdguardTeam/urlfilter v0.20.0/go.mod h1:gjrywLTxfJh6JOkwi9SU+frhP7kVVEZ5exFGkR99qpk=
+github.com/AdguardTeam/dnsproxy v0.73.2 h1:O6wRXzHsnWL5TkhYcuLWCShVFF0X5RFI6qUmq1ZFVsQ=
+github.com/AdguardTeam/dnsproxy v0.73.2/go.mod h1:zD5WfTctbRvYYk8PS39h6/OT84NTu6QxKbAiBN5PUcI=
+github.com/AdguardTeam/golibs v0.27.0 h1:YxCFK6HBGp/ZXp3bv5uei+oLH12UfIYB8u2rh1B6nnU=
+github.com/AdguardTeam/golibs v0.27.0/go.mod h1:iWdjXPCwmK2g2FKIb/OwEPnovSXeMqRhI8FWLxF5oxE=
+github.com/AdguardTeam/urlfilter v0.19.0 h1:q7eH13+yNETlpD/VD3u5rLQOripcUdEktqZFy+KiQLk=
+github.com/AdguardTeam/urlfilter v0.19.0/go.mod h1:+N54ZvxqXYLnXuvpaUhK2exDQW+djZBRSb6F6j0rkBY=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
 github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
+github.com/ainar-g/quic-go v0.0.0-20240930125330-446bd86056fd h1:mw4LqrCiv3vcKuCxBRg7kA17xfHKM+9hZgFWmyhe/AY=
+github.com/ainar-g/quic-go v0.0.0-20240930125330-446bd86056fd/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs=
 github.com/ameshkov/dnscrypt/v2 v2.3.0 h1:pDXDF7eFa6Lw+04C0hoMh8kCAQM8NwUdFEllSP2zNLs=
 github.com/ameshkov/dnscrypt/v2 v2.3.0/go.mod h1:N5hDwgx2cNb4Ay7AhvOSKst+eUiOZ/vbKRO9qMpQttE=
 github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
@@ -25,14 +27,16 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/digineo/go-ipset/v2 v2.2.1 h1:k6skY+0fMqeUjjeWO/m5OuWPSZUAn7AucHMnQ1MX77g=
 github.com/digineo/go-ipset/v2 v2.2.1/go.mod h1:wBsNzJlZlABHUITkesrggFnZQtgW5wkqw1uo8Qxe0VU=
-github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/dimfeld/httptreemux/v5 v5.5.0 h1:p8jkiMrCuZ0CmhwYLcbNbl7DDo21fozhKHQ2PccwOFQ=
+github.com/dimfeld/httptreemux/v5 v5.5.0/go.mod h1:QeEylH57C0v3VO0tkKraVz9oD3Uu93CKPnTLbsidvSw=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-ping/ping v1.2.0 h1:vsJ8slZBZAXNCK4dPcI2PEE9eM9n9RbXbGouVQ/Y4yQ=
-github.com/go-ping/ping v1.2.0/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
+github.com/go-ping/ping v1.1.0 h1:3MCGhVX4fyEUuhsfwPrsEdQw6xspHkv5zHsiSoDFZYw=
+github.com/go-ping/ping v1.1.0/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -42,8 +46,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
-github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs=
-github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20240521024322-9665fa269a30 h1:r6YdmbD41tGHeCWDyHF691LWtL7D1iSTyJaKejTWwVU=
+github.com/google/pprof v0.0.0-20240521024322-9665fa269a30/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
 github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
 github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -51,8 +55,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
-github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475 h1:hxST5pwMBEOWmxpkX20w9oZG+hXdhKmAIPQ3NGGAxas=
-github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 h1:/OuvSMGT9+xnyZ+7MZQ1zdngaCCAdPoSw8B/uurZ7pg=
+github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 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.1.1-0.20230202152459-5c7d0dd6ab86 h1:elKwZS1OcdQ0WwEDBeqxKwb7WB62QX8bvZ/FJnVXIfk=
@@ -76,14 +80,14 @@ github.com/mdlayher/raw v0.1.0/go.mod h1:yXnxvs6c0XoF/aK52/H5PjsVHmWBCFfZUfoh/Y5
 github.com/mdlayher/socket v0.2.1/go.mod h1:QLlNPkFR88mRUNQIzRBMfXxwKal8H7u1h3bL1CV+f0E=
 github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
 github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
-github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
-github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 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.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
-github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
-github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
-github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
+github.com/onsi/ginkgo/v2 v2.17.3 h1:oJcvKpIb7/8uLpDDtnQuf18xVnwKp8DTD7DQ6gTd/MU=
+github.com/onsi/ginkgo/v2 v2.17.3/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
+github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE=
+github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY=
 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.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
@@ -97,8 +101,6 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
 github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
-github.com/quic-go/quic-go v0.48.2 h1:wsKXZPeGWpMpCGSWqOcqpW2wZYic/8T3aqiOID0/KWE=
-github.com/quic-go/quic-go v0.48.2/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs=
 github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
 github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
@@ -107,8 +109,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/ti-mo/netfilter v0.2.0/go.mod h1:8GbBGsY/8fxtyIdfwy29JiluNcPK4K7wIT+x42ipqUU=
 github.com/ti-mo/netfilter v0.5.2 h1:CTjOwFuNNeZ9QPdRXt1MZFLFUf84cKtiQutNauHWd40=
 github.com/ti-mo/netfilter v0.5.2/go.mod h1:Btx3AtFiOVdHReTDmP9AE+hlkOcvIy403u7BXXbWZKo=
@@ -120,32 +122,32 @@ github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 h1:pyC9PaHYZFgEKFdlp3G8
 github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701/go.mod h1:P3a5rG4X7tI17Nn3aOIAYr5HbIMukwXG0urG0WuL8OA=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
-go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
-go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
-go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
+go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
+go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
-golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo=
-golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak=
+golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
+golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=
+golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
 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.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
+golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 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=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
+golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
 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.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 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=
@@ -156,25 +158,25 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
-golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
+golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
+golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
 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=
-gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0=
-gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ=
+gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/aghhttp/aghhttp.go

@@ -14,6 +14,12 @@ import (
 	"github.com/AdguardTeam/golibs/logutil/slogutil"
 )
 
+// HTTP scheme constants.
+const (
+	SchemeHTTP  = "http"
+	SchemeHTTPS = "https"
+)
+
 // RegisterFunc is the function that sets the handler to handle the URL for the
 // method.
 //

internal/aghos/os.go

@@ -20,10 +20,9 @@ import (
 	"github.com/AdguardTeam/golibs/log"
 )
 
-// Default file, binary, and directory permissions.
+// Default file and directory permissions.
 const (
 	DefaultPermDir  fs.FileMode = 0o700
-	DefaultPermExe  fs.FileMode = 0o700
 	DefaultPermFile fs.FileMode = 0o600
 )
 
@@ -146,6 +145,16 @@ func IsOpenWrt() (ok bool) {
 	return isOpenWrt()
 }
 
+// NotifyReconfigureSignal notifies c on receiving reconfigure signals.
+func NotifyReconfigureSignal(c chan<- os.Signal) {
+	notifyReconfigureSignal(c)
+}
+
+// IsReconfigureSignal returns true if sig is a reconfigure signal.
+func IsReconfigureSignal(sig os.Signal) (ok bool) {
+	return isReconfigureSignal(sig)
+}
+
 // SendShutdownSignal sends the shutdown signal to the channel.
 func SendShutdownSignal(c chan<- os.Signal) {
 	sendShutdownSignal(c)

internal/aghos/os_unix.go

@@ -1,11 +1,22 @@
-//go:build unix
+//go:build darwin || freebsd || linux || openbsd
 
 package aghos
 
 import (
 	"os"
+	"os/signal"
+
+	"golang.org/x/sys/unix"
 )
 
+func notifyReconfigureSignal(c chan<- os.Signal) {
+	signal.Notify(c, unix.SIGHUP)
+}
+
+func isReconfigureSignal(sig os.Signal) (ok bool) {
+	return sig == unix.SIGHUP
+}
+
 func sendShutdownSignal(_ chan<- os.Signal) {
 	// On Unix we are already notified by the system.
 }

internal/aghos/os_windows.go

@@ -4,11 +4,12 @@ package aghos
 
 import (
 	"os"
+	"os/signal"
 
 	"golang.org/x/sys/windows"
 )
 
-func setRlimit(_ uint64) (err error) {
+func setRlimit(val uint64) (err error) {
 	return Unsupported("setrlimit")
 }
 
@@ -37,6 +38,14 @@ func isOpenWrt() (ok bool) {
 	return false
 }
 
+func notifyReconfigureSignal(c chan<- os.Signal) {
+	signal.Notify(c, windows.SIGHUP)
+}
+
+func isReconfigureSignal(sig os.Signal) (ok bool) {
+	return sig == windows.SIGHUP
+}
+
 func sendShutdownSignal(c chan<- os.Signal) {
 	c <- os.Interrupt
 }

internal/aghrenameio/renameio_windows.go

@@ -62,9 +62,7 @@ func newPendingFile(filePath string, mode fs.FileMode) (f PendingFile, err error
 		return nil, fmt.Errorf("opening pending file: %w", err)
 	}
 
-	// TODO(e.burkov):  The [os.Chmod] implementation is useless on Windows,
-	// investigate if it can be removed.
-	err = os.Chmod(file.Name(), mode)
+	err = file.Chmod(mode)
 	if err != nil {
 		return nil, fmt.Errorf("preparing pending file: %w", err)
 	}

internal/aghtest/interface.go

@@ -58,7 +58,7 @@ func (w *FSWatcher) Add(name string) (err error) {
 
 // ServiceWithConfig is a fake [agh.ServiceWithConfig] implementation for tests.
 type ServiceWithConfig[ConfigType any] struct {
-	OnStart    func(ctx context.Context) (err error)
+	OnStart    func() (err error)
 	OnShutdown func(ctx context.Context) (err error)
 	OnConfig   func() (c ConfigType)
 }
@@ -68,8 +68,8 @@ var _ agh.ServiceWithConfig[struct{}] = (*ServiceWithConfig[struct{}])(nil)
 
 // Start implements the [agh.ServiceWithConfig] interface for
 // *ServiceWithConfig.
-func (s *ServiceWithConfig[_]) Start(ctx context.Context) (err error) {
-	return s.OnStart(ctx)
+func (s *ServiceWithConfig[_]) Start() (err error) {
+	return s.OnStart()
 }
 
 // Shutdown implements the [agh.ServiceWithConfig] interface for
@@ -89,14 +89,14 @@ func (s *ServiceWithConfig[ConfigType]) Config() (c ConfigType) {
 // AddressProcessor is a fake [client.AddressProcessor] implementation for
 // tests.
 type AddressProcessor struct {
-	OnProcess func(ctx context.Context, ip netip.Addr)
+	OnProcess func(ip netip.Addr)
 	OnClose   func() (err error)
 }
 
 // Process implements the [client.AddressProcessor] interface for
 // *AddressProcessor.
-func (p *AddressProcessor) Process(ctx context.Context, ip netip.Addr) {
-	p.OnProcess(ctx, ip)
+func (p *AddressProcessor) Process(ip netip.Addr) {
+	p.OnProcess(ip)
 }
 
 // Close implements the [client.AddressProcessor] interface for
@@ -107,18 +107,13 @@ func (p *AddressProcessor) Close() (err error) {
 
 // AddressUpdater is a fake [client.AddressUpdater] implementation for tests.
 type AddressUpdater struct {
-	OnUpdateAddress func(ctx context.Context, ip netip.Addr, host string, info *whois.Info)
+	OnUpdateAddress func(ip netip.Addr, host string, info *whois.Info)
 }
 
 // UpdateAddress implements the [client.AddressUpdater] interface for
 // *AddressUpdater.
-func (p *AddressUpdater) UpdateAddress(
-	ctx context.Context,
-	ip netip.Addr,
-	host string,
-	info *whois.Info,
-) {
-	p.OnUpdateAddress(ctx, ip, host, info)
+func (p *AddressUpdater) UpdateAddress(ip netip.Addr, host string, info *whois.Info) {
+	p.OnUpdateAddress(ip, host, info)
 }
 
 // Package dnsforward

internal/client/addrproc.go

@@ -11,6 +11,7 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/rdns"
 	"github.com/AdguardTeam/AdGuardHome/internal/whois"
 	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"github.com/AdguardTeam/golibs/netutil"
 )
@@ -21,7 +22,7 @@ const ErrClosed errors.Error = "use of closed address processor"
 
 // AddressProcessor is the interface for types that can process clients.
 type AddressProcessor interface {
-	Process(ctx context.Context, ip netip.Addr)
+	Process(ip netip.Addr)
 	Close() (err error)
 }
 
@@ -32,7 +33,7 @@ type EmptyAddrProc struct{}
 var _ AddressProcessor = EmptyAddrProc{}
 
 // Process implements the [AddressProcessor] interface for EmptyAddrProc.
-func (EmptyAddrProc) Process(_ context.Context, _ netip.Addr) {}
+func (EmptyAddrProc) Process(_ netip.Addr) {}
 
 // Close implements the [AddressProcessor] interface for EmptyAddrProc.
 func (EmptyAddrProc) Close() (_ error) { return nil }
@@ -89,15 +90,12 @@ type DefaultAddrProcConfig struct {
 type AddressUpdater interface {
 	// UpdateAddress updates information about an IP address, setting host (if
 	// not empty) and WHOIS information (if not nil).
-	UpdateAddress(ctx context.Context, ip netip.Addr, host string, info *whois.Info)
+	UpdateAddress(ip netip.Addr, host string, info *whois.Info)
 }
 
 // DefaultAddrProc processes incoming client addresses with rDNS and WHOIS, if
 // configured, and updates that information in a client storage.
 type DefaultAddrProc struct {
-	// logger is used to log the operation of address processor.
-	logger *slog.Logger
-
 	// clientIPsMu serializes closure of clientIPs and access to isClosed.
 	clientIPsMu *sync.Mutex
 
@@ -144,7 +142,6 @@ const (
 // not be nil.
 func NewDefaultAddrProc(c *DefaultAddrProcConfig) (p *DefaultAddrProc) {
 	p = &DefaultAddrProc{
-		logger:         c.BaseLogger.With(slogutil.KeyPrefix, "addrproc"),
 		clientIPsMu:    &sync.Mutex{},
 		clientIPs:      make(chan netip.Addr, defaultQueueSize),
 		rdns:           &rdns.Empty{},
@@ -167,13 +164,10 @@ func NewDefaultAddrProc(c *DefaultAddrProcConfig) (p *DefaultAddrProc) {
 		p.whois = newWHOIS(c.BaseLogger.With(slogutil.KeyPrefix, "whois"), c.DialContext)
 	}
 
-	// TODO(s.chzhen):  Pass context.
-	ctx := context.TODO()
-
-	go p.process(ctx, c.CatchPanics)
+	go p.process(c.CatchPanics)
 
 	for _, ip := range c.InitialAddresses {
-		p.Process(ctx, ip)
+		p.Process(ip)
 	}
 
 	return p
@@ -216,7 +210,7 @@ func newWHOIS(logger *slog.Logger, dialFunc aghnet.DialContextFunc) (w whois.Int
 var _ AddressProcessor = (*DefaultAddrProc)(nil)
 
 // Process implements the [AddressProcessor] interface for *DefaultAddrProc.
-func (p *DefaultAddrProc) Process(ctx context.Context, ip netip.Addr) {
+func (p *DefaultAddrProc) Process(ip netip.Addr) {
 	p.clientIPsMu.Lock()
 	defer p.clientIPsMu.Unlock()
 
@@ -228,42 +222,38 @@ func (p *DefaultAddrProc) Process(ctx context.Context, ip netip.Addr) {
 	case p.clientIPs <- ip:
 		// Go on.
 	default:
-		p.logger.DebugContext(ctx, "ip channel is full", "len", len(p.clientIPs))
+		log.Debug("clients: ip channel is full; len: %d", len(p.clientIPs))
 	}
 }
 
 // process processes the incoming client IP-address information.  It is intended
 // to be used as a goroutine.  Once clientIPs is closed, process exits.
-func (p *DefaultAddrProc) process(ctx context.Context, catchPanics bool) {
+func (p *DefaultAddrProc) process(catchPanics bool) {
 	if catchPanics {
-		defer slogutil.RecoverAndLog(ctx, p.logger)
+		defer log.OnPanic("addrProcessor.process")
 	}
 
-	p.logger.InfoContext(ctx, "processing addresses")
+	log.Info("clients: processing addresses")
+
+	ctx := context.TODO()
 
 	for ip := range p.clientIPs {
 		host := p.processRDNS(ctx, ip)
 		info := p.processWHOIS(ctx, ip)
 
-		p.addrUpdater.UpdateAddress(ctx, ip, host, info)
+		p.addrUpdater.UpdateAddress(ip, host, info)
 	}
 
-	p.logger.InfoContext(ctx, "finished processing addresses")
+	log.Info("clients: finished processing addresses")
 }
 
 // processRDNS resolves the clients' IP addresses using reverse DNS.  host is
 // empty if there were errors or if the information hasn't changed.
 func (p *DefaultAddrProc) processRDNS(ctx context.Context, ip netip.Addr) (host string) {
 	start := time.Now()
-	p.logger.DebugContext(ctx, "processing rdns", "ip", ip)
+	log.Debug("clients: processing %s with rdns", ip)
 	defer func() {
-		p.logger.DebugContext(
-			ctx,
-			"finished processing rdns",
-			"ip", ip,
-			"host", host,
-			"elapsed", time.Since(start),
-		)
+		log.Debug("clients: finished processing %s with rdns in %s", ip, time.Since(start))
 	}()
 
 	ok := p.shouldResolve(ip)
@@ -290,15 +280,9 @@ func (p *DefaultAddrProc) shouldResolve(ip netip.Addr) (ok bool) {
 // hasn't changed.
 func (p *DefaultAddrProc) processWHOIS(ctx context.Context, ip netip.Addr) (info *whois.Info) {
 	start := time.Now()
-	p.logger.DebugContext(ctx, "processing whois", "ip", ip)
+	log.Debug("clients: processing %s with whois", ip)
 	defer func() {
-		p.logger.DebugContext(
-			ctx,
-			"finished processing whois",
-			"ip", ip,
-			"whois", info,
-			"elapsed", time.Since(start),
-		)
+		log.Debug("clients: finished processing %s with whois in %s", ip, time.Since(start))
 	}()
 
 	// TODO(s.chzhen):  Move the timeout logic from WHOIS configuration to the

internal/client/addrproc_test.go

@@ -26,8 +26,7 @@ func TestEmptyAddrProc(t *testing.T) {
 	p := client.EmptyAddrProc{}
 
 	assert.NotPanics(t, func() {
-		ctx := testutil.ContextWithTimeout(t, testTimeout)
-		p.Process(ctx, testIP)
+		p.Process(testIP)
 	})
 
 	assert.NotPanics(t, func() {
@@ -121,8 +120,7 @@ func TestDefaultAddrProc_Process_rDNS(t *testing.T) {
 			})
 			testutil.CleanupAndRequireSuccess(t, p.Close)
 
-			ctx := testutil.ContextWithTimeout(t, testTimeout)
-			p.Process(ctx, tc.ip)
+			p.Process(tc.ip)
 
 			if !tc.wantUpd {
 				return
@@ -148,8 +146,8 @@ func newOnUpdateAddress(
 	ips chan<- netip.Addr,
 	hosts chan<- string,
 	infos chan<- *whois.Info,
-) (f func(ctx context.Context, ip netip.Addr, host string, info *whois.Info)) {
-	return func(ctx context.Context, ip netip.Addr, host string, info *whois.Info) {
+) (f func(ip netip.Addr, host string, info *whois.Info)) {
+	return func(ip netip.Addr, host string, info *whois.Info) {
 		if !want && (host != "" || info != nil) {
 			panic(fmt.Errorf("got unexpected update for %v with %q and %v", ip, host, info))
 		}
@@ -232,8 +230,7 @@ func TestDefaultAddrProc_Process_WHOIS(t *testing.T) {
 			})
 			testutil.CleanupAndRequireSuccess(t, p.Close)
 
-			ctx := testutil.ContextWithTimeout(t, testTimeout)
-			p.Process(ctx, testIP)
+			p.Process(testIP)
 
 			if !tc.wantUpd {
 				return
@@ -254,9 +251,7 @@ func TestDefaultAddrProc_Process_WHOIS(t *testing.T) {
 func TestDefaultAddrProc_Close(t *testing.T) {
 	t.Parallel()
 
-	p := client.NewDefaultAddrProc(&client.DefaultAddrProcConfig{
-		BaseLogger: slogutil.NewDiscardLogger(),
-	})
+	p := client.NewDefaultAddrProc(&client.DefaultAddrProcConfig{})
 
 	err := p.Close()
 	assert.NoError(t, err)

internal/client/index.go

@@ -2,7 +2,6 @@ package client
 
 import (
 	"fmt"
-	"maps"
 	"net"
 	"net/netip"
 	"slices"
@@ -10,6 +9,7 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
 	"github.com/AdguardTeam/golibs/errors"
+	"golang.org/x/exp/maps"
 )
 
 // macKey contains MAC as byte array of 6, 8, or 20 bytes.
@@ -330,14 +330,12 @@ func (ci *index) size() (n int) {
 // rangeByName is like [Index.Range] but sorts the persistent clients by name
 // before iterating ensuring a predictable order.
 func (ci *index) rangeByName(f func(c *Persistent) (cont bool)) {
-	clients := slices.SortedStableFunc(
-		maps.Values(ci.uidToClient),
-		func(a, b *Persistent) (res int) {
-			return strings.Compare(a.Name, b.Name)
-		},
-	)
+	cs := maps.Values(ci.uidToClient)
+	slices.SortFunc(cs, func(a, b *Persistent) (n int) {
+		return strings.Compare(a.Name, b.Name)
+	})
 
-	for _, c := range clients {
+	for _, c := range cs {
 		if !f(c) {
 			break
 		}

internal/client/persistent.go

@@ -1,20 +1,20 @@
 package client
 
 import (
-	"context"
 	"encoding"
 	"fmt"
-	"log/slog"
 	"net"
 	"net/netip"
 	"slices"
 	"strings"
+	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
+	"github.com/AdguardTeam/AdGuardHome/internal/filtering/safesearch"
 	"github.com/AdguardTeam/dnsproxy/proxy"
 	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
+	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/google/uuid"
 )
@@ -136,7 +136,7 @@ type Persistent struct {
 
 // validate returns an error if persistent client information contains errors.
 // allTags must be sorted.
-func (c *Persistent) validate(ctx context.Context, l *slog.Logger, allTags []string) (err error) {
+func (c *Persistent) validate(allTags []string) (err error) {
 	switch {
 	case c.Name == "":
 		return errors.Error("empty name")
@@ -153,7 +153,7 @@ func (c *Persistent) validate(ctx context.Context, l *slog.Logger, allTags []str
 
 	err = conf.Close()
 	if err != nil {
-		l.ErrorContext(ctx, "client: closing upstream config", slogutil.KeyError, err)
+		log.Error("client: closing upstream config: %s", err)
 	}
 
 	for _, t := range c.Tags {
@@ -323,3 +323,20 @@ func (c *Persistent) CloseUpstreams() (err error) {
 
 	return nil
 }
+
+// SetSafeSearch initializes and sets the safe search filter for this client.
+func (c *Persistent) SetSafeSearch(
+	conf filtering.SafeSearchConfig,
+	cacheSize uint,
+	cacheTTL time.Duration,
+) (err error) {
+	ss, err := safesearch.NewDefault(conf, fmt.Sprintf("client %q", c.Name), cacheSize, cacheTTL)
+	if err != nil {
+		// Don't wrap the error, because it's informative enough as is.
+		return err
+	}
+
+	c.SafeSearch = ss
+
+	return nil
+}

internal/client/storage.go

@@ -3,7 +3,6 @@ package client
 import (
 	"context"
 	"fmt"
-	"log/slog"
 	"net"
 	"net/netip"
 	"slices"
@@ -15,7 +14,7 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/whois"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/hostsfile"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
+	"github.com/AdguardTeam/golibs/log"
 )
 
 // allowedTags is the list of available client tags.
@@ -84,10 +83,6 @@ type HostsContainer interface {
 
 // StorageConfig is the client storage configuration structure.
 type StorageConfig struct {
-	// Logger is used for logging the operation of the client storage.  It must
-	// not be nil.
-	Logger *slog.Logger
-
 	// DHCP is used to match IPs against MACs of persistent clients and update
 	// [SourceDHCP] runtime client information.  It must not be nil.
 	DHCP DHCP
@@ -113,10 +108,6 @@ type StorageConfig struct {
 
 // Storage contains information about persistent and runtime clients.
 type Storage struct {
-	// logger is used for logging the operation of the client storage.  It must
-	// not be nil.
-	logger *slog.Logger
-
 	// mu protects indexes of persistent and runtime clients.
 	mu *sync.Mutex
 
@@ -154,12 +145,12 @@ type Storage struct {
 }
 
 // NewStorage returns initialized client storage.  conf must not be nil.
-func NewStorage(ctx context.Context, conf *StorageConfig) (s *Storage, err error) {
+func NewStorage(conf *StorageConfig) (s *Storage, err error) {
 	tags := slices.Clone(allowedTags)
 	slices.Sort(tags)
 
 	s = &Storage{
-		logger:                 conf.Logger,
+		allowedTags:            tags,
 		mu:                     &sync.Mutex{},
 		index:                  newIndex(),
 		runtimeIndex:           newRuntimeIndex(),
@@ -167,19 +158,18 @@ func NewStorage(ctx context.Context, conf *StorageConfig) (s *Storage, err error
 		etcHosts:               conf.EtcHosts,
 		arpDB:                  conf.ARPDB,
 		done:                   make(chan struct{}),
-		allowedTags:            tags,
 		arpClientsUpdatePeriod: conf.ARPClientsUpdatePeriod,
 		runtimeSourceDHCP:      conf.RuntimeSourceDHCP,
 	}
 
 	for i, p := range conf.InitialClients {
-		err = s.Add(ctx, p)
+		err = s.Add(p)
 		if err != nil {
 			return nil, fmt.Errorf("adding client %q at index %d: %w", p.Name, i, err)
 		}
 	}
 
-	s.ReloadARP(ctx)
+	s.ReloadARP()
 
 	return s, nil
 }
@@ -187,9 +177,9 @@ func NewStorage(ctx context.Context, conf *StorageConfig) (s *Storage, err error
 // Start starts the goroutines for updating the runtime client information.
 //
 // TODO(s.chzhen):  Pass context.
-func (s *Storage) Start(ctx context.Context) (err error) {
-	go s.periodicARPUpdate(ctx)
-	go s.handleHostsUpdates(ctx)
+func (s *Storage) Start(_ context.Context) (err error) {
+	go s.periodicARPUpdate()
+	go s.handleHostsUpdates()
 
 	return nil
 }
@@ -205,15 +195,15 @@ func (s *Storage) Shutdown(_ context.Context) (err error) {
 
 // periodicARPUpdate periodically reloads runtime clients from ARP.  It is
 // intended to be used as a goroutine.
-func (s *Storage) periodicARPUpdate(ctx context.Context) {
-	defer slogutil.RecoverAndLog(ctx, s.logger)
+func (s *Storage) periodicARPUpdate() {
+	defer log.OnPanic("storage")
 
 	t := time.NewTicker(s.arpClientsUpdatePeriod)
 
 	for {
 		select {
 		case <-t.C:
-			s.ReloadARP(ctx)
+			s.ReloadARP()
 		case <-s.done:
 			return
 		}
@@ -221,28 +211,28 @@ func (s *Storage) periodicARPUpdate(ctx context.Context) {
 }
 
 // ReloadARP reloads runtime clients from ARP, if configured.
-func (s *Storage) ReloadARP(ctx context.Context) {
+func (s *Storage) ReloadARP() {
 	if s.arpDB != nil {
-		s.addFromSystemARP(ctx)
+		s.addFromSystemARP()
 	}
 }
 
 // addFromSystemARP adds the IP-hostname pairings from the output of the arp -a
 // command.
-func (s *Storage) addFromSystemARP(ctx context.Context) {
+func (s *Storage) addFromSystemARP() {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
 	if err := s.arpDB.Refresh(); err != nil {
 		s.arpDB = arpdb.Empty{}
-		s.logger.ErrorContext(ctx, "refreshing arp container", slogutil.KeyError, err)
+		log.Error("refreshing arp container: %s", err)
 
 		return
 	}
 
 	ns := s.arpDB.Neighbors()
 	if len(ns) == 0 {
-		s.logger.DebugContext(ctx, "refreshing arp container: the update is empty")
+		log.Debug("refreshing arp container: the update is empty")
 
 		return
 	}
@@ -256,22 +246,17 @@ func (s *Storage) addFromSystemARP(ctx context.Context) {
 
 	removed := s.runtimeIndex.removeEmpty()
 
-	s.logger.DebugContext(
-		ctx,
-		"updating client aliases from arp neighborhood",
-		"added", len(ns),
-		"removed", removed,
-	)
+	log.Debug("storage: added %d, removed %d client aliases from arp neighborhood", len(ns), removed)
 }
 
 // handleHostsUpdates receives the updates from the hosts container and adds
 // them to the clients storage.  It is intended to be used as a goroutine.
-func (s *Storage) handleHostsUpdates(ctx context.Context) {
+func (s *Storage) handleHostsUpdates() {
 	if s.etcHosts == nil {
 		return
 	}
 
-	defer slogutil.RecoverAndLog(ctx, s.logger)
+	defer log.OnPanic("storage")
 
 	for {
 		select {
@@ -280,7 +265,7 @@ func (s *Storage) handleHostsUpdates(ctx context.Context) {
 				return
 			}
 
-			s.addFromHostsFile(ctx, upd)
+			s.addFromHostsFile(upd)
 		case <-s.done:
 			return
 		}
@@ -289,7 +274,7 @@ func (s *Storage) handleHostsUpdates(ctx context.Context) {
 
 // addFromHostsFile fills the client-hostname pairing index from the system's
 // hosts files.
-func (s *Storage) addFromHostsFile(ctx context.Context, hosts *hostsfile.DefaultStorage) {
+func (s *Storage) addFromHostsFile(hosts *hostsfile.DefaultStorage) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
@@ -309,19 +294,14 @@ func (s *Storage) addFromHostsFile(ctx context.Context, hosts *hostsfile.Default
 	})
 
 	removed := s.runtimeIndex.removeEmpty()
-	s.logger.DebugContext(
-		ctx,
-		"updating client aliases from system hosts file",
-		"added", added,
-		"removed", removed,
-	)
+	log.Debug("storage: added %d, removed %d client aliases from system hosts file", added, removed)
 }
 
 // type check
 var _ AddressUpdater = (*Storage)(nil)
 
 // UpdateAddress implements the [AddressUpdater] interface for *Storage
-func (s *Storage) UpdateAddress(ctx context.Context, ip netip.Addr, host string, info *whois.Info) {
+func (s *Storage) UpdateAddress(ip netip.Addr, host string, info *whois.Info) {
 	// Common fast path optimization.
 	if host == "" && info == nil {
 		return
@@ -335,12 +315,12 @@ func (s *Storage) UpdateAddress(ctx context.Context, ip netip.Addr, host string,
 	}
 
 	if info != nil {
-		s.setWHOISInfo(ctx, ip, info)
+		s.setWHOISInfo(ip, info)
 	}
 }
 
 // UpdateDHCP updates [SourceDHCP] runtime client information.
-func (s *Storage) UpdateDHCP(ctx context.Context) {
+func (s *Storage) UpdateDHCP() {
 	if s.dhcp == nil || !s.runtimeSourceDHCP {
 		return
 	}
@@ -358,23 +338,14 @@ func (s *Storage) UpdateDHCP(ctx context.Context) {
 	}
 
 	removed := s.runtimeIndex.removeEmpty()
-	s.logger.DebugContext(
-		ctx,
-		"updating client aliases from dhcp",
-		"added", added,
-		"removed", removed,
-	)
+	log.Debug("storage: added %d, removed %d client aliases from dhcp", added, removed)
 }
 
 // setWHOISInfo sets the WHOIS information for a runtime client.
-func (s *Storage) setWHOISInfo(ctx context.Context, ip netip.Addr, wi *whois.Info) {
+func (s *Storage) setWHOISInfo(ip netip.Addr, wi *whois.Info) {
 	_, ok := s.index.findByIP(ip)
 	if ok {
-		s.logger.DebugContext(
-			ctx,
-			"persistent client is already created, ignore whois info",
-			"ip", ip,
-		)
+		log.Debug("storage: client for %s is already created, ignore whois info", ip)
 
 		return
 	}
@@ -387,14 +358,14 @@ func (s *Storage) setWHOISInfo(ctx context.Context, ip netip.Addr, wi *whois.Inf
 
 	rc.setWHOIS(wi)
 
-	s.logger.DebugContext(ctx, "set whois info for runtime client", "ip", ip, "whois", wi)
+	log.Debug("storage: set whois info for runtime client with ip %s: %+v", ip, wi)
 }
 
 // Add stores persistent client information or returns an error.
-func (s *Storage) Add(ctx context.Context, p *Persistent) (err error) {
+func (s *Storage) Add(p *Persistent) (err error) {
 	defer func() { err = errors.Annotate(err, "adding client: %w") }()
 
-	err = p.validate(ctx, s.logger, s.allowedTags)
+	err = p.validate(s.allowedTags)
 	if err != nil {
 		// Don't wrap the error since there is already an annotation deferred.
 		return err
@@ -417,13 +388,7 @@ func (s *Storage) Add(ctx context.Context, p *Persistent) (err error) {
 
 	s.index.add(p)
 
-	s.logger.DebugContext(
-		ctx,
-		"client added",
-		"name", p.Name,
-		"ids", p.IDs(),
-		"clients_count", s.index.size(),
-	)
+	log.Debug("client storage: added %q: IDs: %q [%d]", p.Name, p.IDs(), s.index.size())
 
 	return nil
 }
@@ -505,7 +470,7 @@ func (s *Storage) FindByMAC(mac net.HardwareAddr) (p *Persistent, ok bool) {
 
 // RemoveByName removes persistent client information.  ok is false if no such
 // client exists by that name.
-func (s *Storage) RemoveByName(ctx context.Context, name string) (ok bool) {
+func (s *Storage) RemoveByName(name string) (ok bool) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
@@ -515,7 +480,7 @@ func (s *Storage) RemoveByName(ctx context.Context, name string) (ok bool) {
 	}
 
 	if err := p.CloseUpstreams(); err != nil {
-		s.logger.ErrorContext(ctx, "removing client", "name", p.Name, slogutil.KeyError, err)
+		log.Error("client storage: removing client %q: %s", p.Name, err)
 	}
 
 	s.index.remove(p)
@@ -525,10 +490,10 @@ func (s *Storage) RemoveByName(ctx context.Context, name string) (ok bool) {
 
 // Update finds the stored persistent client by its name and updates its
 // information from p.
-func (s *Storage) Update(ctx context.Context, name string, p *Persistent) (err error) {
+func (s *Storage) Update(name string, p *Persistent) (err error) {
 	defer func() { err = errors.Annotate(err, "updating client: %w") }()
 
-	err = p.validate(ctx, s.logger, s.allowedTags)
+	err = p.validate(s.allowedTags)
 	if err != nil {
 		// Don't wrap the error since there is already an annotation deferred.
 		return err

internal/client/storage_test.go

@@ -15,25 +15,11 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/dhcpsvc"
 	"github.com/AdguardTeam/AdGuardHome/internal/whois"
 	"github.com/AdguardTeam/golibs/hostsfile"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-// newTestStorage is a helper function that returns initialized storage.
-func newTestStorage(tb testing.TB) (s *client.Storage) {
-	tb.Helper()
-
-	ctx := testutil.ContextWithTimeout(tb, testTimeout)
-	s, err := client.NewStorage(ctx, &client.StorageConfig{
-		Logger: slogutil.NewDiscardLogger(),
-	})
-	require.NoError(tb, err)
-
-	return s
-}
-
 // testHostsContainer is a mock implementation of the [client.HostsContainer]
 // interface.
 type testHostsContainer struct {
@@ -124,9 +110,7 @@ func TestStorage_Add_hostsfile(t *testing.T) {
 		onUpd: func() (updates <-chan *hostsfile.DefaultStorage) { return hostCh },
 	}
 
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	storage, err := client.NewStorage(ctx, &client.StorageConfig{
-		Logger:                 slogutil.NewDiscardLogger(),
+	storage, err := client.NewStorage(&client.StorageConfig{
 		DHCP:                   client.EmptyDHCP{},
 		EtcHosts:               h,
 		ARPClientsUpdatePeriod: testTimeout / 10,
@@ -214,9 +198,7 @@ func TestStorage_Add_arp(t *testing.T) {
 		},
 	}
 
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	storage, err := client.NewStorage(ctx, &client.StorageConfig{
-		Logger:                 slogutil.NewDiscardLogger(),
+	storage, err := client.NewStorage(&client.StorageConfig{
 		DHCP:                   client.EmptyDHCP{},
 		ARPDB:                  a,
 		ARPClientsUpdatePeriod: testTimeout / 10,
@@ -291,10 +273,8 @@ func TestStorage_Add_whois(t *testing.T) {
 		cliName3 = "client_three"
 	)
 
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	storage, err := client.NewStorage(ctx, &client.StorageConfig{
-		Logger: slogutil.NewDiscardLogger(),
-		DHCP:   client.EmptyDHCP{},
+	storage, err := client.NewStorage(&client.StorageConfig{
+		DHCP: client.EmptyDHCP{},
 	})
 	require.NoError(t, err)
 
@@ -304,7 +284,7 @@ func TestStorage_Add_whois(t *testing.T) {
 	}
 
 	t.Run("new_client", func(t *testing.T) {
-		storage.UpdateAddress(ctx, cliIP1, "", whois)
+		storage.UpdateAddress(cliIP1, "", whois)
 		cli1 := storage.ClientRuntime(cliIP1)
 		require.NotNil(t, cli1)
 
@@ -312,8 +292,8 @@ func TestStorage_Add_whois(t *testing.T) {
 	})
 
 	t.Run("existing_runtime_client", func(t *testing.T) {
-		storage.UpdateAddress(ctx, cliIP2, cliName2, nil)
-		storage.UpdateAddress(ctx, cliIP2, "", whois)
+		storage.UpdateAddress(cliIP2, cliName2, nil)
+		storage.UpdateAddress(cliIP2, "", whois)
 
 		cli2 := storage.ClientRuntime(cliIP2)
 		require.NotNil(t, cli2)
@@ -324,14 +304,14 @@ func TestStorage_Add_whois(t *testing.T) {
 	})
 
 	t.Run("can't_set_persistent_client", func(t *testing.T) {
-		err = storage.Add(ctx, &client.Persistent{
+		err = storage.Add(&client.Persistent{
 			Name: cliName3,
 			UID:  client.MustNewUID(),
 			IPs:  []netip.Addr{cliIP3},
 		})
 		require.NoError(t, err)
 
-		storage.UpdateAddress(ctx, cliIP3, "", whois)
+		storage.UpdateAddress(cliIP3, "", whois)
 		rc := storage.ClientRuntime(cliIP3)
 		require.Nil(t, rc)
 	})
@@ -384,9 +364,7 @@ func TestClientsDHCP(t *testing.T) {
 		},
 	}
 
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	storage, err := client.NewStorage(ctx, &client.StorageConfig{
-		Logger:            slogutil.NewDiscardLogger(),
+	storage, err := client.NewStorage(&client.StorageConfig{
 		DHCP:              d,
 		RuntimeSourceDHCP: true,
 	})
@@ -400,7 +378,7 @@ func TestClientsDHCP(t *testing.T) {
 	})
 
 	t.Run("find_persistent", func(t *testing.T) {
-		err = storage.Add(ctx, &client.Persistent{
+		err = storage.Add(&client.Persistent{
 			Name: prsCliName,
 			UID:  client.MustNewUID(),
 			MACs: []net.HardwareAddr{prsCliMAC},
@@ -415,7 +393,7 @@ func TestClientsDHCP(t *testing.T) {
 
 	t.Run("leases", func(t *testing.T) {
 		delete(ipToHost, cliIP1)
-		storage.UpdateDHCP(ctx)
+		storage.UpdateDHCP()
 
 		cli1 := storage.ClientRuntime(cliIP1)
 		require.Nil(t, cli1)
@@ -443,19 +421,16 @@ func TestClientsDHCP(t *testing.T) {
 }
 
 func TestClientsAddExisting(t *testing.T) {
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-
 	t.Run("simple", func(t *testing.T) {
-		storage, err := client.NewStorage(ctx, &client.StorageConfig{
-			Logger: slogutil.NewDiscardLogger(),
-			DHCP:   client.EmptyDHCP{},
+		storage, err := client.NewStorage(&client.StorageConfig{
+			DHCP: client.EmptyDHCP{},
 		})
 		require.NoError(t, err)
 
 		ip := netip.MustParseAddr("1.1.1.1")
 
 		// Add a client.
-		err = storage.Add(ctx, &client.Persistent{
+		err = storage.Add(&client.Persistent{
 			Name:    "client1",
 			UID:     client.MustNewUID(),
 			IPs:     []netip.Addr{ip, netip.MustParseAddr("1:2:3::4")},
@@ -465,7 +440,7 @@ func TestClientsAddExisting(t *testing.T) {
 		require.NoError(t, err)
 
 		// Now add an auto-client with the same IP.
-		storage.UpdateAddress(ctx, ip, "test", nil)
+		storage.UpdateAddress(ip, "test", nil)
 		rc := storage.ClientRuntime(ip)
 		assert.True(t, compareRuntimeInfo(rc, client.SourceRDNS, "test"))
 	})
@@ -493,9 +468,8 @@ func TestClientsAddExisting(t *testing.T) {
 		dhcpServer, err := dhcpd.Create(config)
 		require.NoError(t, err)
 
-		storage, err := client.NewStorage(ctx, &client.StorageConfig{
-			Logger: slogutil.NewDiscardLogger(),
-			DHCP:   dhcpServer,
+		storage, err := client.NewStorage(&client.StorageConfig{
+			DHCP: dhcpServer,
 		})
 		require.NoError(t, err)
 
@@ -510,7 +484,7 @@ func TestClientsAddExisting(t *testing.T) {
 		require.NoError(t, err)
 
 		// Add a new client with the same IP as for a client with MAC.
-		err = storage.Add(ctx, &client.Persistent{
+		err = storage.Add(&client.Persistent{
 			Name: "client2",
 			UID:  client.MustNewUID(),
 			IPs:  []netip.Addr{ip},
@@ -518,7 +492,7 @@ func TestClientsAddExisting(t *testing.T) {
 		require.NoError(t, err)
 
 		// Add a new client with the IP from the first client's IP range.
-		err = storage.Add(ctx, &client.Persistent{
+		err = storage.Add(&client.Persistent{
 			Name: "client3",
 			UID:  client.MustNewUID(),
 			IPs:  []netip.Addr{netip.MustParseAddr("2.2.2.2")},
@@ -532,16 +506,14 @@ func TestClientsAddExisting(t *testing.T) {
 func newStorage(tb testing.TB, m []*client.Persistent) (s *client.Storage) {
 	tb.Helper()
 
-	ctx := testutil.ContextWithTimeout(tb, testTimeout)
-	s, err := client.NewStorage(ctx, &client.StorageConfig{
-		Logger: slogutil.NewDiscardLogger(),
-		DHCP:   client.EmptyDHCP{},
+	s, err := client.NewStorage(&client.StorageConfig{
+		DHCP: client.EmptyDHCP{},
 	})
 	require.NoError(tb, err)
 
 	for _, c := range m {
 		c.UID = client.MustNewUID()
-		require.NoError(tb, s.Add(ctx, c))
+		require.NoError(tb, s.Add(c))
 	}
 
 	require.Equal(tb, len(m), s.Size())
@@ -583,8 +555,9 @@ func TestStorage_Add(t *testing.T) {
 		UID:       existingClientUID,
 	}
 
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	s := newTestStorage(t)
+	s, err := client.NewStorage(&client.StorageConfig{})
+	require.NoError(t, err)
+
 	tags := s.AllowedTags()
 	require.NotZero(t, len(tags))
 	require.True(t, slices.IsSorted(tags))
@@ -595,7 +568,7 @@ func TestStorage_Add(t *testing.T) {
 	_, ok = slices.BinarySearch(tags, notAllowedTag)
 	require.False(t, ok)
 
-	err := s.Add(ctx, existingClient)
+	err = s.Add(existingClient)
 	require.NoError(t, err)
 
 	testCases := []struct {
@@ -696,7 +669,7 @@ func TestStorage_Add(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			err = s.Add(ctx, tc.cli)
+			err = s.Add(tc.cli)
 
 			testutil.AssertErrorMsg(t, tc.wantErrMsg, err)
 		})
@@ -714,9 +687,10 @@ func TestStorage_RemoveByName(t *testing.T) {
 		UID:  client.MustNewUID(),
 	}
 
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	s := newTestStorage(t)
-	err := s.Add(ctx, existingClient)
+	s, err := client.NewStorage(&client.StorageConfig{})
+	require.NoError(t, err)
+
+	err = s.Add(existingClient)
 	require.NoError(t, err)
 
 	testCases := []struct {
@@ -735,17 +709,19 @@ func TestStorage_RemoveByName(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			tc.want(t, s.RemoveByName(ctx, tc.cliName))
+			tc.want(t, s.RemoveByName(tc.cliName))
 		})
 	}
 
 	t.Run("duplicate_remove", func(t *testing.T) {
-		s = newTestStorage(t)
-		err = s.Add(ctx, existingClient)
+		s, err = client.NewStorage(&client.StorageConfig{})
 		require.NoError(t, err)
 
-		assert.True(t, s.RemoveByName(ctx, existingName))
-		assert.False(t, s.RemoveByName(ctx, existingName))
+		err = s.Add(existingClient)
+		require.NoError(t, err)
+
+		assert.True(t, s.RemoveByName(existingName))
+		assert.False(t, s.RemoveByName(existingName))
 	})
 }
 
@@ -1104,7 +1080,6 @@ func TestStorage_Update(t *testing.T) {
 			`uses the same ClientID "obstructing_client_id"`,
 	}}
 
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			s := newStorage(
@@ -1115,7 +1090,7 @@ func TestStorage_Update(t *testing.T) {
 				},
 			)
 
-			err := s.Update(ctx, clientName, tc.cli)
+			err := s.Update(clientName, tc.cli)
 			testutil.AssertErrorMsg(t, tc.wantErrMsg, err)
 		})
 	}

internal/dhcpd/v4_unix.go

@@ -18,11 +18,9 @@ import (
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/AdguardTeam/golibs/timeutil"
+	"github.com/go-ping/ping"
 	"github.com/insomniacslk/dhcp/dhcpv4"
 	"github.com/insomniacslk/dhcp/dhcpv4/server4"
-
-	//lint:ignore SA1019 See the TODO in go.mod.
-	"github.com/go-ping/ping"
 )
 
 // v4Server is a DHCPv4 server.

internal/dhcpsvc/config.go

@@ -3,12 +3,11 @@ package dhcpsvc
 import (
 	"fmt"
 	"log/slog"
-	"maps"
 	"os"
-	"slices"
 	"time"
 
 	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/mapsutil"
 	"github.com/AdguardTeam/golibs/netutil"
 )
 
@@ -79,13 +78,14 @@ func (conf *Config) Validate() (err error) {
 		return errors.Join(errs...)
 	}
 
-	for _, iface := range slices.Sorted(maps.Keys(conf.Interfaces)) {
-		ic := conf.Interfaces[iface]
+	mapsutil.SortedRange(conf.Interfaces, func(iface string, ic *InterfaceConfig) (ok bool) {
 		err = ic.validate()
 		if err != nil {
 			errs = append(errs, fmt.Errorf("interface %q: %w", iface, err))
 		}
-	}
+
+		return true
+	})
 
 	return errors.Join(errs...)
 }

internal/dhcpsvc/dhcpsvc.go

@@ -82,7 +82,7 @@ type Empty struct{}
 var _ agh.ServiceWithConfig[*Config] = Empty{}
 
 // Start implements the [Service] interface for Empty.
-func (Empty) Start(_ context.Context) (err error) { return nil }
+func (Empty) Start() (err error) { return nil }
 
 // Shutdown implements the [Service] interface for Empty.
 func (Empty) Shutdown(_ context.Context) (err error) { return nil }

internal/dhcpsvc/server.go

@@ -4,15 +4,14 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
-	"maps"
 	"net"
 	"net/netip"
-	"slices"
 	"sync"
 	"sync/atomic"
 	"time"
 
 	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/mapsutil"
 )
 
 // DHCPServer is a DHCP server for both IPv4 and IPv6 address families.
@@ -108,8 +107,7 @@ func newInterfaces(
 	v6 = make(dhcpInterfacesV6, 0, len(ifaces))
 
 	var errs []error
-	for _, name := range slices.Sorted(maps.Keys(ifaces)) {
-		iface := ifaces[name]
+	mapsutil.SortedRange(ifaces, func(name string, iface *InterfaceConfig) (cont bool) {
 		var i4 *dhcpInterfaceV4
 		i4, err = newDHCPInterfaceV4(ctx, l, name, iface.IPv4)
 		if err != nil {
@@ -122,8 +120,9 @@ func newInterfaces(
 		if i6 != nil {
 			v6 = append(v6, i6)
 		}
-	}
 
+		return true
+	})
 	if err = errors.Join(errs...); err != nil {
 		return nil, nil, err
 	}

internal/dnsforward/dnsforward.go

@@ -818,8 +818,6 @@ func (s *Server) proxy() (p *proxy.Proxy) {
 }
 
 // Reconfigure applies the new configuration to the DNS server.
-//
-// TODO(a.garipov): This whole piece of API is weird and needs to be remade.
 func (s *Server) Reconfigure(conf *ServerConfig) error {
 	s.serverLock.Lock()
 	defer s.serverLock.Unlock()
@@ -833,15 +831,14 @@ func (s *Server) Reconfigure(conf *ServerConfig) error {
 	// We wait for some time and hope that this fd will be closed.
 	time.Sleep(100 * time.Millisecond)
 
-	if s.addrProc != nil {
-		err := s.addrProc.Close()
-		if err != nil {
-			log.Error("dnsforward: closing address processor: %s", err)
-		}
-	}
-
+	// TODO(a.garipov): This whole piece of API is weird and needs to be remade.
 	if conf == nil {
 		conf = &s.conf
+	} else {
+		closeErr := s.addrProc.Close()
+		if closeErr != nil {
+			log.Error("dnsforward: closing address processor: %s", closeErr)
+		}
 	}
 
 	// TODO(e.burkov):  It seems an error here brings the server down, which is

internal/dnsforward/dnsforward_test.go

@@ -500,10 +500,6 @@ func TestServerRace(t *testing.T) {
 }
 
 func TestSafeSearch(t *testing.T) {
-	const (
-		googleSafeSearch = "forcesafesearch.google.com."
-	)
-
 	safeSearchConf := filtering.SafeSearchConfig{
 		Enabled: true,
 		Google:  true,
@@ -517,14 +513,12 @@ func TestSafeSearch(t *testing.T) {
 		SafeSearchCacheSize: 1000,
 		CacheTime:           30,
 	}
-
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	safeSearch, err := safesearch.NewDefault(ctx, &safesearch.DefaultConfig{
-		Logger:         slogutil.NewDiscardLogger(),
-		ServicesConfig: safeSearchConf,
-		CacheSize:      filterConf.SafeSearchCacheSize,
-		CacheTTL:       time.Minute * time.Duration(filterConf.CacheTime),
-	})
+	safeSearch, err := safesearch.NewDefault(
+		safeSearchConf,
+		"",
+		filterConf.SafeSearchCacheSize,
+		time.Minute*time.Duration(filterConf.CacheTime),
+	)
 	require.NoError(t, err)
 
 	filterConf.SafeSearch = safeSearch
@@ -540,17 +534,10 @@ func TestSafeSearch(t *testing.T) {
 		ServePlainDNS: true,
 	}
 	s := createTestServer(t, filterConf, forwardConf)
-
-	ups := aghtest.NewUpstreamMock(func(req *dns.Msg) (resp *dns.Msg, err error) {
-		pt := testutil.PanicT{}
-		assert.Equal(pt, googleSafeSearch, req.Question[0].Name)
-
-		return aghtest.MatchedResponse(req, dns.TypeA, googleSafeSearch, "1.2.3.4"), nil
-	})
-	s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{ups}
-
 	startDeferStop(t, s)
+
 	addr := s.dnsProxy.Addr(proxy.ProtoUDP).String()
+	client := &dns.Client{}
 
 	yandexIP := netip.AddrFrom4([4]byte{213, 180, 193, 56})
 
@@ -597,8 +584,12 @@ func TestSafeSearch(t *testing.T) {
 			req := createTestMessage(tc.host)
 
 			var reply *dns.Msg
-			reply, err = dns.Exchange(req, addr)
-			require.NoError(t, err)
+			require.Eventually(t, func() (ok bool) {
+				reply, _, err = client.Exchange(req, addr)
+
+				return err == nil
+			}, testTimeout*10, testTimeout)
+			require.NoErrorf(t, err, "couldn't talk to server %s: %s", addr, err)
 
 			if tc.wantCNAME != "" {
 				require.Len(t, reply.Answer, 2)

internal/dnsforward/process.go

@@ -2,7 +2,6 @@ package dnsforward
 
 import (
 	"cmp"
-	"context"
 	"encoding/binary"
 	"net"
 	"net/netip"
@@ -204,8 +203,7 @@ func (s *Server) processClientIP(addr netip.Addr) {
 	s.serverLock.RLock()
 	defer s.serverLock.RUnlock()
 
-	// TODO(s.chzhen):  Pass context.
-	s.addrProc.Process(context.TODO(), addr)
+	s.addrProc.Process(addr)
 }
 
 // processDDRQuery responds to Discovery of Designated Resolvers (DDR) SVCB

internal/dnsforward/process_internal_test.go

@@ -2,7 +2,6 @@ package dnsforward
 
 import (
 	"cmp"
-	"context"
 	"net"
 	"net/netip"
 	"testing"
@@ -91,7 +90,7 @@ func TestServer_ProcessInitial(t *testing.T) {
 
 			var gotAddr netip.Addr
 			s.addrProc = &aghtest.AddressProcessor{
-				OnProcess: func(ctx context.Context, ip netip.Addr) { gotAddr = ip },
+				OnProcess: func(ip netip.Addr) { gotAddr = ip },
 				OnClose:   func() (err error) { panic("not implemented") },
 			}
 

internal/filtering/filter_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -33,7 +33,7 @@ func serveHTTPLocally(t *testing.T, h http.Handler) (urlStr string) {
 	require.IsType(t, (*net.TCPAddr)(nil), addr)
 
 	return (&url.URL{
-		Scheme: urlutil.SchemeHTTP,
+		Scheme: aghhttp.SchemeHTTP,
 		Host:   addr.String(),
 	}).String()
 }

internal/filtering/http.go

@@ -16,7 +16,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/miekg/dns"
 )
 
@@ -41,14 +40,19 @@ func (d *DNSFilter) validateFilterURL(urlStr string) (err error) {
 
 	u, err := url.ParseRequestURI(urlStr)
 	if err != nil {
-		// Don't wrap the error, because it's informative enough as is.
+		// Don't wrap the error since it's informative enough as is.
 		return err
 	}
 
-	err = urlutil.ValidateHTTPURL(u)
-	if err != nil {
-		// Don't wrap the error, because it's informative enough as is.
-		return err
+	if s := u.Scheme; s != aghhttp.SchemeHTTP && s != aghhttp.SchemeHTTPS {
+		return &url.Error{
+			Op:  "Check scheme",
+			URL: urlStr,
+			Err: fmt.Errorf("only %v allowed", []string{
+				aghhttp.SchemeHTTP,
+				aghhttp.SchemeHTTPS,
+			}),
+		}
 	}
 
 	return nil

internal/filtering/rulelist/engine.go

@@ -3,12 +3,11 @@ package rulelist
 import (
 	"context"
 	"fmt"
-	"log/slog"
 	"net/http"
 	"sync"
 
 	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
+	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/urlfilter"
 	"github.com/AdguardTeam/urlfilter/filterlist"
 	"github.com/c2h5oh/datasize"
@@ -19,9 +18,6 @@ import (
 //
 // TODO(a.garipov): Merge with [TextEngine] in some way?
 type Engine struct {
-	// logger is used to log the operation of the engine and its refreshes.
-	logger *slog.Logger
-
 	// mu protects engine and storage.
 	//
 	// TODO(a.garipov): See if anything else should be protected.
@@ -33,7 +29,8 @@ type Engine struct {
 	// storage is the filtering-rule storage.  It is saved here to close it.
 	storage *filterlist.RuleStorage
 
-	// name is the human-readable name of the engine.
+	// name is the human-readable name of the engine, like "allowed", "blocked",
+	// or "custom".
 	name string
 
 	// filters is the data about rule filters in this engine.
@@ -43,15 +40,12 @@ type Engine struct {
 // EngineConfig is the configuration for rule-list filtering engines created by
 // combining refreshable filters.
 type EngineConfig struct {
-	// Logger is used to log the operation of the engine.  It must not be nil.
-	Logger *slog.Logger
-
-	// name is the human-readable name of the engine; see [EngineNameAllow] and
-	// similar constants.
+	// Name is the human-readable name of this engine, like "allowed",
+	// "blocked", or "custom".
 	Name string
 
 	// Filters is the data about rule lists in this engine.  There must be no
-	// other references to the items of this slice.  Each item must not be nil.
+	// other references to the elements of this slice.
 	Filters []*Filter
 }
 
@@ -59,7 +53,6 @@ type EngineConfig struct {
 // refreshed, so a refresh should be performed before use.
 func NewEngine(c *EngineConfig) (e *Engine) {
 	return &Engine{
-		logger:  c.Logger,
 		mu:      &sync.RWMutex{},
 		name:    c.Name,
 		filters: c.Filters,
@@ -92,7 +85,7 @@ func (e *Engine) FilterRequest(
 }
 
 // currentEngine returns the current filtering engine.
-func (e *Engine) currentEngine() (engine *urlfilter.DNSEngine) {
+func (e *Engine) currentEngine() (enging *urlfilter.DNSEngine) {
 	e.mu.RLock()
 	defer e.mu.RUnlock()
 
@@ -103,7 +96,7 @@ func (e *Engine) currentEngine() (engine *urlfilter.DNSEngine) {
 // parseBuf, cli, cacheDir, and maxSize are used for updates of rule-list
 // filters; see [Filter.Refresh].
 //
-// TODO(a.garipov): Unexport and test in an internal test or through engine
+// TODO(a.garipov): Unexport and test in an internal test or through enigne
 // tests.
 func (e *Engine) Refresh(
 	ctx context.Context,
@@ -122,20 +115,20 @@ func (e *Engine) Refresh(
 	}
 
 	if len(filtersToRefresh) == 0 {
-		e.logger.InfoContext(ctx, "updating: no rule-list filters")
+		log.Info("filtering: updating engine %q: no rule-list filters", e.name)
 
 		return nil
 	}
 
 	engRefr := &engineRefresh{
-		logger:   e.logger,
-		httpCli:  cli,
-		cacheDir: cacheDir,
-		parseBuf: parseBuf,
-		maxSize:  maxSize,
+		httpCli:    cli,
+		cacheDir:   cacheDir,
+		engineName: e.name,
+		parseBuf:   parseBuf,
+		maxSize:    maxSize,
 	}
 
-	ruleLists, errs := engRefr.process(ctx, filtersToRefresh)
+	ruleLists, errs := engRefr.process(ctx, e.filters)
 	if isOneTimeoutError(errs) {
 		// Don't wrap the error since it's informative enough as is.
 		return err
@@ -148,14 +141,14 @@ func (e *Engine) Refresh(
 		return errors.Join(errs...)
 	}
 
-	e.resetStorage(ctx, storage)
+	e.resetStorage(storage)
 
 	return errors.Join(errs...)
 }
 
 // resetStorage sets e.storage and e.engine and closes the previous storage.
 // Errors from closing the previous storage are logged.
-func (e *Engine) resetStorage(ctx context.Context, storage *filterlist.RuleStorage) {
+func (e *Engine) resetStorage(storage *filterlist.RuleStorage) {
 	e.mu.Lock()
 	defer e.mu.Unlock()
 
@@ -168,7 +161,7 @@ func (e *Engine) resetStorage(ctx context.Context, storage *filterlist.RuleStora
 
 	err := prevStorage.Close()
 	if err != nil {
-		e.logger.WarnContext(ctx, "closing old storage", slogutil.KeyError, err)
+		log.Error("filtering: engine %q: closing old storage: %s", e.name, err)
 	}
 }
 
@@ -186,11 +179,11 @@ func isOneTimeoutError(errs []error) (ok bool) {
 
 // engineRefresh represents a single ongoing engine refresh.
 type engineRefresh struct {
-	logger   *slog.Logger
-	httpCli  *http.Client
-	cacheDir string
-	parseBuf []byte
-	maxSize  datasize.ByteSize
+	httpCli    *http.Client
+	cacheDir   string
+	engineName string
+	parseBuf   []byte
+	maxSize    datasize.ByteSize
 }
 
 // process runs updates of all given rule-list filters.  All errors are logged
@@ -223,12 +216,12 @@ func (r *engineRefresh) process(
 		errs = append(errs, err)
 
 		// Also log immediately, since the update can take a lot of time.
-		r.logger.ErrorContext(
-			ctx,
-			"updating rule list",
-			"uid", f.uid,
-			"url", f.url,
-			slogutil.KeyError, err,
+		log.Error(
+			"filtering: updating engine %q: rule list %s from url %q: %s\n",
+			r.engineName,
+			f.uid,
+			f.url,
+			err,
 		)
 	}
 
@@ -244,17 +237,17 @@ func (r *engineRefresh) processFilter(ctx context.Context, f *Filter) (err error
 	}
 
 	if prevChecksum == parseRes.Checksum {
-		r.logger.InfoContext(ctx, "no change in filter", "uid", f.uid)
+		log.Info("filtering: engine %q: filter %q: no change", r.engineName, f.uid)
 
 		return nil
 	}
 
-	r.logger.InfoContext(
-		ctx,
-		"filter updated",
-		"uid", f.uid,
-		"bytes", parseRes.BytesWritten,
-		"rules", parseRes.RulesCount,
+	log.Info(
+		"filtering: updated engine %q: filter %q: %d bytes, %d rules",
+		r.engineName,
+		f.uid,
+		parseRes.BytesWritten,
+		parseRes.RulesCount,
 	)
 
 	return nil

internal/filtering/rulelist/engine_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/AdguardTeam/urlfilter"
 	"github.com/miekg/dns"
@@ -14,8 +13,6 @@ import (
 )
 
 func TestEngine_Refresh(t *testing.T) {
-	t.Parallel()
-
 	cacheDir := t.TempDir()
 
 	fileURL, srvURL := newFilterLocations(t, cacheDir, testRuleTextBlocked, testRuleTextBlocked2)
@@ -24,7 +21,6 @@ func TestEngine_Refresh(t *testing.T) {
 	httpFlt := newFilter(t, srvURL, "HTTP Filter")
 
 	eng := rulelist.NewEngine(&rulelist.EngineConfig{
-		Logger:  slogutil.NewDiscardLogger(),
 		Name:    "Engine",
 		Filters: []*rulelist.Filter{fileFlt, httpFlt},
 	})

internal/filtering/rulelist/filter.go

@@ -105,7 +105,7 @@ func NewFilter(c *FilterConfig) (f *Filter, err error) {
 // buffer used to parse information from the data.  cli and maxSize are only
 // used when f is a URL-based list.
 //
-// TODO(a.garipov): Unexport and test in an internal test or through engine
+// TODO(a.garipov): Unexport and test in an internal test or through enigne
 // tests.
 //
 // TODO(a.garipov): Consider not returning parseRes.

internal/filtering/rulelist/filter_test.go

@@ -8,15 +8,12 @@ import (
 	"testing"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestFilter_Refresh(t *testing.T) {
-	t.Parallel()
-
 	cacheDir := t.TempDir()
 	uid := rulelist.MustNewUID()
 
@@ -40,7 +37,7 @@ func TestFilter_Refresh(t *testing.T) {
 	}, {
 		name: "file",
 		url: &url.URL{
-			Scheme: urlutil.SchemeFile,
+			Scheme: "file",
 			Path:   fileURL.Path,
 		},
 		wantNewErrMsg: "",
@@ -52,8 +49,6 @@ func TestFilter_Refresh(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
 			f, err := rulelist.NewFilter(&rulelist.FilterConfig{
 				URL:         tc.url,
 				Name:        tc.name,

internal/filtering/rulelist/rulelist.go

@@ -71,10 +71,3 @@ var _ fmt.Stringer = UID{}
 func (id UID) String() (s string) {
 	return uuid.UUID(id).String()
 }
-
-// Common engine names.
-const (
-	EngineNameAllow  = "allow"
-	EngineNameBlock  = "block"
-	EngineNameCustom = "custom"
-)

internal/filtering/rulelist/rulelist_test.go

@@ -6,16 +6,20 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"os"
+	"path/filepath"
 	"sync/atomic"
 	"testing"
 	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/require"
 )
 
+func TestMain(m *testing.M) {
+	testutil.DiscardLogOutput(m)
+}
+
 // testTimeout is the common timeout for tests.
 const testTimeout = 1 * time.Second
 
@@ -27,7 +31,6 @@ const testTitle = "Test Title"
 
 // Common rule texts for tests.
 const (
-	testRuleTextAllowed     = "||allowed.example^\n"
 	testRuleTextBadTab      = "||bad-tab-and-comment.example^\t# A comment.\n"
 	testRuleTextBlocked     = "||blocked.example^\n"
 	testRuleTextBlocked2    = "||blocked-2.example^\n"
@@ -76,16 +79,8 @@ func newFilterLocations(
 	fileData string,
 	httpData string,
 ) (fileURL, srvURL *url.URL) {
-	t.Helper()
-
-	f, err := os.CreateTemp(cacheDir, "")
-	require.NoError(t, err)
-
-	err = f.Close()
-	require.NoError(t, err)
-
-	filePath := f.Name()
-	err = os.WriteFile(filePath, []byte(fileData), 0o644)
+	filePath := filepath.Join(cacheDir, "initial.txt")
+	err := os.WriteFile(filePath, []byte(fileData), 0o644)
 	require.NoError(t, err)
 
 	testutil.CleanupAndRequireSuccess(t, func() (err error) {
@@ -93,7 +88,7 @@ func newFilterLocations(
 	})
 
 	fileURL = &url.URL{
-		Scheme: urlutil.SchemeFile,
+		Scheme: "file",
 		Path:   filePath,
 	}
 

internal/filtering/rulelist/storage.go

@@ -1,112 +0,0 @@
-package rulelist
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-	"net/http"
-	"sync"
-
-	"github.com/AdguardTeam/golibs/errors"
-	"github.com/c2h5oh/datasize"
-)
-
-// Storage contains the main filtering engines, including the allowlist, the
-// blocklist, and the user's custom filtering rules.
-type Storage struct {
-	// refreshMu makes sure that only one update takes place at a time.
-	refreshMu *sync.Mutex
-
-	allow    *Engine
-	block    *Engine
-	custom   *TextEngine
-	httpCli  *http.Client
-	cacheDir string
-	parseBuf []byte
-	maxSize  datasize.ByteSize
-}
-
-// StorageConfig is the configuration for the filtering-engine storage.
-type StorageConfig struct {
-	// Logger is used to log the operation of the storage.  It must not be nil.
-	Logger *slog.Logger
-
-	// HTTPClient is the HTTP client used to perform updates of rule lists.
-	// It must not be nil.
-	HTTPClient *http.Client
-
-	// CacheDir is the path to the directory used to cache rule-list files.
-	// It must be set.
-	CacheDir string
-
-	// AllowFilters are the filtering-rule lists used to exclude domain names
-	// from the filtering.  Each item must not be nil.
-	AllowFilters []*Filter
-
-	// BlockFilters are the filtering-rule lists used to block domain names.
-	// Each item must not be nil.
-	BlockFilters []*Filter
-
-	// CustomRules contains custom rules of the user.  They have priority over
-	// both allow- and blacklist rules.
-	CustomRules []string
-
-	// MaxRuleListTextSize is the maximum size of a rule-list file.  It must be
-	// greater than zero.
-	MaxRuleListTextSize datasize.ByteSize
-}
-
-// NewStorage creates a new filtering-engine storage.  The engines are not
-// refreshed, so a refresh should be performed before use.
-func NewStorage(c *StorageConfig) (s *Storage, err error) {
-	custom, err := NewTextEngine(&TextEngineConfig{
-		Name:  EngineNameCustom,
-		Rules: c.CustomRules,
-		ID:    URLFilterIDCustom,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("creating custom engine: %w", err)
-	}
-
-	return &Storage{
-		refreshMu: &sync.Mutex{},
-		allow: NewEngine(&EngineConfig{
-			Logger:  c.Logger.With("engine", EngineNameAllow),
-			Name:    EngineNameAllow,
-			Filters: c.AllowFilters,
-		}),
-		block: NewEngine(&EngineConfig{
-			Logger:  c.Logger.With("engine", EngineNameBlock),
-			Name:    EngineNameBlock,
-			Filters: c.BlockFilters,
-		}),
-		custom:   custom,
-		httpCli:  c.HTTPClient,
-		cacheDir: c.CacheDir,
-		parseBuf: make([]byte, DefaultRuleBufSize),
-		maxSize:  c.MaxRuleListTextSize,
-	}, nil
-}
-
-// Close closes the underlying rule-list engines.
-func (s *Storage) Close() (err error) {
-	// Don't wrap the errors since they are informative enough as is.
-	return errors.Join(
-		s.allow.Close(),
-		s.block.Close(),
-	)
-}
-
-// Refresh updates all engines in s.
-//
-// TODO(a.garipov): Refresh allow and block separately?
-func (s *Storage) Refresh(ctx context.Context) (err error) {
-	s.refreshMu.Lock()
-	defer s.refreshMu.Unlock()
-
-	// Don't wrap the errors since they are informative enough as is.
-	return errors.Join(
-		s.allow.Refresh(ctx, s.parseBuf, s.httpCli, s.cacheDir, s.maxSize),
-		s.block.Refresh(ctx, s.parseBuf, s.httpCli, s.cacheDir, s.maxSize),
-	)
-}

internal/filtering/rulelist/storage_test.go

@@ -1,49 +0,0 @@
-package rulelist_test
-
-import (
-	"net/http"
-	"testing"
-
-	"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"github.com/AdguardTeam/golibs/testutil"
-	"github.com/c2h5oh/datasize"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestStorage_Refresh(t *testing.T) {
-	t.Parallel()
-
-	cacheDir := t.TempDir()
-
-	allowedFileURL, _ := newFilterLocations(t, cacheDir, testRuleTextAllowed, "")
-	allowedFlt := newFilter(t, allowedFileURL, "Allowed 1")
-
-	blockedFileURL, _ := newFilterLocations(t, cacheDir, testRuleTextBlocked, "")
-	blockedFlt := newFilter(t, blockedFileURL, "Blocked 1")
-
-	strg, err := rulelist.NewStorage(&rulelist.StorageConfig{
-		Logger: slogutil.NewDiscardLogger(),
-		HTTPClient: &http.Client{
-			Timeout: testTimeout,
-		},
-		CacheDir: cacheDir,
-		AllowFilters: []*rulelist.Filter{
-			allowedFlt,
-		},
-		BlockFilters: []*rulelist.Filter{
-			blockedFlt,
-		},
-		CustomRules: []string{
-			testRuleTextBlocked2,
-		},
-		MaxRuleListTextSize: 1 * datasize.KB,
-	})
-	require.NoError(t, err)
-	testutil.CleanupAndRequireSuccess(t, strg.Close)
-
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	err = strg.Refresh(ctx)
-	assert.NoError(t, err)
-}

internal/filtering/rulelist/textengine.go

@@ -20,15 +20,15 @@ type TextEngine struct {
 	// storage is the filtering-rule storage.  It is saved here to close it.
 	storage *filterlist.RuleStorage
 
-	// name is the human-readable name of the engine.
+	// name is the human-readable name of the engine, like "custom".
 	name string
 }
 
 // TextEngineConfig is the configuration for a rule-list filtering engine
 // created from a filtering rule text.
 type TextEngineConfig struct {
-	// name is the human-readable name of the engine; see [EngineNameAllow] and
-	// similar constants.
+	// Name is the human-readable name of this engine, like "allowed",
+	// "blocked", or "custom".
 	Name string
 
 	// Rules is the text of the filtering rules for this engine.

internal/filtering/rulelist/textengine_test.go

@@ -12,8 +12,6 @@ import (
 )
 
 func TestNewTextEngine(t *testing.T) {
-	t.Parallel()
-
 	eng, err := rulelist.NewTextEngine(&rulelist.TextEngineConfig{
 		Name: "RulesEngine",
 		Rules: []string{

internal/filtering/safesearch.go

@@ -1,17 +1,15 @@
 package filtering
 
-import "context"
-
 // SafeSearch interface describes a service for search engines hosts rewrites.
 type SafeSearch interface {
 	// CheckHost checks host with safe search filter.  CheckHost must be safe
 	// for concurrent use.  qtype must be either [dns.TypeA] or [dns.TypeAAAA].
-	CheckHost(ctx context.Context, host string, qtype uint16) (res Result, err error)
+	CheckHost(host string, qtype uint16) (res Result, err error)
 
 	// Update updates the configuration of the safe search filter.  Update must
 	// be safe for concurrent use.  An implementation of Update may ignore some
 	// fields, but it must document which.
-	Update(ctx context.Context, conf SafeSearchConfig) (err error)
+	Update(conf SafeSearchConfig) (err error)
 }
 
 // SafeSearchConfig is a struct with safe search related settings.
@@ -42,13 +40,10 @@ func (d *DNSFilter) checkSafeSearch(
 		return Result{}, nil
 	}
 
-	// TODO(s.chzhen):  Pass context.
-	ctx := context.TODO()
-
 	clientSafeSearch := setts.ClientSafeSearch
 	if clientSafeSearch != nil {
-		return clientSafeSearch.CheckHost(ctx, host, qtype)
+		return clientSafeSearch.CheckHost(host, qtype)
 	}
 
-	return d.safeSearch.CheckHost(ctx, host, qtype)
+	return d.safeSearch.CheckHost(host, qtype)
 }

internal/filtering/safesearch/safesearch.go

@@ -3,11 +3,9 @@ package safesearch
 
 import (
 	"bytes"
-	"context"
 	"encoding/binary"
 	"encoding/gob"
 	"fmt"
-	"log/slog"
 	"net/netip"
 	"strings"
 	"sync"
@@ -16,20 +14,13 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
 	"github.com/AdguardTeam/golibs/cache"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
+	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/urlfilter"
 	"github.com/AdguardTeam/urlfilter/filterlist"
 	"github.com/AdguardTeam/urlfilter/rules"
-	"github.com/c2h5oh/datasize"
 	"github.com/miekg/dns"
 )
 
-// Attribute keys and values for logging.
-const (
-	LogPrefix    = "safesearch"
-	LogKeyClient = "client"
-)
-
 // Service is a enum with service names used as search providers.
 type Service string
 
@@ -66,32 +57,9 @@ func isServiceProtected(s filtering.SafeSearchConfig, service Service) (ok bool)
 	}
 }
 
-// DefaultConfig is the configuration structure for [Default].
-type DefaultConfig struct {
-	// Logger is used for logging the operation of the safe search filter.
-	Logger *slog.Logger
-
-	// ClientName is the name of the persistent client associated with the safe
-	// search filter, if there is one.
-	ClientName string
-
-	// CacheSize is the size of the filter results cache.
-	CacheSize uint
-
-	// CacheTTL is the Time to Live duration for cached items.
-	CacheTTL time.Duration
-
-	// ServicesConfig contains safe search settings for services.  It must not
-	// be nil.
-	ServicesConfig filtering.SafeSearchConfig
-}
-
 // Default is the default safe search filter that uses filtering rules with the
 // dnsrewrite modifier.
 type Default struct {
-	// logger is used for logging the operation of the safe search filter.
-	logger *slog.Logger
-
 	// mu protects engine.
 	mu *sync.RWMutex
 
@@ -99,28 +67,33 @@ type Default struct {
 	// engine may be nil, which means that this safe search filter is disabled.
 	engine *urlfilter.DNSEngine
 
-	// cache stores safe search filtering results.
-	cache cache.Cache
-
-	// cacheTTL is the Time to Live duration for cached items.
-	cacheTTL time.Duration
+	cache     cache.Cache
+	logPrefix string
+	cacheTTL  time.Duration
 }
 
-// NewDefault returns an initialized default safe search filter.  ctx is used
-// to log the initial refresh.
-func NewDefault(ctx context.Context, conf *DefaultConfig) (ss *Default, err error) {
+// NewDefault returns an initialized default safe search filter.  name is used
+// for logging.
+func NewDefault(
+	conf filtering.SafeSearchConfig,
+	name string,
+	cacheSize uint,
+	cacheTTL time.Duration,
+) (ss *Default, err error) {
 	ss = &Default{
-		logger: conf.Logger,
-		mu:     &sync.RWMutex{},
+		mu: &sync.RWMutex{},
+
 		cache: cache.New(cache.Config{
 			EnableLRU: true,
-			MaxSize:   conf.CacheSize,
+			MaxSize:   cacheSize,
 		}),
-		cacheTTL: conf.CacheTTL,
+		// Use %s, because the client safe-search names already contain double
+		// quotes.
+		logPrefix: fmt.Sprintf("safesearch %s: ", name),
+		cacheTTL:  cacheTTL,
 	}
 
-	// TODO(s.chzhen):  Move to [Default.InitialRefresh].
-	err = ss.resetEngine(ctx, rulelist.URLFilterIDSafeSearch, conf.ServicesConfig)
+	err = ss.resetEngine(rulelist.URLFilterIDSafeSearch, conf)
 	if err != nil {
 		// Don't wrap the error, because it's informative enough as is.
 		return nil, err
@@ -129,15 +102,29 @@ func NewDefault(ctx context.Context, conf *DefaultConfig) (ss *Default, err erro
 	return ss, nil
 }
 
+// log is a helper for logging  that includes the name of the safe search
+// filter.  level must be one of [log.DEBUG], [log.INFO], and [log.ERROR].
+func (ss *Default) log(level log.Level, msg string, args ...any) {
+	switch level {
+	case log.DEBUG:
+		log.Debug(ss.logPrefix+msg, args...)
+	case log.INFO:
+		log.Info(ss.logPrefix+msg, args...)
+	case log.ERROR:
+		log.Error(ss.logPrefix+msg, args...)
+	default:
+		panic(fmt.Errorf("safesearch: unsupported logging level %d", level))
+	}
+}
+
 // resetEngine creates new engine for provided safe search configuration and
 // sets it in ss.
 func (ss *Default) resetEngine(
-	ctx context.Context,
 	listID int,
 	conf filtering.SafeSearchConfig,
 ) (err error) {
 	if !conf.Enabled {
-		ss.logger.DebugContext(ctx, "disabled")
+		ss.log(log.INFO, "disabled")
 
 		return nil
 	}
@@ -162,7 +149,7 @@ func (ss *Default) resetEngine(
 
 	ss.engine = urlfilter.NewDNSEngine(rs)
 
-	ss.logger.InfoContext(ctx, "reset rules", "count", ss.engine.RulesCount)
+	ss.log(log.INFO, "reset %d rules", ss.engine.RulesCount)
 
 	return nil
 }
@@ -171,14 +158,10 @@ func (ss *Default) resetEngine(
 var _ filtering.SafeSearch = (*Default)(nil)
 
 // CheckHost implements the [filtering.SafeSearch] interface for *Default.
-func (ss *Default) CheckHost(
-	ctx context.Context,
-	host string,
-	qtype rules.RRType,
-) (res filtering.Result, err error) {
+func (ss *Default) CheckHost(host string, qtype rules.RRType) (res filtering.Result, err error) {
 	start := time.Now()
 	defer func() {
-		ss.logger.DebugContext(ctx, "lookup finished", "host", host, "elapsed", time.Since(start))
+		ss.log(log.DEBUG, "lookup for %q finished in %s", host, time.Since(start))
 	}()
 
 	switch qtype {
@@ -189,9 +172,9 @@ func (ss *Default) CheckHost(
 	}
 
 	// Check cache. Return cached result if it was found
-	cachedValue, isFound := ss.getCachedResult(ctx, host, qtype)
+	cachedValue, isFound := ss.getCachedResult(host, qtype)
 	if isFound {
-		ss.logger.DebugContext(ctx, "found in cache", "host", host)
+		ss.log(log.DEBUG, "found in cache: %q", host)
 
 		return cachedValue, nil
 	}
@@ -203,7 +186,7 @@ func (ss *Default) CheckHost(
 
 	fltRes, err := ss.newResult(rewrite, qtype)
 	if err != nil {
-		ss.logger.ErrorContext(ctx, "looking up addresses", "host", host, slogutil.KeyError, err)
+		ss.log(log.DEBUG, "looking up addresses for %q: %s", host, err)
 
 		return filtering.Result{}, err
 	}
@@ -212,7 +195,7 @@ func (ss *Default) CheckHost(
 
 	// TODO(a.garipov): Consider switch back to resolving CNAME records IPs and
 	// saving results to cache.
-	ss.setCacheResult(ctx, host, qtype, res)
+	ss.setCacheResult(host, qtype, res)
 
 	return res, nil
 }
@@ -272,12 +255,7 @@ func (ss *Default) newResult(
 
 // setCacheResult stores data in cache for host.  qtype is expected to be either
 // [dns.TypeA] or [dns.TypeAAAA].
-func (ss *Default) setCacheResult(
-	ctx context.Context,
-	host string,
-	qtype rules.RRType,
-	res filtering.Result,
-) {
+func (ss *Default) setCacheResult(host string, qtype rules.RRType, res filtering.Result) {
 	expire := uint32(time.Now().Add(ss.cacheTTL).Unix())
 	exp := make([]byte, 4)
 	binary.BigEndian.PutUint32(exp, expire)
@@ -285,7 +263,7 @@ func (ss *Default) setCacheResult(
 
 	err := gob.NewEncoder(buf).Encode(res)
 	if err != nil {
-		ss.logger.ErrorContext(ctx, "cache encoding", slogutil.KeyError, err)
+		ss.log(log.ERROR, "cache encoding: %s", err)
 
 		return
 	}
@@ -293,18 +271,12 @@ func (ss *Default) setCacheResult(
 	val := buf.Bytes()
 	_ = ss.cache.Set([]byte(dns.Type(qtype).String()+" "+host), val)
 
-	ss.logger.DebugContext(
-		ctx,
-		"stored in cache",
-		"host", host,
-		"entry_size", datasize.ByteSize(len(val)),
-	)
+	ss.log(log.DEBUG, "stored in cache: %q, %d bytes", host, len(val))
 }
 
 // getCachedResult returns stored data from cache for host.  qtype is expected
 // to be either [dns.TypeA] or [dns.TypeAAAA].
 func (ss *Default) getCachedResult(
-	ctx context.Context,
 	host string,
 	qtype rules.RRType,
 ) (res filtering.Result, ok bool) {
@@ -326,7 +298,7 @@ func (ss *Default) getCachedResult(
 
 	err := gob.NewDecoder(buf).Decode(&res)
 	if err != nil {
-		ss.logger.ErrorContext(ctx, "cache decoding", slogutil.KeyError, err)
+		ss.log(log.ERROR, "cache decoding: %s", err)
 
 		return filtering.Result{}, false
 	}
@@ -336,11 +308,11 @@ func (ss *Default) getCachedResult(
 
 // Update implements the [filtering.SafeSearch] interface for *Default.  Update
 // ignores the CustomResolver and Enabled fields.
-func (ss *Default) Update(ctx context.Context, conf filtering.SafeSearchConfig) (err error) {
+func (ss *Default) Update(conf filtering.SafeSearchConfig) (err error) {
 	ss.mu.Lock()
 	defer ss.mu.Unlock()
 
-	err = ss.resetEngine(ctx, rulelist.URLFilterIDSafeSearch, conf)
+	err = ss.resetEngine(rulelist.URLFilterIDSafeSearch, conf)
 	if err != nil {
 		// Don't wrap the error, because it's informative enough as is.
 		return err

internal/filtering/safesearch/safesearch_internal_test.go

@@ -6,8 +6,6 @@ import (
 	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/AdguardTeam/urlfilter/rules"
 	"github.com/miekg/dns"
 	"github.com/stretchr/testify/assert"
@@ -23,9 +21,6 @@ const (
 	testCacheTTL  = 30 * time.Minute
 )
 
-// testTimeout is the common timeout for tests and contexts.
-const testTimeout = 1 * time.Second
-
 var defaultSafeSearchConf = filtering.SafeSearchConfig{
 	Enabled:    true,
 	Bing:       true,
@@ -40,12 +35,7 @@ var defaultSafeSearchConf = filtering.SafeSearchConfig{
 var yandexIP = netip.AddrFrom4([4]byte{213, 180, 193, 56})
 
 func newForTest(t testing.TB, ssConf filtering.SafeSearchConfig) (ss *Default) {
-	ss, err := NewDefault(testutil.ContextWithTimeout(t, testTimeout), &DefaultConfig{
-		Logger:         slogutil.NewDiscardLogger(),
-		ServicesConfig: ssConf,
-		CacheSize:      testCacheSize,
-		CacheTTL:       testCacheTTL,
-	})
+	ss, err := NewDefault(ssConf, "", testCacheSize, testCacheTTL)
 	require.NoError(t, err)
 
 	return ss
@@ -62,17 +52,16 @@ func TestSafeSearchCacheYandex(t *testing.T) {
 	const domain = "yandex.ru"
 
 	ss := newForTest(t, filtering.SafeSearchConfig{Enabled: false})
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
 
 	// Check host with disabled safesearch.
-	res, err := ss.CheckHost(ctx, domain, testQType)
+	res, err := ss.CheckHost(domain, testQType)
 	require.NoError(t, err)
 
 	assert.False(t, res.IsFiltered)
 	assert.Empty(t, res.Rules)
 
 	ss = newForTest(t, defaultSafeSearchConf)
-	res, err = ss.CheckHost(ctx, domain, testQType)
+	res, err = ss.CheckHost(domain, testQType)
 	require.NoError(t, err)
 
 	// For yandex we already know valid IP.
@@ -81,7 +70,7 @@ func TestSafeSearchCacheYandex(t *testing.T) {
 	assert.Equal(t, res.Rules[0].IP, yandexIP)
 
 	// Check cache.
-	cachedValue, isFound := ss.getCachedResult(ctx, domain, testQType)
+	cachedValue, isFound := ss.getCachedResult(domain, testQType)
 	require.True(t, isFound)
 	require.Len(t, cachedValue.Rules, 1)
 

internal/filtering/safesearch/safesearch_test.go

@@ -10,15 +10,15 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering/safesearch"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/miekg/dns"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-// testTimeout is the common timeout for tests and contexts.
-const testTimeout = 1 * time.Second
+func TestMain(m *testing.M) {
+	testutil.DiscardLogOutput(m)
+}
 
 // Common test constants.
 const (
@@ -47,13 +47,7 @@ var yandexIP = netip.AddrFrom4([4]byte{213, 180, 193, 56})
 
 func TestDefault_CheckHost_yandex(t *testing.T) {
 	conf := testConf
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	ss, err := safesearch.NewDefault(ctx, &safesearch.DefaultConfig{
-		Logger:         slogutil.NewDiscardLogger(),
-		ServicesConfig: conf,
-		CacheSize:      testCacheSize,
-		CacheTTL:       testCacheTTL,
-	})
+	ss, err := safesearch.NewDefault(conf, "", testCacheSize, testCacheTTL)
 	require.NoError(t, err)
 
 	hosts := []string{
@@ -88,7 +82,7 @@ func TestDefault_CheckHost_yandex(t *testing.T) {
 			for _, host := range hosts {
 				// Check host for each domain.
 				var res filtering.Result
-				res, err = ss.CheckHost(ctx, host, tc.qt)
+				res, err = ss.CheckHost(host, tc.qt)
 				require.NoError(t, err)
 
 				assert.True(t, res.IsFiltered)
@@ -109,13 +103,7 @@ func TestDefault_CheckHost_yandex(t *testing.T) {
 }
 
 func TestDefault_CheckHost_google(t *testing.T) {
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	ss, err := safesearch.NewDefault(ctx, &safesearch.DefaultConfig{
-		Logger:         slogutil.NewDiscardLogger(),
-		ServicesConfig: testConf,
-		CacheSize:      testCacheSize,
-		CacheTTL:       testCacheTTL,
-	})
+	ss, err := safesearch.NewDefault(testConf, "", testCacheSize, testCacheTTL)
 	require.NoError(t, err)
 
 	// Check host for each domain.
@@ -130,7 +118,7 @@ func TestDefault_CheckHost_google(t *testing.T) {
 	} {
 		t.Run(host, func(t *testing.T) {
 			var res filtering.Result
-			res, err = ss.CheckHost(ctx, host, testQType)
+			res, err = ss.CheckHost(host, testQType)
 			require.NoError(t, err)
 
 			assert.True(t, res.IsFiltered)
@@ -161,19 +149,13 @@ func (r *testResolver) LookupIP(
 }
 
 func TestDefault_CheckHost_duckduckgoAAAA(t *testing.T) {
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	ss, err := safesearch.NewDefault(ctx, &safesearch.DefaultConfig{
-		Logger:         slogutil.NewDiscardLogger(),
-		ServicesConfig: testConf,
-		CacheSize:      testCacheSize,
-		CacheTTL:       testCacheTTL,
-	})
+	ss, err := safesearch.NewDefault(testConf, "", testCacheSize, testCacheTTL)
 	require.NoError(t, err)
 
 	// The DuckDuckGo safe-search addresses are resolved through CNAMEs, but
 	// DuckDuckGo doesn't have a safe-search IPv6 address.  The result should be
 	// the same as the one for Yandex IPv6.  That is, a NODATA response.
-	res, err := ss.CheckHost(ctx, "www.duckduckgo.com", dns.TypeAAAA)
+	res, err := ss.CheckHost("www.duckduckgo.com", dns.TypeAAAA)
 	require.NoError(t, err)
 
 	assert.True(t, res.IsFiltered)
@@ -184,38 +166,32 @@ func TestDefault_CheckHost_duckduckgoAAAA(t *testing.T) {
 
 func TestDefault_Update(t *testing.T) {
 	conf := testConf
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	ss, err := safesearch.NewDefault(ctx, &safesearch.DefaultConfig{
-		Logger:         slogutil.NewDiscardLogger(),
-		ServicesConfig: conf,
-		CacheSize:      testCacheSize,
-		CacheTTL:       testCacheTTL,
-	})
+	ss, err := safesearch.NewDefault(conf, "", testCacheSize, testCacheTTL)
 	require.NoError(t, err)
 
-	res, err := ss.CheckHost(ctx, "www.yandex.com", testQType)
+	res, err := ss.CheckHost("www.yandex.com", testQType)
 	require.NoError(t, err)
 
 	assert.True(t, res.IsFiltered)
 
-	err = ss.Update(ctx, filtering.SafeSearchConfig{
+	err = ss.Update(filtering.SafeSearchConfig{
 		Enabled: true,
 		Google:  false,
 	})
 	require.NoError(t, err)
 
-	res, err = ss.CheckHost(ctx, "www.yandex.com", testQType)
+	res, err = ss.CheckHost("www.yandex.com", testQType)
 	require.NoError(t, err)
 
 	assert.False(t, res.IsFiltered)
 
-	err = ss.Update(ctx, filtering.SafeSearchConfig{
+	err = ss.Update(filtering.SafeSearchConfig{
 		Enabled: false,
 		Google:  true,
 	})
 	require.NoError(t, err)
 
-	res, err = ss.CheckHost(ctx, "www.yandex.com", testQType)
+	res, err = ss.CheckHost("www.yandex.com", testQType)
 	require.NoError(t, err)
 
 	assert.False(t, res.IsFiltered)

internal/filtering/safesearchhttp.go

@@ -51,7 +51,7 @@ func (d *DNSFilter) handleSafeSearchSettings(w http.ResponseWriter, r *http.Requ
 	}
 
 	conf := *req
-	err = d.safeSearch.Update(r.Context(), conf)
+	err = d.safeSearch.Update(conf)
 	if err != nil {
 		aghhttp.Error(r, w, http.StatusBadRequest, "updating: %s", err)
 

internal/filtering/servicelist.go

@@ -2450,7 +2450,7 @@ var blockedServices = []blockedService{{
 	},
 }, {
 	ID:      "telegram",
-	Name:    "Telegram (Web)",
+	Name:    "Telegram",
 	IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 50 50\"><path d=\"M46.137,6.552c-0.75-0.636-1.928-0.727-3.146-0.238l-0.002,0C41.708,6.828,6.728,21.832,5.304,22.445 c-0.259,0.09-2.521,0.934-2.288,2.814c0.208,1.695,2.026,2.397,2.248,2.478l8.893,3.045c0.59,1.964,2.765,9.21,3.246,10.758 c0.3,0.965,0.789,2.233,1.646,2.494c0.752,0.29,1.5,0.025,1.984-0.355l5.437-5.043l8.777,6.845l0.209,0.125 c0.596,0.264,1.167,0.396,1.712,0.396c0.421,0,0.825-0.079,1.211-0.237c1.315-0.54,1.841-1.793,1.896-1.935l6.556-34.077 C47.231,7.933,46.675,7.007,46.137,6.552z M22,32l-3,8l-3-10l23-17L22,32z\" /></svg>"),
 	Rules: []string{
 		"||comments.app^",

internal/home/auth.go

@@ -90,7 +90,6 @@ func InitAuth(
 		trustedProxies: trustedProxies,
 	}
 	var err error
-
 	a.db, err = bbolt.Open(dbFilename, aghos.DefaultPermFile, nil)
 	if err != nil {
 		log.Error("auth: open DB: %s: %s", dbFilename, err)

internal/home/clients.go

@@ -3,7 +3,6 @@ package home
 import (
 	"context"
 	"fmt"
-	"log/slog"
 	"net/netip"
 	"slices"
 	"sync"
@@ -14,23 +13,17 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/client"
 	"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
-	"github.com/AdguardTeam/AdGuardHome/internal/filtering/safesearch"
 	"github.com/AdguardTeam/AdGuardHome/internal/querylog"
 	"github.com/AdguardTeam/AdGuardHome/internal/schedule"
 	"github.com/AdguardTeam/AdGuardHome/internal/whois"
 	"github.com/AdguardTeam/dnsproxy/proxy"
 	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"github.com/AdguardTeam/golibs/stringutil"
 )
 
 // clientsContainer is the storage of all runtime and persistent clients.
 type clientsContainer struct {
-	// baseLogger is used to create loggers with custom prefixes for safe search
-	// filter.  It must not be nil.
-	baseLogger *slog.Logger
-
 	// storage stores information about persistent clients.
 	storage *client.Storage
 
@@ -68,8 +61,6 @@ type BlockedClientChecker interface {
 // dhcpServer: optional
 // Note: this function must be called only once
 func (clients *clientsContainer) Init(
-	ctx context.Context,
-	baseLogger *slog.Logger,
 	objects []*clientObject,
 	dhcpServer client.DHCP,
 	etcHosts *aghnet.HostsContainer,
@@ -81,14 +72,13 @@ func (clients *clientsContainer) Init(
 		return errors.Error("clients container already initialized")
 	}
 
-	clients.baseLogger = baseLogger
 	clients.safeSearchCacheSize = filteringConf.SafeSearchCacheSize
 	clients.safeSearchCacheTTL = time.Minute * time.Duration(filteringConf.CacheTime)
 
 	confClients := make([]*client.Persistent, 0, len(objects))
 	for i, o := range objects {
 		var p *client.Persistent
-		p, err = o.toPersistent(ctx, baseLogger, clients.safeSearchCacheSize, clients.safeSearchCacheTTL)
+		p, err = o.toPersistent(clients.safeSearchCacheSize, clients.safeSearchCacheTTL)
 		if err != nil {
 			return fmt.Errorf("init persistent client at index %d: %w", i, err)
 		}
@@ -102,13 +92,12 @@ func (clients *clientsContainer) Init(
 	// TODO(e.burkov):  The option should probably be returned, since hosts file
 	// currently used not only for clients' information enrichment, but also in
 	// the filtering module and upstream addresses resolution.
-	var hosts client.HostsContainer
-	if config.Clients.Sources.HostsFile && etcHosts != nil {
-		hosts = etcHosts
+	var hosts client.HostsContainer = etcHosts
+	if !config.Clients.Sources.HostsFile {
+		hosts = nil
 	}
 
-	clients.storage, err = client.NewStorage(ctx, &client.StorageConfig{
-		Logger:                 baseLogger.With(slogutil.KeyPrefix, "client_storage"),
+	clients.storage, err = client.NewStorage(&client.StorageConfig{
 		InitialClients:         confClients,
 		DHCP:                   dhcpServer,
 		EtcHosts:               hosts,
@@ -179,8 +168,6 @@ type clientObject struct {
 
 // toPersistent returns an initialized persistent client if there are no errors.
 func (o *clientObject) toPersistent(
-	ctx context.Context,
-	baseLogger *slog.Logger,
 	safeSearchCacheSize uint,
 	safeSearchCacheTTL time.Duration,
 ) (cli *client.Persistent, err error) {
@@ -216,23 +203,14 @@ func (o *clientObject) toPersistent(
 	}
 
 	if o.SafeSearchConf.Enabled {
-		logger := baseLogger.With(
-			slogutil.KeyPrefix, safesearch.LogPrefix,
-			safesearch.LogKeyClient, cli.Name,
+		err = cli.SetSafeSearch(
+			o.SafeSearchConf,
+			safeSearchCacheSize,
+			safeSearchCacheTTL,
 		)
-		var ss *safesearch.Default
-		ss, err = safesearch.NewDefault(ctx, &safesearch.DefaultConfig{
-			Logger:         logger,
-			ServicesConfig: o.SafeSearchConf,
-			ClientName:     cli.Name,
-			CacheSize:      safeSearchCacheSize,
-			CacheTTL:       safeSearchCacheTTL,
-		})
 		if err != nil {
 			return nil, fmt.Errorf("init safesearch %q: %w", cli.Name, err)
 		}
-
-		cli.SafeSearch = ss
 	}
 
 	if o.BlockedServices == nil {
@@ -418,12 +396,6 @@ func (clients *clientsContainer) UpstreamConfigByID(
 	)
 	c.UpstreamConfig = conf
 
-	// TODO(s.chzhen):  Pass context.
-	err = clients.storage.Update(context.TODO(), c.Name, c)
-	if err != nil {
-		return nil, fmt.Errorf("setting upstream config: %w", err)
-	}
-
 	return conf, nil
 }
 
@@ -432,13 +404,8 @@ var _ client.AddressUpdater = (*clientsContainer)(nil)
 
 // UpdateAddress implements the [client.AddressUpdater] interface for
 // *clientsContainer
-func (clients *clientsContainer) UpdateAddress(
-	ctx context.Context,
-	ip netip.Addr,
-	host string,
-	info *whois.Info,
-) {
-	clients.storage.UpdateAddress(ctx, ip, host, info)
+func (clients *clientsContainer) UpdateAddress(ip netip.Addr, host string, info *whois.Info) {
+	clients.storage.UpdateAddress(ip, host, info)
 }
 
 // close gracefully closes all the client-specific upstream configurations of

internal/home/clients_internal_test.go

@@ -7,8 +7,6 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/internal/client"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -22,28 +20,16 @@ func newClientsContainer(t *testing.T) (c *clientsContainer) {
 		testing: true,
 	}
 
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-	err := c.Init(
-		ctx,
-		slogutil.NewDiscardLogger(),
-		nil,
-		client.EmptyDHCP{},
-		nil,
-		nil,
-		&filtering.Config{},
-	)
-
-	require.NoError(t, err)
+	require.NoError(t, c.Init(nil, client.EmptyDHCP{}, nil, nil, &filtering.Config{}))
 
 	return c
 }
 
 func TestClientsCustomUpstream(t *testing.T) {
 	clients := newClientsContainer(t)
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
 
 	// Add client with upstreams.
-	err := clients.storage.Add(ctx, &client.Persistent{
+	err := clients.storage.Add(&client.Persistent{
 		Name: "client1",
 		UID:  client.MustNewUID(),
 		IPs:  []netip.Addr{netip.MustParseAddr("1.1.1.1"), netip.MustParseAddr("1:2:3::4")},

internal/home/clientshttp.go

@@ -1,7 +1,6 @@
 package home
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -11,10 +10,8 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/client"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
-	"github.com/AdguardTeam/AdGuardHome/internal/filtering/safesearch"
 	"github.com/AdguardTeam/AdGuardHome/internal/schedule"
 	"github.com/AdguardTeam/AdGuardHome/internal/whois"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
 )
 
 // clientJSON is a common structure used by several handlers to deal with
@@ -106,7 +103,7 @@ func (clients *clientsContainer) handleGetClients(w http.ResponseWriter, r *http
 		return true
 	})
 
-	clients.storage.UpdateDHCP(r.Context())
+	clients.storage.UpdateDHCP()
 
 	clients.storage.RangeRuntime(func(rc *client.Runtime) (cont bool) {
 		src, host := rc.Info()
@@ -184,7 +181,6 @@ func initPrev(cj clientJSON, prev *client.Persistent) (c *client.Persistent, err
 // jsonToClient converts JSON object to persistent client object if there are no
 // errors.
 func (clients *clientsContainer) jsonToClient(
-	ctx context.Context,
 	cj clientJSON,
 	prev *client.Persistent,
 ) (c *client.Persistent, err error) {
@@ -211,23 +207,14 @@ func (clients *clientsContainer) jsonToClient(
 	c.UseOwnBlockedServices = !cj.UseGlobalBlockedServices
 
 	if c.SafeSearchConf.Enabled {
-		logger := clients.baseLogger.With(
-			slogutil.KeyPrefix, safesearch.LogPrefix,
-			safesearch.LogKeyClient, c.Name,
+		err = c.SetSafeSearch(
+			c.SafeSearchConf,
+			clients.safeSearchCacheSize,
+			clients.safeSearchCacheTTL,
 		)
-		var ss *safesearch.Default
-		ss, err = safesearch.NewDefault(ctx, &safesearch.DefaultConfig{
-			Logger:         logger,
-			ServicesConfig: c.SafeSearchConf,
-			ClientName:     c.Name,
-			CacheSize:      clients.safeSearchCacheSize,
-			CacheTTL:       clients.safeSearchCacheTTL,
-		})
 		if err != nil {
 			return nil, fmt.Errorf("creating safesearch for client %q: %w", c.Name, err)
 		}
-
-		c.SafeSearch = ss
 	}
 
 	return c, nil
@@ -334,14 +321,14 @@ func (clients *clientsContainer) handleAddClient(w http.ResponseWriter, r *http.
 		return
 	}
 
-	c, err := clients.jsonToClient(r.Context(), cj, nil)
+	c, err := clients.jsonToClient(cj, nil)
 	if err != nil {
 		aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
 
 		return
 	}
 
-	err = clients.storage.Add(r.Context(), c)
+	err = clients.storage.Add(c)
 	if err != nil {
 		aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
 
@@ -369,7 +356,7 @@ func (clients *clientsContainer) handleDelClient(w http.ResponseWriter, r *http.
 		return
 	}
 
-	if !clients.storage.RemoveByName(r.Context(), cj.Name) {
+	if !clients.storage.RemoveByName(cj.Name) {
 		aghhttp.Error(r, w, http.StatusBadRequest, "Client not found")
 
 		return
@@ -404,14 +391,14 @@ func (clients *clientsContainer) handleUpdateClient(w http.ResponseWriter, r *ht
 		return
 	}
 
-	c, err := clients.jsonToClient(r.Context(), dj.Data, nil)
+	c, err := clients.jsonToClient(dj.Data, nil)
 	if err != nil {
 		aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
 
 		return
 	}
 
-	err = clients.storage.Update(r.Context(), dj.Name, c)
+	err = clients.storage.Update(dj.Name, c)
 	if err != nil {
 		aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
 

internal/home/clientshttp_internal_test.go

@@ -11,19 +11,14 @@ import (
 	"net/url"
 	"slices"
 	"testing"
-	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/client"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/schedule"
-	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-// testTimeout is the common timeout for tests and contexts.
-const testTimeout = 1 * time.Second
-
 const (
 	testClientIP1 = "1.1.1.1"
 	testClientIP2 = "2.2.2.2"
@@ -108,10 +103,9 @@ func assertPersistentClients(tb testing.TB, clients *clientsContainer, want []*c
 	require.NoError(tb, err)
 
 	var got []*client.Persistent
-	ctx := testutil.ContextWithTimeout(tb, testTimeout)
 	for _, cj := range clientList.Clients {
 		var c *client.Persistent
-		c, err = clients.jsonToClient(ctx, *cj, nil)
+		c, err = clients.jsonToClient(*cj, nil)
 		require.NoError(tb, err)
 
 		got = append(got, c)
@@ -131,11 +125,10 @@ func assertPersistentClientsData(
 	tb.Helper()
 
 	var got []*client.Persistent
-	ctx := testutil.ContextWithTimeout(tb, testTimeout)
 	for _, cm := range data {
 		for _, cj := range cm {
 			var c *client.Persistent
-			c, err := clients.jsonToClient(ctx, *cj, nil)
+			c, err := clients.jsonToClient(*cj, nil)
 			require.NoError(tb, err)
 
 			got = append(got, c)
@@ -203,14 +196,13 @@ func TestClientsContainer_HandleAddClient(t *testing.T) {
 
 func TestClientsContainer_HandleDelClient(t *testing.T) {
 	clients := newClientsContainer(t)
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
 
 	clientOne := newPersistentClientWithIDs(t, "client1", []string{testClientIP1})
-	err := clients.storage.Add(ctx, clientOne)
+	err := clients.storage.Add(clientOne)
 	require.NoError(t, err)
 
 	clientTwo := newPersistentClientWithIDs(t, "client2", []string{testClientIP2})
-	err = clients.storage.Add(ctx, clientTwo)
+	err = clients.storage.Add(clientTwo)
 	require.NoError(t, err)
 
 	assertPersistentClients(t, clients, []*client.Persistent{clientOne, clientTwo})
@@ -266,10 +258,9 @@ func TestClientsContainer_HandleDelClient(t *testing.T) {
 
 func TestClientsContainer_HandleUpdateClient(t *testing.T) {
 	clients := newClientsContainer(t)
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
 
 	clientOne := newPersistentClientWithIDs(t, "client1", []string{testClientIP1})
-	err := clients.storage.Add(ctx, clientOne)
+	err := clients.storage.Add(clientOne)
 	require.NoError(t, err)
 
 	assertPersistentClients(t, clients, []*client.Persistent{clientOne})
@@ -350,14 +341,12 @@ func TestClientsContainer_HandleFindClient(t *testing.T) {
 		},
 	}
 
-	ctx := testutil.ContextWithTimeout(t, testTimeout)
-
 	clientOne := newPersistentClientWithIDs(t, "client1", []string{testClientIP1})
-	err := clients.storage.Add(ctx, clientOne)
+	err := clients.storage.Add(clientOne)
 	require.NoError(t, err)
 
 	clientTwo := newPersistentClientWithIDs(t, "client2", []string{testClientIP2})
-	err = clients.storage.Add(ctx, clientTwo)
+	err = clients.storage.Add(clientTwo)
 	require.NoError(t, err)
 
 	assertPersistentClients(t, clients, []*client.Persistent{clientOne, clientTwo})

internal/home/config.go

@@ -162,12 +162,6 @@ type configuration struct {
 	// SchemaVersion is the version of the configuration schema.  See
 	// [configmigrate.LastSchemaVersion].
 	SchemaVersion uint `yaml:"schema_version"`
-
-	// UnsafeUseCustomUpdateIndexURL is the URL to the custom update index.
-	//
-	// NOTE: It's only exists for testing purposes and should not be used in
-	// release.
-	UnsafeUseCustomUpdateIndexURL bool `yaml:"unsafe_use_custom_update_index_url,omitempty"`
 }
 
 // httpConfig is a block with HTTP configuration params.

internal/home/control.go

@@ -16,7 +16,6 @@ import (
 	"github.com/AdguardTeam/golibs/httphdr"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/netutil"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/NYTimes/gziphandler"
 )
 
@@ -377,7 +376,7 @@ func handleHTTPSRedirect(w http.ResponseWriter, r *http.Request) (proceed bool)
 	//
 	// See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin.
 	originURL := &url.URL{
-		Scheme: urlutil.SchemeHTTP,
+		Scheme: aghhttp.SchemeHTTP,
 		Host:   r.Host,
 	}
 
@@ -396,7 +395,7 @@ func httpsURL(u *url.URL, host string, portHTTPS uint16) (redirectURL *url.URL)
 	}
 
 	return &url.URL{
-		Scheme:   urlutil.SchemeHTTPS,
+		Scheme:   aghhttp.SchemeHTTPS,
 		Host:     hostPort,
 		Path:     u.Path,
 		RawQuery: u.RawQuery,

internal/home/controlupdate.go

@@ -75,31 +75,30 @@ func (web *webAPI) handleVersionJSON(w http.ResponseWriter, r *http.Request) {
 // update server.
 func (web *webAPI) requestVersionInfo(resp *versionResponse, recheck bool) (err error) {
 	updater := web.conf.updater
-	for range 3 {
+	for i := 0; i != 3; i++ {
 		resp.VersionInfo, err = updater.VersionInfo(recheck)
-		if err == nil {
-			return nil
-		}
+		if err != nil {
+			var terr temporaryError
+			if errors.As(err, &terr) && terr.Temporary() {
+				// Temporary network error.  This case may happen while we're
+				// restarting our DNS server.  Log and sleep for some time.
+				//
+				// See https://github.com/AdguardTeam/AdGuardHome/issues/934.
+				d := time.Duration(i) * time.Second
+				log.Info("update: temp net error: %q; sleeping for %s and retrying", err, d)
+				time.Sleep(d)
 
-		var terr temporaryError
-		if errors.As(err, &terr) && terr.Temporary() {
-			// Temporary network error.  This case may happen while we're
-			// restarting our DNS server.  Log and sleep for some time.
-			//
-			// See https://github.com/AdguardTeam/AdGuardHome/issues/934.
-			const sleepTime = 2 * time.Second
-
-			log.Info("update: temp net error: %v; sleeping for %s and retrying", err, sleepTime)
-			time.Sleep(sleepTime)
-
-			continue
+				continue
+			}
 		}
 
 		break
 	}
 
 	if err != nil {
-		return fmt.Errorf("getting version info: %w", err)
+		vcu := updater.VersionCheckURL()
+
+		return fmt.Errorf("getting version info from %s: %w", vcu, err)
 	}
 
 	return nil

internal/home/dns.go

@@ -23,7 +23,6 @@ import (
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"github.com/AdguardTeam/golibs/netutil"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/ameshkov/dnscrypt/v2"
 	yaml "gopkg.in/yaml.v3"
 )
@@ -48,11 +47,11 @@ func onConfigModified() {
 // initDNS updates all the fields of the [Context] needed to initialize the DNS
 // server and initializes it at last.  It also must not be called unless
 // [config] and [Context] are initialized.  l must not be nil.
-func initDNS(baseLogger *slog.Logger, statsDir, querylogDir string) (err error) {
+func initDNS(l *slog.Logger, statsDir, querylogDir string) (err error) {
 	anonymizer := config.anonymizer()
 
 	statsConf := stats.Config{
-		Logger:            baseLogger.With(slogutil.KeyPrefix, "stats"),
+		Logger:            l.With(slogutil.KeyPrefix, "stats"),
 		Filename:          filepath.Join(statsDir, "stats.db"),
 		Limit:             config.Stats.Interval.Duration,
 		ConfigModified:    onConfigModified,
@@ -73,7 +72,6 @@ func initDNS(baseLogger *slog.Logger, statsDir, querylogDir string) (err error)
 	}
 
 	conf := querylog.Config{
-		Logger:            baseLogger.With(slogutil.KeyPrefix, "querylog"),
 		Anonymizer:        anonymizer,
 		ConfigModified:    onConfigModified,
 		HTTPRegister:      httpRegister,
@@ -114,7 +112,7 @@ func initDNS(baseLogger *slog.Logger, statsDir, querylogDir string) (err error)
 		anonymizer,
 		httpRegister,
 		tlsConf,
-		baseLogger,
+		l,
 	)
 }
 
@@ -373,7 +371,7 @@ func getDNSEncryption() (de dnsEncryption) {
 		}
 
 		de.https = (&url.URL{
-			Scheme: urlutil.SchemeHTTPS,
+			Scheme: "https",
 			Host:   addr,
 			Path:   "/dns-query",
 		}).String()
@@ -458,8 +456,7 @@ func startDNSServer() error {
 	Context.filters.EnableFilters(false)
 
 	// TODO(s.chzhen):  Pass context.
-	ctx := context.TODO()
-	err := Context.clients.Start(ctx)
+	err := Context.clients.Start(context.TODO())
 	if err != nil {
 		return fmt.Errorf("starting clients container: %w", err)
 	}
@@ -471,11 +468,7 @@ func startDNSServer() error {
 
 	Context.filters.Start()
 	Context.stats.Start()
-
-	err = Context.queryLog.Start(ctx)
-	if err != nil {
-		return fmt.Errorf("starting query log: %w", err)
-	}
+	Context.queryLog.Start()
 
 	return nil
 }
@@ -531,16 +524,12 @@ func closeDNSServer() {
 	if Context.stats != nil {
 		err := Context.stats.Close()
 		if err != nil {
-			log.Error("closing stats: %s", err)
+			log.Debug("closing stats: %s", err)
 		}
 	}
 
 	if Context.queryLog != nil {
-		// TODO(s.chzhen):  Pass context.
-		err := Context.queryLog.Shutdown(context.TODO())
-		if err != nil {
-			log.Error("closing query log: %s", err)
-		}
+		Context.queryLog.Close()
 	}
 
 	log.Debug("all dns modules are closed")

internal/home/dns_internal_test.go

@@ -7,8 +7,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/client"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/schedule"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -20,15 +18,12 @@ var testIPv4 = netip.AddrFrom4([4]byte{1, 2, 3, 4})
 func newStorage(tb testing.TB, clients []*client.Persistent) (s *client.Storage) {
 	tb.Helper()
 
-	ctx := testutil.ContextWithTimeout(tb, testTimeout)
-	s, err := client.NewStorage(ctx, &client.StorageConfig{
-		Logger: slogutil.NewDiscardLogger(),
-	})
+	s, err := client.NewStorage(&client.StorageConfig{})
 	require.NoError(tb, err)
 
 	for _, p := range clients {
 		p.UID = client.MustNewUID()
-		require.NoError(tb, s.Add(ctx, p))
+		require.NoError(tb, s.Add(p))
 	}
 
 	return s

internal/home/home.go

@@ -12,6 +12,7 @@ import (
 	"net/url"
 	"os"
 	"os/signal"
+	"path"
 	"path/filepath"
 	"runtime"
 	"slices"
@@ -20,6 +21,7 @@ import (
 	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghtls"
@@ -40,7 +42,6 @@ import (
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"github.com/AdguardTeam/golibs/netutil"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/AdguardTeam/golibs/osutil"
 )
 
@@ -114,16 +115,15 @@ func Main(clientBuildFS fs.FS) {
 	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT)
 
 	go func() {
-		ctx := context.Background()
 		for {
 			sig := <-signals
 			log.Info("Received signal %q", sig)
 			switch sig {
 			case syscall.SIGHUP:
-				Context.clients.storage.ReloadARP(ctx)
+				Context.clients.storage.ReloadARP()
 				Context.tls.reload()
 			default:
-				cleanup(ctx)
+				cleanup(context.Background())
 				cleanupAlways()
 				close(done)
 			}
@@ -148,17 +148,9 @@ func setupContext(opts options) (err error) {
 	Context.tlsRoots = aghtls.SystemRootCAs()
 	Context.mux = http.NewServeMux()
 
-	if !opts.noEtcHosts {
-		err = setupHostsContainer()
-		if err != nil {
-			// Don't wrap the error, because it's informative enough as is.
-			return err
-		}
-	}
-
 	if Context.firstRun {
 		log.Info("This is the first time AdGuard Home is launched")
-		checkNetworkPermissions()
+		checkPermissions()
 
 		return nil
 	}
@@ -176,6 +168,14 @@ func setupContext(opts options) (err error) {
 		os.Exit(0)
 	}
 
+	if !opts.noEtcHosts {
+		err = setupHostsContainer()
+		if err != nil {
+			// Don't wrap the error, because it's informative enough as is.
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -278,8 +278,8 @@ func setupOpts(opts options) (err error) {
 }
 
 // initContextClients initializes Context clients and related fields.
-func initContextClients(ctx context.Context, logger *slog.Logger) (err error) {
-	err = setupDNSFilteringConf(ctx, logger, config.Filtering)
+func initContextClients(logger *slog.Logger) (err error) {
+	err = setupDNSFilteringConf(config.Filtering)
 	if err != nil {
 		// Don't wrap the error, because it's informative enough as is.
 		return err
@@ -306,8 +306,6 @@ func initContextClients(ctx context.Context, logger *slog.Logger) (err error) {
 	}
 
 	return Context.clients.Init(
-		ctx,
-		logger,
 		config.Clients.Persistent,
 		Context.dhcpServer,
 		Context.etcHosts,
@@ -357,11 +355,7 @@ func setupBindOpts(opts options) (err error) {
 }
 
 // setupDNSFilteringConf sets up DNS filtering configuration settings.
-func setupDNSFilteringConf(
-	ctx context.Context,
-	baseLogger *slog.Logger,
-	conf *filtering.Config,
-) (err error) {
+func setupDNSFilteringConf(conf *filtering.Config) (err error) {
 	const (
 		dnsTimeout = 3 * time.Second
 
@@ -452,13 +446,12 @@ func setupDNSFilteringConf(
 		conf.ParentalBlockHost = host
 	}
 
-	logger := baseLogger.With(slogutil.KeyPrefix, safesearch.LogPrefix)
-	conf.SafeSearch, err = safesearch.NewDefault(ctx, &safesearch.DefaultConfig{
-		Logger:         logger,
-		ServicesConfig: conf.SafeSearchConf,
-		CacheSize:      conf.SafeSearchCacheSize,
-		CacheTTL:       cacheTime,
-	})
+	conf.SafeSearch, err = safesearch.NewDefault(
+		conf.SafeSearchConf,
+		"default",
+		conf.SafeSearchCacheSize,
+		cacheTime,
+	)
 	if err != nil {
 		return fmt.Errorf("initializing safesearch: %w", err)
 	}
@@ -494,42 +487,11 @@ func checkPorts() (err error) {
 	return nil
 }
 
-// isUpdateEnabled returns true if the update is enabled for current
-// configuration.  It also logs the decision.  customURL should be true if the
-// updater is using a custom URL.
-func isUpdateEnabled(ctx context.Context, l *slog.Logger, opts *options, customURL bool) (ok bool) {
-	if opts.disableUpdate {
-		l.DebugContext(ctx, "updates are disabled by command-line option")
-
-		return false
-	}
-
-	switch version.Channel() {
-	case
-		version.ChannelDevelopment,
-		version.ChannelCandidate:
-		if customURL {
-			l.DebugContext(ctx, "updates are enabled because custom url is used")
-		} else {
-			l.DebugContext(ctx, "updates are disabled for development and candidate builds")
-		}
-
-		return customURL
-	default:
-		l.DebugContext(ctx, "updates are enabled")
-
-		return true
-	}
-}
-
-// initWeb initializes the web module.
 func initWeb(
-	ctx context.Context,
 	opts options,
 	clientBuildFS fs.FS,
 	upd *updater.Updater,
 	l *slog.Logger,
-	customURL bool,
 ) (web *webAPI, err error) {
 	var clientFS fs.FS
 	if opts.localFrontend {
@@ -543,7 +505,17 @@ func initWeb(
 		}
 	}
 
-	disableUpdate := !isUpdateEnabled(ctx, l, &opts, customURL)
+	disableUpdate := opts.disableUpdate
+	switch version.Channel() {
+	case
+		version.ChannelDevelopment,
+		version.ChannelCandidate:
+		disableUpdate = true
+	}
+
+	if disableUpdate {
+		log.Info("AdGuard Home updates are disabled")
+	}
 
 	webConf := &webConfig{
 		updater: upd,
@@ -564,7 +536,7 @@ func initWeb(
 
 	web = newWebAPI(webConf, l)
 	if web == nil {
-		return nil, errors.Error("can not initialize web")
+		return nil, fmt.Errorf("initializing web: %w", err)
 	}
 
 	return web, nil
@@ -577,8 +549,6 @@ func fatalOnError(err error) {
 }
 
 // run configures and starts AdGuard Home.
-//
-// TODO(e.burkov):  Make opts a pointer.
 func run(opts options, clientBuildFS fs.FS, done chan struct{}) {
 	// Configure working dir.
 	err := initWorkingDir(opts)
@@ -614,10 +584,7 @@ func run(opts options, clientBuildFS fs.FS, done chan struct{}) {
 	// data first, but also to avoid relying on automatic Go init() function.
 	filtering.InitModule()
 
-	// TODO(s.chzhen):  Use it for the entire initialization process.
-	ctx := context.Background()
-
-	err = initContextClients(ctx, slogLogger)
+	err = initContextClients(slogLogger)
 	fatalOnError(err)
 
 	err = setupOpts(opts)
@@ -626,13 +593,33 @@ func run(opts options, clientBuildFS fs.FS, done chan struct{}) {
 	execPath, err := os.Executable()
 	fatalOnError(errors.Annotate(err, "getting executable path: %w"))
 
-	confPath := configFilePath()
+	u := &url.URL{
+		Scheme: "https",
+		// TODO(a.garipov): Make configurable.
+		Host: "static.adtidy.org",
+		Path: path.Join("adguardhome", version.Channel(), "version.json"),
+	}
 
-	upd, customURL := newUpdater(ctx, slogLogger, Context.workDir, confPath, execPath, config)
+	confPath := configFilePath()
+	log.Debug("using config path %q for updater", confPath)
+
+	upd := updater.NewUpdater(&updater.Config{
+		Client:          config.Filtering.HTTPClient,
+		Version:         version.Version(),
+		Channel:         version.Channel(),
+		GOARCH:          runtime.GOARCH,
+		GOOS:            runtime.GOOS,
+		GOARM:           version.GOARM(),
+		GOMIPS:          version.GOMIPS(),
+		WorkDir:         Context.workDir,
+		ConfName:        confPath,
+		ExecPath:        execPath,
+		VersionCheckURL: u.String(),
+	})
 
 	// TODO(e.burkov): This could be made earlier, probably as the option's
 	// effect.
-	cmdlineUpdate(ctx, slogLogger, opts, upd)
+	cmdlineUpdate(opts, upd, slogLogger)
 
 	if !Context.firstRun {
 		// Save the updated config.
@@ -660,7 +647,7 @@ func run(opts options, clientBuildFS fs.FS, done chan struct{}) {
 		onConfigModified()
 	}
 
-	Context.web, err = initWeb(ctx, opts, clientBuildFS, upd, slogLogger, customURL)
+	Context.web, err = initWeb(opts, clientBuildFS, upd, slogLogger)
 	fatalOnError(err)
 
 	statsDir, querylogDir, err := checkStatsAndQuerylogDirs(&Context, config)
@@ -688,87 +675,18 @@ func run(opts options, clientBuildFS fs.FS, done chan struct{}) {
 		}
 	}
 
-	if !opts.noPermCheck {
-		checkPermissions(ctx, slogLogger, Context.workDir, confPath, dataDir, statsDir, querylogDir)
+	if permcheck.NeedsMigration(confPath) {
+		permcheck.Migrate(Context.workDir, dataDir, statsDir, querylogDir, confPath)
 	}
 
+	permcheck.Check(Context.workDir, dataDir, statsDir, querylogDir, confPath)
+
 	Context.web.start()
 
 	// Wait for other goroutines to complete their job.
 	<-done
 }
 
-// newUpdater creates a new AdGuard Home updater.  customURL is true if the user
-// has specified a custom version announcement URL.
-func newUpdater(
-	ctx context.Context,
-	l *slog.Logger,
-	workDir string,
-	confPath string,
-	execPath string,
-	config *configuration,
-) (upd *updater.Updater, customURL bool) {
-	// envName is the name of the environment variable that can be used to
-	// override the default version check URL.
-	const envName = "ADGUARD_HOME_TEST_UPDATE_VERSION_URL"
-
-	customURLStr := os.Getenv(envName)
-
-	var versionURL *url.URL
-	switch {
-	case version.Channel() == version.ChannelRelease:
-		// Only enable custom version URL for development builds.
-		l.DebugContext(ctx, "custom version url is disabled for release builds")
-	case !config.UnsafeUseCustomUpdateIndexURL:
-		l.DebugContext(ctx, "custom version url is disabled in config")
-	default:
-		versionURL, _ = url.Parse(customURLStr)
-	}
-
-	err := urlutil.ValidateHTTPURL(versionURL)
-	if customURL = err == nil; !customURL {
-		l.DebugContext(ctx, "parsing custom version url", slogutil.KeyError, err)
-
-		versionURL = updater.DefaultVersionURL()
-	}
-
-	l.DebugContext(ctx, "creating updater", "config_path", confPath)
-
-	return updater.NewUpdater(&updater.Config{
-		Client:          config.Filtering.HTTPClient,
-		Version:         version.Version(),
-		Channel:         version.Channel(),
-		GOARCH:          runtime.GOARCH,
-		GOOS:            runtime.GOOS,
-		GOARM:           version.GOARM(),
-		GOMIPS:          version.GOMIPS(),
-		WorkDir:         workDir,
-		ConfName:        confPath,
-		ExecPath:        execPath,
-		VersionCheckURL: versionURL,
-	}), customURL
-}
-
-// checkPermissions checks and migrates permissions of the files and directories
-// used by AdGuard Home, if needed.
-func checkPermissions(
-	ctx context.Context,
-	baseLogger *slog.Logger,
-	workDir string,
-	confPath string,
-	dataDir string,
-	statsDir string,
-	querylogDir string,
-) {
-	l := baseLogger.With(slogutil.KeyPrefix, "permcheck")
-
-	if permcheck.NeedsMigration(ctx, l, workDir, confPath) {
-		permcheck.Migrate(ctx, l, workDir, dataDir, statsDir, querylogDir, confPath)
-	}
-
-	permcheck.Check(ctx, l, workDir, dataDir, statsDir, querylogDir, confPath)
-}
-
 // initUsers initializes context auth module.  Clears config users field.
 func initUsers() (auth *Auth, err error) {
 	sessFilename := filepath.Join(Context.getDataDir(), "sessions.db")
@@ -828,9 +746,8 @@ func startMods(l *slog.Logger) (err error) {
 	return nil
 }
 
-// checkNetworkPermissions checks if the current user permissions are enough to
-// use the required networking functionality.
-func checkNetworkPermissions() {
+// Check if the current user permissions are enough to run AdGuard Home
+func checkPermissions() {
 	log.Info("Checking if AdGuard Home has necessary permissions")
 
 	if ok, err := aghnet.CanBindPrivilegedPorts(); !ok || err != nil {
@@ -1008,12 +925,12 @@ func printHTTPAddresses(proto string) {
 	}
 
 	port := config.HTTPConfig.Address.Port()
-	if proto == urlutil.SchemeHTTPS {
+	if proto == aghhttp.SchemeHTTPS {
 		port = tlsConf.PortHTTPS
 	}
 
 	// TODO(e.burkov): Inspect and perhaps merge with the previous condition.
-	if proto == urlutil.SchemeHTTPS && tlsConf.ServerName != "" {
+	if proto == aghhttp.SchemeHTTPS && tlsConf.ServerName != "" {
 		printWebAddrs(proto, tlsConf.ServerName, tlsConf.PortHTTPS)
 
 		return
@@ -1073,7 +990,7 @@ type jsonError struct {
 }
 
 // cmdlineUpdate updates current application and exits.  l must not be nil.
-func cmdlineUpdate(ctx context.Context, l *slog.Logger, opts options, upd *updater.Updater) {
+func cmdlineUpdate(opts options, upd *updater.Updater, l *slog.Logger) {
 	if !opts.performUpdate {
 		return
 	}
@@ -1086,19 +1003,20 @@ func cmdlineUpdate(ctx context.Context, l *slog.Logger, opts options, upd *updat
 	err := initDNSServer(nil, nil, nil, nil, nil, nil, &tlsConfigSettings{}, l)
 	fatalOnError(err)
 
-	l.InfoContext(ctx, "performing update via cli")
+	log.Info("cmdline update: performing update")
 
 	info, err := upd.VersionInfo(true)
 	if err != nil {
-		l.ErrorContext(ctx, "getting version info", slogutil.KeyError, err)
+		vcu := upd.VersionCheckURL()
+		log.Error("getting version info from %s: %s", vcu, err)
 
-		os.Exit(osutil.ExitCodeFailure)
+		os.Exit(1)
 	}
 
 	if info.NewVersion == version.Version() {
-		l.InfoContext(ctx, "no updates available")
+		log.Info("no updates available")
 
-		os.Exit(osutil.ExitCodeSuccess)
+		os.Exit(0)
 	}
 
 	err = upd.Update(Context.firstRun)
@@ -1106,10 +1024,10 @@ func cmdlineUpdate(ctx context.Context, l *slog.Logger, opts options, upd *updat
 
 	err = restartService()
 	if err != nil {
-		l.DebugContext(ctx, "restarting service", slogutil.KeyError, err)
-		l.InfoContext(ctx, "AdGuard Home was not installed as a service. "+
+		log.Debug("restarting service: %s", err)
+		log.Info("AdGuard Home was not installed as a service. " +
 			"Please restart running instances of AdGuardHome manually.")
 	}
 
-	os.Exit(osutil.ExitCodeSuccess)
+	os.Exit(0)
 }

internal/home/log.go

@@ -24,15 +24,10 @@ func newSlogLogger(ls *logSettings) (l *slog.Logger) {
 		return slogutil.NewDiscardLogger()
 	}
 
-	lvl := slog.LevelInfo
-	if ls.Verbose {
-		lvl = slog.LevelDebug
-	}
-
 	return slogutil.New(&slogutil.Config{
 		Format:       slogutil.FormatAdGuardLegacy,
-		Level:        lvl,
 		AddTimestamp: true,
+		Verbose:      ls.Verbose,
 	})
 }
 

internal/home/mobileconfig.go

@@ -8,11 +8,11 @@ import (
 	"net/url"
 	"path"
 
+	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/httphdr"
 	"github.com/AdguardTeam/golibs/log"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/google/uuid"
 	"howett.net/plist"
 )
@@ -84,7 +84,7 @@ func encodeMobileConfig(d *dnsSettings, clientID string) ([]byte, error) {
 	case dnsProtoHTTPS:
 		dspName = fmt.Sprintf("%s DoH", d.ServerName)
 		u := &url.URL{
-			Scheme: urlutil.SchemeHTTPS,
+			Scheme: aghhttp.SchemeHTTPS,
 			Host:   d.ServerName,
 			Path:   path.Join("/dns-query", clientID),
 		}

internal/home/options.go

@@ -78,10 +78,6 @@ type options struct {
 	// localFrontend forces AdGuard Home to use the frontend files from disk
 	// rather than the ones that have been compiled into the binary.
 	localFrontend bool
-
-	// noPermCheck disables checking and migration of permissions for the
-	// security-sensitive files.
-	noPermCheck bool
 }
 
 // initCmdLineOpts completes initialization of the global command-line option
@@ -309,15 +305,6 @@ var cmdLineOpts = []cmdLineOpt{{
 	description:     "Run in GL-Inet compatibility mode.",
 	longName:        "glinet",
 	shortName:       "",
-}, {
-	updateWithValue: nil,
-	updateNoValue:   func(o options) (options, error) { o.noPermCheck = true; return o, nil },
-	effect:          nil,
-	serialize:       func(o options) (val string, ok bool) { return "", o.noPermCheck },
-	description: "Skip checking and migration of permissions " +
-		"of security-sensitive files.",
-	longName:  "no-permcheck",
-	shortName: "",
 }, {
 	updateWithValue: nil,
 	updateNoValue:   nil,

internal/home/service.go

@@ -10,11 +10,11 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
 	"github.com/AdguardTeam/AdGuardHome/internal/version"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/kardianos/service"
 )
 
@@ -336,7 +336,7 @@ AdGuard Home is successfully installed and will automatically start on boot.
 There are a few more things that must be configured before you can use it.
 Click on the link below and follow the Installation Wizard steps to finish setup.
 AdGuard Home is now available at the following addresses:`)
-		printHTTPAddresses(urlutil.SchemeHTTP)
+		printHTTPAddresses(aghhttp.SchemeHTTP)
 	}
 }
 

internal/home/web.go

@@ -11,13 +11,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
 	"github.com/AdguardTeam/AdGuardHome/internal/updater"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/netutil"
 	"github.com/AdguardTeam/golibs/netutil/httputil"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/NYTimes/gziphandler"
 	"github.com/quic-go/quic-go/http3"
 	"golang.org/x/net/http2"
@@ -101,8 +101,6 @@ type webAPI struct {
 
 // newWebAPI creates a new instance of the web UI and API server.  l must not be
 // nil.
-//
-// TODO(a.garipov):  Return a proper error.
 func newWebAPI(conf *webConfig, l *slog.Logger) (w *webAPI) {
 	log.Info("web: initializing")
 
@@ -194,7 +192,7 @@ func (web *webAPI) start() {
 
 	// this loop is used as an ability to change listening host and/or port
 	for !web.httpsServer.inShutdown {
-		printHTTPAddresses(urlutil.SchemeHTTP)
+		printHTTPAddresses(aghhttp.SchemeHTTP)
 		errs := make(chan error, 2)
 
 		// Use an h2c handler to support unencrypted HTTP/2, e.g. for proxies.
@@ -288,7 +286,7 @@ func (web *webAPI) tlsServerLoop() {
 			WriteTimeout:      web.conf.WriteTimeout,
 		}
 
-		printHTTPAddresses(urlutil.SchemeHTTPS)
+		printHTTPAddresses(aghhttp.SchemeHTTPS)
 
 		if web.conf.serveHTTP3 {
 			go web.mustStartHTTP3(addr)

internal/next/agh/agh.go

@@ -1,9 +1,36 @@
 // Package agh contains common entities and interfaces of AdGuard Home.
 package agh
 
-import (
-	"github.com/AdguardTeam/golibs/service"
-)
+import "context"
+
+// Service is the interface for API servers.
+//
+// TODO(a.garipov): Consider adding a context to Start.
+//
+// TODO(a.garipov): Consider adding a Wait method or making an extension
+// interface for that.
+type Service interface {
+	// Start starts the service.  It does not block.
+	Start() (err error)
+
+	// Shutdown gracefully stops the service.  ctx is used to determine
+	// a timeout before trying to stop the service less gracefully.
+	Shutdown(ctx context.Context) (err error)
+}
+
+// type check
+var _ Service = EmptyService{}
+
+// EmptyService is a [Service] that does nothing.
+//
+// TODO(a.garipov): Remove if unnecessary.
+type EmptyService struct{}
+
+// Start implements the [Service] interface for EmptyService.
+func (EmptyService) Start() (err error) { return nil }
+
+// Shutdown implements the [Service] interface for EmptyService.
+func (EmptyService) Shutdown(_ context.Context) (err error) { return nil }
 
 // ServiceWithConfig is an extension of the [Service] interface for services
 // that can return their configuration.
@@ -11,7 +38,7 @@ import (
 // TODO(a.garipov): Consider removing this generic interface if we figure out
 // how to make it testable in a better way.
 type ServiceWithConfig[ConfigType any] interface {
-	service.Interface
+	Service
 
 	Config() (c ConfigType)
 }
@@ -24,7 +51,7 @@ var _ ServiceWithConfig[struct{}] = (*EmptyServiceWithConfig[struct{}])(nil)
 //
 // TODO(a.garipov): Remove if unnecessary.
 type EmptyServiceWithConfig[ConfigType any] struct {
-	service.Empty
+	EmptyService
 
 	Conf ConfigType
 }

internal/next/cmd/cmd.go

@@ -12,15 +12,11 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/internal/next/configmgr"
 	"github.com/AdguardTeam/AdGuardHome/internal/version"
-	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"github.com/AdguardTeam/golibs/service"
+	"github.com/AdguardTeam/golibs/log"
 )
 
 // Main is the entry point of AdGuard Home.
 func Main(embeddedFrontend fs.FS) {
-	ctx := context.Background()
-
 	start := time.Now()
 
 	cmdName := os.Args[0]
@@ -30,69 +26,70 @@ func Main(embeddedFrontend fs.FS) {
 		os.Exit(exitCode)
 	}
 
-	baseLogger := newBaseLogger(opts)
+	err = setLog(opts)
+	check(err)
 
-	baseLogger.InfoContext(
-		ctx,
-		"starting adguard home",
-		"version", version.Version(),
-		"pid", os.Getpid(),
-	)
+	log.Info("starting adguard home, version %s, pid %d", version.Version(), os.Getpid())
 
 	if opts.workDir != "" {
-		baseLogger.InfoContext(ctx, "changing working directory", "dir", opts.workDir)
-
+		log.Info("changing working directory to %q", opts.workDir)
 		err = os.Chdir(opts.workDir)
-		errors.Check(err)
+		check(err)
 	}
 
-	frontend, err := frontendFromOpts(ctx, baseLogger, opts, embeddedFrontend)
-	errors.Check(err)
-
-	startCtx, startCancel := context.WithTimeout(ctx, defaultTimeoutStart)
-	defer startCancel()
+	frontend, err := frontendFromOpts(opts, embeddedFrontend)
+	check(err)
 
 	confMgrConf := &configmgr.Config{
-		BaseLogger: baseLogger,
-		Logger:     baseLogger.With(slogutil.KeyPrefix, "configmgr"),
-		Frontend:   frontend,
-		WebAddr:    opts.webAddr,
-		Start:      start,
-		FileName:   opts.confFile,
+		Frontend: frontend,
+		WebAddr:  opts.webAddr,
+		Start:    start,
+		FileName: opts.confFile,
 	}
 
-	confMgr, err := configmgr.New(startCtx, confMgrConf)
-	errors.Check(err)
+	confMgr, err := newConfigMgr(confMgrConf)
+	check(err)
 
 	web := confMgr.Web()
-	err = web.Start(startCtx)
-	errors.Check(err)
+	err = web.Start()
+	check(err)
 
 	dns := confMgr.DNS()
-	err = dns.Start(startCtx)
-	errors.Check(err)
+	err = dns.Start()
+	check(err)
 
 	sigHdlr := newSignalHandler(
-		baseLogger.With(slogutil.KeyPrefix, service.SignalHandlerPrefix),
 		confMgrConf,
 		opts.pidFile,
 		web,
 		dns,
 	)
 
-	os.Exit(sigHdlr.handle(ctx))
+	sigHdlr.handle()
 }
 
-// Default timeouts.
-//
-// TODO(a.garipov):  Make configurable.
-const (
-	defaultTimeoutStart    = 1 * time.Minute
-	defaultTimeoutShutdown = 5 * time.Second
-)
+// defaultTimeout is the timeout used for some operations where another timeout
+// hasn't been defined yet.
+const defaultTimeout = 5 * time.Second
+
+// ctxWithDefaultTimeout is a helper function that returns a context with
+// timeout set to defaultTimeout.
+func ctxWithDefaultTimeout() (ctx context.Context, cancel context.CancelFunc) {
+	return context.WithTimeout(context.Background(), defaultTimeout)
+}
 
 // newConfigMgr returns a new configuration manager using defaultTimeout as the
 // context timeout.
-func newConfigMgr(ctx context.Context, c *configmgr.Config) (m *configmgr.Manager, err error) {
+func newConfigMgr(c *configmgr.Config) (m *configmgr.Manager, err error) {
+	ctx, cancel := ctxWithDefaultTimeout()
+	defer cancel()
+
 	return configmgr.New(ctx, c)
 }
+
+// check is a simple error-checking helper.  It must only be used within Main.
+func check(err error) {
+	if err != nil {
+		panic(err)
+	}
+}

internal/next/cmd/log.go

@@ -1,39 +1,39 @@
 package cmd
 
 import (
-	"io"
-	"log/slog"
+	"fmt"
 	"os"
 
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
+	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
+	"github.com/AdguardTeam/golibs/log"
 )
 
-// newBaseLogger constructs a base logger based on the command-line options.
-// opts must not be nil.
-func newBaseLogger(opts *options) (baseLogger *slog.Logger) {
-	var output io.Writer
+// syslogServiceName is the name of the AdGuard Home service used for writing
+// logs to the system log.
+const syslogServiceName = "AdGuardHome"
+
+// setLog sets up the text logging.
+//
+// TODO(a.garipov): Add parameters from configuration file.
+func setLog(opts *options) (err error) {
 	switch opts.confFile {
 	case "stdout":
-		output = os.Stdout
+		log.SetOutput(os.Stdout)
 	case "stderr":
-		output = os.Stderr
+		log.SetOutput(os.Stderr)
 	case "syslog":
-		// TODO(a.garipov):  Add a syslog handler to golibs.
+		err = aghos.ConfigureSyslog(syslogServiceName)
+		if err != nil {
+			return fmt.Errorf("initializing syslog: %w", err)
+		}
 	default:
-		// TODO(a.garipov):  Use the path.
+		// TODO(a.garipov): Use the path.
 	}
 
-	lvl := slog.LevelInfo
 	if opts.verbose {
-		lvl = slog.LevelDebug
+		log.SetLevel(log.DEBUG)
+		log.Debug("verbose logging enabled")
 	}
 
-	return slogutil.New(&slogutil.Config{
-		Output: output,
-		// TODO(a.garipov):  Get from config?
-		Format: slogutil.FormatText,
-		Level:  lvl,
-		// TODO(a.garipov):  Get from config.
-		AddTimestamp: true,
-	})
+	return nil
 }

internal/next/cmd/opt.go

@@ -1,13 +1,11 @@
 package cmd
 
 import (
-	"context"
 	"encoding"
 	"flag"
 	"fmt"
 	"io"
 	"io/fs"
-	"log/slog"
 	"net/netip"
 	"os"
 	"slices"
@@ -16,7 +14,7 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/configmigrate"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/configmgr"
 	"github.com/AdguardTeam/AdGuardHome/internal/version"
-	"github.com/AdguardTeam/golibs/osutil"
+	"github.com/AdguardTeam/golibs/log"
 )
 
 // options contains all command-line options for the AdGuardHome(.exe) binary.
@@ -89,12 +87,6 @@ type options struct {
 	// TODO(a.garipov): Use.
 	performUpdate bool
 
-	// noPermCheck, if true, instructs AdGuard Home to skip checking and
-	// migrating the permissions of its security-sensitive files.
-	//
-	// TODO(e.burkov):  Use.
-	noPermCheck bool
-
 	// verbose, if true, instructs AdGuard Home to enable verbose logging.
 	verbose bool
 
@@ -116,8 +108,7 @@ const (
 	disableUpdateIdx
 	glinetModeIdx
 	helpIdx
-	localFrontendIdx
-	noPermCheckIdx
+	localFrontend
 	performUpdateIdx
 	verboseIdx
 	versionIdx
@@ -221,7 +212,7 @@ var commandLineOptions = []*commandLineOption{
 		valueType:    "",
 	},
 
-	localFrontendIdx: {
+	localFrontend: {
 		defaultValue: false,
 		description:  "Use local frontend directories.",
 		long:         "local-frontend",
@@ -229,14 +220,6 @@ var commandLineOptions = []*commandLineOption{
 		valueType:    "",
 	},
 
-	noPermCheckIdx: {
-		defaultValue: false,
-		description:  "Skip checking the permissions of security-sensitive files.",
-		long:         "no-permcheck",
-		short:        "",
-		valueType:    "",
-	},
-
 	performUpdateIdx: {
 		defaultValue: false,
 		description:  "Update the current binary and restart the service in case it's installed.",
@@ -279,8 +262,7 @@ func parseOptions(cmdName string, args []string) (opts *options, err error) {
 		disableUpdateIdx: &opts.disableUpdate,
 		glinetModeIdx:    &opts.glinetMode,
 		helpIdx:          &opts.help,
-		localFrontendIdx: &opts.localFrontend,
-		noPermCheckIdx:   &opts.noPermCheck,
+		localFrontend:    &opts.localFrontend,
 		performUpdateIdx: &opts.performUpdate,
 		verboseIdx:       &opts.verbose,
 		versionIdx:       &opts.version,
@@ -390,13 +372,13 @@ func processOptions(
 ) (exitCode int, needExit bool) {
 	if parseErr != nil {
 		// Assume that usage has already been printed.
-		return osutil.ExitCodeArgumentError, true
+		return statusArgumentError, true
 	}
 
 	if opts.help {
 		usage(cmdName, os.Stdout)
 
-		return osutil.ExitCodeSuccess, true
+		return statusSuccess, true
 	}
 
 	if opts.version {
@@ -406,7 +388,7 @@ func processOptions(
 			fmt.Printf("AdGuard Home %s\n", version.Version())
 		}
 
-		return osutil.ExitCodeSuccess, true
+		return statusSuccess, true
 	}
 
 	if opts.checkConfig {
@@ -414,26 +396,21 @@ func processOptions(
 		if err != nil {
 			_, _ = io.WriteString(os.Stdout, err.Error()+"\n")
 
-			return osutil.ExitCodeFailure, true
+			return statusError, true
 		}
 
-		return osutil.ExitCodeSuccess, true
+		return statusSuccess, true
 	}
 
 	return 0, false
 }
 
 // frontendFromOpts returns the frontend to use based on the options.
-func frontendFromOpts(
-	ctx context.Context,
-	logger *slog.Logger,
-	opts *options,
-	embeddedFrontend fs.FS,
-) (frontend fs.FS, err error) {
+func frontendFromOpts(opts *options, embeddedFrontend fs.FS) (frontend fs.FS, err error) {
 	const frontendSubdir = "build/static"
 
 	if opts.localFrontend {
-		logger.WarnContext(ctx, "using local frontend files")
+		log.Info("warning: using local frontend files")
 
 		return os.DirFS(frontendSubdir), nil
 	}

internal/next/cmd/signal.go

@@ -1,26 +1,19 @@
 package cmd
 
 import (
-	"context"
-	"fmt"
-	"log/slog"
 	"os"
 	"strconv"
-	"time"
 
+	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
+	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/configmgr"
-	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
+	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/osutil"
-	"github.com/AdguardTeam/golibs/service"
 	"github.com/google/renameio/v2/maybe"
 )
 
 // signalHandler processes incoming signals and shuts services down.
 type signalHandler struct {
-	// logger is used for logging the operation of the signal handler.
-	logger *slog.Logger
-
 	// confMgrConf contains the configuration parameters for the configuration
 	// manager.
 	confMgrConf *configmgr.Config
@@ -32,172 +25,145 @@ type signalHandler struct {
 	pidFile string
 
 	// services are the services that are shut down before application exiting.
-	services []service.Interface
-
-	// shutdownTimeout is the timeout for the shutdown operation.
-	shutdownTimeout time.Duration
+	services []agh.Service
 }
 
-// handle processes OS signals.  It blocks until a termination or a
-// reconfiguration signal is received, after which it either shuts down all
-// services or reconfigures them.  ctx is used for logging and serves as the
-// base for the shutdown timeout.  status is [osutil.ExitCodeSuccess] on success
-// and [osutil.ExitCodeFailure] on error.
-//
-// TODO(a.garipov):  Add reconfiguration logic to golibs.
-func (h *signalHandler) handle(ctx context.Context) (status osutil.ExitCode) {
-	defer slogutil.RecoverAndLog(ctx, h.logger)
+// handle processes OS signals.
+func (h *signalHandler) handle() {
+	defer log.OnPanic("signalHandler.handle")
 
-	h.writePID(ctx)
+	h.writePID()
 
 	for sig := range h.signal {
-		h.logger.InfoContext(ctx, "received", "signal", sig)
+		log.Info("sighdlr: received signal %q", sig)
 
-		if osutil.IsReconfigureSignal(sig) {
-			err := h.reconfigure(ctx)
-			if err != nil {
-				h.logger.ErrorContext(ctx, "reconfiguration error", slogutil.KeyError, err)
-
-				return osutil.ExitCodeFailure
-			}
+		if aghos.IsReconfigureSignal(sig) {
+			h.reconfigure()
 		} else if osutil.IsShutdownSignal(sig) {
-			status = h.shutdown(ctx)
+			status := h.shutdown()
+			h.removePID()
 
-			h.removePID(ctx)
+			log.Info("sighdlr: exiting with status %d", status)
 
-			return status
+			os.Exit(status)
 		}
 	}
-
-	// Shouldn't happen, since h.signal is currently never closed.
-	panic("unexpected close of h.signal")
-}
-
-// writePID writes the PID to the file, if needed.  Any errors are reported to
-// log.
-func (h *signalHandler) writePID(ctx context.Context) {
-	if h.pidFile == "" {
-		return
-	}
-
-	pid := os.Getpid()
-	data := strconv.AppendInt(nil, int64(pid), 10)
-	data = append(data, '\n')
-
-	err := maybe.WriteFile(h.pidFile, data, 0o644)
-	if err != nil {
-		h.logger.ErrorContext(ctx, "writing pidfile", slogutil.KeyError, err)
-
-		return
-	}
-
-	h.logger.DebugContext(ctx, "wrote pid", "file", h.pidFile, "pid", pid)
 }
 
 // reconfigure rereads the configuration file and updates and restarts services.
-func (h *signalHandler) reconfigure(ctx context.Context) (err error) {
-	h.logger.InfoContext(ctx, "reconfiguring started")
+func (h *signalHandler) reconfigure() {
+	log.Info("sighdlr: reconfiguring adguard home")
 
-	status := h.shutdown(ctx)
-	if status != osutil.ExitCodeSuccess {
-		return errors.Error("shutdown failed")
+	status := h.shutdown()
+	if status != statusSuccess {
+		log.Info("sighdlr: reconfiguring: exiting with status %d", status)
+
+		os.Exit(status)
 	}
 
-	// TODO(a.garipov):  This is a very rough way to do it.  Some services can
-	// be reconfigured without the full shutdown, and the error handling is
+	// TODO(a.garipov): This is a very rough way to do it.  Some services can be
+	// reconfigured without the full shutdown, and the error handling is
 	// currently not the best.
 
-	var errs []error
-
-	ctx, cancel := context.WithTimeout(ctx, defaultTimeoutStart)
-	defer cancel()
-
-	confMgr, err := newConfigMgr(ctx, h.confMgrConf)
-	if err != nil {
-		errs = append(errs, fmt.Errorf("configuration manager: %w", err))
-	}
+	confMgr, err := newConfigMgr(h.confMgrConf)
+	check(err)
 
 	web := confMgr.Web()
-	err = web.Start(ctx)
-	if err != nil {
-		errs = append(errs, fmt.Errorf("starting web: %w", err))
-	}
+	err = web.Start()
+	check(err)
 
 	dns := confMgr.DNS()
-	err = dns.Start(ctx)
-	if err != nil {
-		errs = append(errs, fmt.Errorf("starting dns: %w", err))
-	}
+	err = dns.Start()
+	check(err)
 
-	if len(errs) > 0 {
-		return errors.Join(errs...)
-	}
-
-	h.services = []service.Interface{
+	h.services = []agh.Service{
 		dns,
 		web,
 	}
 
-	h.logger.InfoContext(ctx, "reconfiguring finished")
-
-	return nil
+	log.Info("sighdlr: successfully reconfigured adguard home")
 }
 
+// Exit status constants.
+const (
+	statusSuccess       = 0
+	statusError         = 1
+	statusArgumentError = 2
+)
+
 // shutdown gracefully shuts down all services.
-func (h *signalHandler) shutdown(ctx context.Context) (status int) {
-	ctx, cancel := context.WithTimeout(ctx, h.shutdownTimeout)
+func (h *signalHandler) shutdown() (status int) {
+	ctx, cancel := ctxWithDefaultTimeout()
 	defer cancel()
 
-	status = osutil.ExitCodeSuccess
+	status = statusSuccess
 
-	h.logger.InfoContext(ctx, "shutting down")
-	for i, svc := range h.services {
-		err := svc.Shutdown(ctx)
+	log.Info("sighdlr: shutting down services")
+	for i, service := range h.services {
+		err := service.Shutdown(ctx)
 		if err != nil {
-			h.logger.ErrorContext(ctx, "shutting down service", "idx", i, slogutil.KeyError, err)
-			status = osutil.ExitCodeFailure
+			log.Error("sighdlr: shutting down service at index %d: %s", i, err)
+			status = statusError
 		}
 	}
 
 	return status
 }
 
-// newSignalHandler returns a new signalHandler that shuts down svcs.  logger
-// and confMgrConf must not be nil.
+// newSignalHandler returns a new signalHandler that shuts down svcs.
 func newSignalHandler(
-	logger *slog.Logger,
 	confMgrConf *configmgr.Config,
 	pidFile string,
-	svcs ...service.Interface,
+	svcs ...agh.Service,
 ) (h *signalHandler) {
 	h = &signalHandler{
-		logger:          logger,
-		confMgrConf:     confMgrConf,
-		signal:          make(chan os.Signal, 1),
-		pidFile:         pidFile,
-		services:        svcs,
-		shutdownTimeout: defaultTimeoutShutdown,
+		confMgrConf: confMgrConf,
+		signal:      make(chan os.Signal, 1),
+		pidFile:     pidFile,
+		services:    svcs,
 	}
 
 	notifier := osutil.DefaultSignalNotifier{}
 	osutil.NotifyShutdownSignal(notifier, h.signal)
-	osutil.NotifyReconfigureSignal(notifier, h.signal)
+	aghos.NotifyReconfigureSignal(h.signal)
 
 	return h
 }
 
+// writePID writes the PID to the file, if needed.  Any errors are reported to
+// log.
+func (h *signalHandler) writePID() {
+	if h.pidFile == "" {
+		return
+	}
+
+	// Use 8, since most PIDs will fit.
+	data := make([]byte, 0, 8)
+	data = strconv.AppendInt(data, int64(os.Getpid()), 10)
+	data = append(data, '\n')
+
+	err := maybe.WriteFile(h.pidFile, data, 0o644)
+	if err != nil {
+		log.Error("sighdlr: writing pidfile: %s", err)
+
+		return
+	}
+
+	log.Debug("sighdlr: wrote pid to %q", h.pidFile)
+}
+
 // removePID removes the PID file, if any.
-func (h *signalHandler) removePID(ctx context.Context) {
+func (h *signalHandler) removePID() {
 	if h.pidFile == "" {
 		return
 	}
 
 	err := os.Remove(h.pidFile)
 	if err != nil {
-		h.logger.ErrorContext(ctx, "removing pidfile", slogutil.KeyError, err)
+		log.Error("sighdlr: removing pidfile: %s", err)
 
 		return
 	}
 
-	h.logger.DebugContext(ctx, "removed pidfile", "file", h.pidFile)
+	log.Debug("sighdlr: removed pid at %q", h.pidFile)
 }

internal/next/configmgr/config.go

@@ -4,11 +4,12 @@ import (
 	"fmt"
 	"net/netip"
 
-	"github.com/AdguardTeam/golibs/container"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/timeutil"
 )
 
+// Configuration Structures
+
 // config is the top-level on-disk configuration structure.
 type config struct {
 	DNS  *dnsConfig  `yaml:"dns"`
@@ -18,33 +19,35 @@ type config struct {
 	SchemaVersion int `yaml:"schema_version"`
 }
 
-// type check
-var _ validator = (*config)(nil)
+const errNoConf errors.Error = "configuration not found"
 
-// validate implements the [validator] interface for *config.
+// validate returns an error if the configuration structure is invalid.
 func (c *config) validate() (err error) {
 	if c == nil {
-		return errors.ErrNoValue
+		return errNoConf
 	}
 
 	// TODO(a.garipov): Add more validations.
 
 	// Keep this in the same order as the fields in the config.
-	validators := container.KeyValues[string, validator]{{
-		Key:   "dns",
-		Value: c.DNS,
+	validators := []struct {
+		validate func() (err error)
+		name     string
+	}{{
+		validate: c.DNS.validate,
+		name:     "dns",
 	}, {
-		Key:   "http",
-		Value: c.HTTP,
+		validate: c.HTTP.validate,
+		name:     "http",
 	}, {
-		Key:   "log",
-		Value: c.Log,
+		validate: c.Log.validate,
+		name:     "log",
 	}}
 
-	for _, kv := range validators {
-		err = kv.Value.validate()
+	for _, v := range validators {
+		err = v.validate()
 		if err != nil {
-			return fmt.Errorf("%s: %w", kv.Key, err)
+			return fmt.Errorf("%s: %w", v.name, err)
 		}
 	}
 
@@ -62,19 +65,16 @@ type dnsConfig struct {
 	UseDNS64            bool              `yaml:"use_dns64"`
 }
 
-// type check
-var _ validator = (*dnsConfig)(nil)
-
-// validate implements the [validator] interface for *dnsConfig.
+// validate returns an error if the DNS configuration structure is invalid.
 //
 // TODO(a.garipov): Add more validations.
 func (c *dnsConfig) validate() (err error) {
 	// TODO(a.garipov): Add more validations.
 	switch {
 	case c == nil:
-		return errors.ErrNoValue
+		return errNoConf
 	case c.UpstreamTimeout.Duration <= 0:
-		return newErrNotPositive("upstream_timeout", c.UpstreamTimeout)
+		return newMustBePositiveError("upstream_timeout", c.UpstreamTimeout)
 	default:
 		return nil
 	}
@@ -91,18 +91,15 @@ type httpConfig struct {
 	ForceHTTPS      bool              `yaml:"force_https"`
 }
 
-// type check
-var _ validator = (*httpConfig)(nil)
-
-// validate implements the [validator] interface for *httpConfig.
+// validate returns an error if the HTTP configuration structure is invalid.
 //
 // TODO(a.garipov): Add more validations.
 func (c *httpConfig) validate() (err error) {
 	switch {
 	case c == nil:
-		return errors.ErrNoValue
+		return errNoConf
 	case c.Timeout.Duration <= 0:
-		return newErrNotPositive("timeout", c.Timeout)
+		return newMustBePositiveError("timeout", c.Timeout)
 	default:
 		return c.Pprof.validate()
 	}
@@ -114,13 +111,10 @@ type httpPprofConfig struct {
 	Enabled bool   `yaml:"enabled"`
 }
 
-// type check
-var _ validator = (*httpPprofConfig)(nil)
-
-// validate implements the [validator] interface for *httpPprofConfig.
+// validate returns an error if the pprof configuration structure is invalid.
 func (c *httpPprofConfig) validate() (err error) {
 	if c == nil {
-		return errors.ErrNoValue
+		return errNoConf
 	}
 
 	return nil
@@ -132,15 +126,12 @@ type logConfig struct {
 	Verbose bool `yaml:"verbose"`
 }
 
-// type check
-var _ validator = (*logConfig)(nil)
-
-// validate implements the [validator] interface for *logConfig.
+// validate returns an error if the HTTP configuration structure is invalid.
 //
 // TODO(a.garipov): Add more validations.
 func (c *logConfig) validate() (err error) {
 	if c == nil {
-		return errors.ErrNoValue
+		return errNoConf
 	}
 
 	return nil

internal/next/configmgr/configmgr.go

@@ -8,7 +8,6 @@ import (
 	"context"
 	"fmt"
 	"io/fs"
-	"log/slog"
 	"net/netip"
 	"os"
 	"slices"
@@ -20,23 +19,19 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
 	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
+	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/golibs/timeutil"
 	"github.com/google/renameio/v2/maybe"
 	"gopkg.in/yaml.v3"
 )
 
+// Configuration Manager
+
 // Manager handles full and partial changes in the configuration, persisting
 // them to disk if necessary.
 //
 // TODO(a.garipov): Support missing configs and default values.
 type Manager struct {
-	// baseLogger is used to create loggers for other entities.
-	baseLogger *slog.Logger
-
-	// logger is used for logging the operation of the configuration manager.
-	logger *slog.Logger
-
 	// updMu makes sure that at most one reconfiguration is performed at a time.
 	// updMu protects all fields below.
 	updMu *sync.RWMutex
@@ -63,24 +58,12 @@ func Validate(fileName string) (err error) {
 		return err
 	}
 
-	err = conf.validate()
-	if err != nil {
-		return fmt.Errorf("validating config: %w", err)
-	}
-
-	return nil
+	// Don't wrap the error, because it's informative enough as is.
+	return conf.validate()
 }
 
 // Config contains the configuration parameters for the configuration manager.
 type Config struct {
-	// BaseLogger is used to create loggers for other entities.  It must not be
-	// nil.
-	BaseLogger *slog.Logger
-
-	// Logger is used for logging the operation of the configuration manager.
-	// It must not be nil.
-	Logger *slog.Logger
-
 	// Frontend is the filesystem with the frontend files.
 	Frontend fs.FS
 
@@ -111,11 +94,9 @@ func New(ctx context.Context, c *Config) (m *Manager, err error) {
 	}
 
 	m = &Manager{
-		baseLogger: c.BaseLogger,
-		logger:     c.Logger,
-		updMu:      &sync.RWMutex{},
-		current:    conf,
-		fileName:   c.FileName,
+		updMu:    &sync.RWMutex{},
+		current:  conf,
+		fileName: c.FileName,
 	}
 
 	err = m.assemble(ctx, conf, c.Frontend, c.WebAddr, c.Start)
@@ -157,7 +138,6 @@ func (m *Manager) assemble(
 	start time.Time,
 ) (err error) {
 	dnsConf := &dnssvc.Config{
-		Logger:              m.baseLogger.With(slogutil.KeyPrefix, "dnssvc"),
 		Addresses:           conf.DNS.Addresses,
 		BootstrapServers:    conf.DNS.BootstrapDNS,
 		UpstreamServers:     conf.DNS.UpstreamDNS,
@@ -172,7 +152,6 @@ func (m *Manager) assemble(
 	}
 
 	webSvcConf := &websvc.Config{
-		Logger: m.baseLogger.With(slogutil.KeyPrefix, "websvc"),
 		Pprof: &websvc.PprofConfig{
 			Port:    conf.HTTP.Pprof.Port,
 			Enabled: conf.HTTP.Pprof.Enabled,
@@ -198,7 +177,7 @@ func (m *Manager) assemble(
 }
 
 // write writes the current configuration to disk.
-func (m *Manager) write(ctx context.Context) (err error) {
+func (m *Manager) write() (err error) {
 	b, err := yaml.Marshal(m.current)
 	if err != nil {
 		return fmt.Errorf("encoding: %w", err)
@@ -209,7 +188,7 @@ func (m *Manager) write(ctx context.Context) (err error) {
 		return fmt.Errorf("writing: %w", err)
 	}
 
-	m.logger.InfoContext(ctx, "config file written", "path", m.fileName)
+	log.Info("configmgr: written to %q", m.fileName)
 
 	return nil
 }
@@ -238,7 +217,7 @@ func (m *Manager) UpdateDNS(ctx context.Context, c *dnssvc.Config) (err error) {
 
 	m.updateCurrentDNS(c)
 
-	return m.write(ctx)
+	return m.write()
 }
 
 // updateDNS recreates the DNS service.  m.updMu is expected to be locked.
@@ -292,7 +271,7 @@ func (m *Manager) UpdateWeb(ctx context.Context, c *websvc.Config) (err error) {
 
 	m.updateCurrentWeb(c)
 
-	return m.write(ctx)
+	return m.write()
 }
 
 // updateWeb recreates the web service.  m.upd is expected to be locked.

internal/next/configmgr/error.go

@@ -3,29 +3,25 @@ package configmgr
 import (
 	"fmt"
 
-	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/timeutil"
 	"golang.org/x/exp/constraints"
 )
 
-// validator is the interface for configuration entities that can validate
-// themselves.
-type validator interface {
-	// validate returns an error if the entity isn't valid.
-	validate() (err error)
-}
-
 // numberOrDuration is the constraint for integer types along with
 // timeutil.Duration.
 type numberOrDuration interface {
 	constraints.Integer | timeutil.Duration
 }
 
-// newErrNotPositive returns an error about the value that must be positive but
-// isn't.  prop is the name of the property to mention in the error message.
+// newMustBePositiveError returns an error about the value that must be positive
+// but isn't.  prop is the name of the property to mention in the error message.
 //
 // TODO(a.garipov): Consider moving such helpers to golibs and use in AdGuardDNS
 // as well.
-func newErrNotPositive[T numberOrDuration](prop string, v T) (err error) {
-	return fmt.Errorf("%s: %w, got %v", prop, errors.ErrNotPositive, v)
+func newMustBePositiveError[T numberOrDuration](prop string, v T) (err error) {
+	if s, ok := any(v).(fmt.Stringer); ok {
+		return fmt.Errorf("%s must be positive, got %s", prop, s)
+	}
+
+	return fmt.Errorf("%s must be positive, got %d", prop, v)
 }

internal/next/dnssvc/config.go

@@ -1,7 +1,6 @@
 package dnssvc
 
 import (
-	"log/slog"
 	"net/netip"
 	"time"
 )
@@ -10,10 +9,6 @@ import (
 //
 // TODO(a.garipov): Add timeout for incoming requests.
 type Config struct {
-	// Logger is used for logging the operation of the web API service.  It must
-	// not be nil.
-	Logger *slog.Logger
-
 	// Addresses are the addresses on which to serve plain DNS queries.
 	Addresses []netip.AddrPort
 

internal/next/dnssvc/dnssvc.go

@@ -7,7 +7,6 @@ package dnssvc
 import (
 	"context"
 	"fmt"
-	"log/slog"
 	"net"
 	"net/netip"
 	"sync/atomic"
@@ -29,7 +28,6 @@ import (
 // TODO(a.garipov): Consider saving a [*proxy.Config] instance for those
 // fields that are only used in [New] and [Service.Config].
 type Service struct {
-	logger              *slog.Logger
 	proxy               *proxy.Proxy
 	bootstraps          []string
 	bootstrapResolvers  []*upstream.UpstreamResolver
@@ -50,7 +48,6 @@ func New(c *Config) (svc *Service, err error) {
 	}
 
 	svc = &Service{
-		logger:              c.Logger,
 		bootstraps:          c.BootstrapServers,
 		upstreams:           c.UpstreamServers,
 		dns64Prefixes:       c.DNS64Prefixes,
@@ -71,7 +68,6 @@ func New(c *Config) (svc *Service, err error) {
 
 	svc.bootstrapResolvers = resolvers
 	svc.proxy, err = proxy.New(&proxy.Config{
-		Logger:        svc.logger,
 		UDPListenAddr: udpAddrs(c.Addresses),
 		TCPListenAddr: tcpAddrs(c.Addresses),
 		UpstreamConfig: &proxy.UpstreamConfig{
@@ -157,12 +153,12 @@ func udpAddrs(addrPorts []netip.AddrPort) (udpAddrs []*net.UDPAddr) {
 }
 
 // type check
-var _ agh.ServiceWithConfig[*Config] = (*Service)(nil)
+var _ agh.Service = (*Service)(nil)
 
 // Start implements the [agh.Service] interface for *Service.  svc may be nil.
 // After Start exits, all DNS servers have tried to start, but there is no
 // guarantee that they did.  Errors from the servers are written to the log.
-func (svc *Service) Start(ctx context.Context) (err error) {
+func (svc *Service) Start() (err error) {
 	if svc == nil {
 		return nil
 	}
@@ -174,7 +170,7 @@ func (svc *Service) Start(ctx context.Context) (err error) {
 		svc.running.Store(err == nil)
 	}()
 
-	return svc.proxy.Start(ctx)
+	return svc.proxy.Start(context.Background())
 }
 
 // Shutdown implements the [agh.Service] interface for *Service.  svc may be
@@ -219,7 +215,6 @@ func (svc *Service) Config() (c *Config) {
 	}
 
 	c = &Config{
-		Logger:              svc.logger,
 		Addresses:           addrs,
 		BootstrapServers:    svc.bootstraps,
 		UpstreamServers:     svc.upstreams,

internal/next/dnssvc/dnssvc_test.go

@@ -6,13 +6,16 @@ import (
 	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/miekg/dns"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+func TestMain(m *testing.M) {
+	testutil.DiscardLogOutput(m)
+}
+
 // testTimeout is the common timeout for tests.
 const testTimeout = 1 * time.Second
 
@@ -56,7 +59,6 @@ func TestService(t *testing.T) {
 	_, _ = testutil.RequireReceive(t, upstreamStartedCh, testTimeout)
 
 	c := &dnssvc.Config{
-		Logger:              slogutil.NewDiscardLogger(),
 		Addresses:           []netip.AddrPort{netip.MustParseAddrPort(listenAddr)},
 		BootstrapServers:    []string{upstreamSrv.PacketConn.LocalAddr().String()},
 		UpstreamServers:     []string{upstreamAddr},
@@ -69,7 +71,7 @@ func TestService(t *testing.T) {
 	svc, err := dnssvc.New(c)
 	require.NoError(t, err)
 
-	err = svc.Start(testutil.ContextWithTimeout(t, testTimeout))
+	err = svc.Start()
 	require.NoError(t, err)
 
 	gotConf := svc.Config()

internal/next/websvc/config.go

@@ -3,17 +3,12 @@ package websvc
 import (
 	"crypto/tls"
 	"io/fs"
-	"log/slog"
 	"net/netip"
 	"time"
 )
 
 // Config is the AdGuard Home web service configuration structure.
 type Config struct {
-	// Logger is used for logging the operation of the web API service.  It must
-	// not be nil.
-	Logger *slog.Logger
-
 	// Pprof is the configuration for the pprof debug API.  It must not be nil.
 	Pprof *PprofConfig
 
@@ -65,20 +60,17 @@ type PprofConfig struct {
 // finished.
 func (svc *Service) Config() (c *Config) {
 	c = &Config{
-		Logger: svc.logger,
 		Pprof: &PprofConfig{
 			Port:    svc.pprofPort,
 			Enabled: svc.pprof != nil,
 		},
 		ConfigManager: svc.confMgr,
-		Frontend:      svc.frontend,
 		TLS:           svc.tls,
 		// Leave Addresses and SecureAddresses empty and get the actual
 		// addresses that include the :0 ones later.
-		Start:           svc.start,
-		OverrideAddress: svc.overrideAddr,
-		Timeout:         svc.timeout,
-		ForceHTTPS:      svc.forceHTTPS,
+		Start:      svc.start,
+		Timeout:    svc.timeout,
+		ForceHTTPS: svc.forceHTTPS,
 	}
 
 	c.Addresses, c.SecureAddresses = svc.addrs()

internal/next/websvc/dns.go

@@ -11,6 +11,8 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
 )
 
+// DNS Settings Handlers
+
 // ReqPatchSettingsDNS describes the request to the PATCH /api/v1/settings/dns
 // HTTP API.
 type ReqPatchSettingsDNS struct {
@@ -58,7 +60,6 @@ func (svc *Service) handlePatchSettingsDNS(w http.ResponseWriter, r *http.Reques
 	}
 
 	newConf := &dnssvc.Config{
-		Logger:              svc.logger,
 		Addresses:           req.Addresses,
 		BootstrapServers:    req.BootstrapServers,
 		UpstreamServers:     req.UpstreamServers,
@@ -77,7 +78,7 @@ func (svc *Service) handlePatchSettingsDNS(w http.ResponseWriter, r *http.Reques
 	}
 
 	newSvc := svc.confMgr.DNS()
-	err = newSvc.Start(ctx)
+	err = newSvc.Start()
 	if err != nil {
 		aghhttp.WriteJSONResponseError(w, r, fmt.Errorf("starting new service: %w", err))
 

internal/next/websvc/dns_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -35,7 +34,7 @@ func TestService_HandlePatchSettingsDNS(t *testing.T) {
 	confMgr := newConfigManager()
 	confMgr.onDNS = func() (s agh.ServiceWithConfig[*dnssvc.Config]) {
 		return &aghtest.ServiceWithConfig[*dnssvc.Config]{
-			OnStart: func(_ context.Context) (err error) {
+			OnStart: func() (err error) {
 				started.Store(true)
 
 				return nil
@@ -50,9 +49,9 @@ func TestService_HandlePatchSettingsDNS(t *testing.T) {
 
 	_, addr := newTestServer(t, confMgr)
 	u := &url.URL{
-		Scheme: urlutil.SchemeHTTP,
+		Scheme: "http",
 		Host:   addr.String(),
-		Path:   websvc.PathPatternV1SettingsDNS,
+		Path:   websvc.PathV1SettingsDNS,
 	}
 
 	req := jobj{

internal/next/websvc/http.go

@@ -10,9 +10,11 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
+	"github.com/AdguardTeam/golibs/log"
 )
 
+// HTTP Settings Handlers
+
 // ReqPatchSettingsHTTP describes the request to the PATCH /api/v1/settings/http
 // HTTP API.
 type ReqPatchSettingsHTTP struct {
@@ -51,7 +53,6 @@ func (svc *Service) handlePatchSettingsHTTP(w http.ResponseWriter, r *http.Reque
 	}
 
 	newConf := &Config{
-		Logger: svc.logger,
 		Pprof: &PprofConfig{
 			Port:    svc.pprofPort,
 			Enabled: svc.pprof != nil,
@@ -88,13 +89,13 @@ func (svc *Service) handlePatchSettingsHTTP(w http.ResponseWriter, r *http.Reque
 // relaunch updates the web service in the configuration manager and starts it.
 // It is intended to be used as a goroutine.
 func (svc *Service) relaunch(ctx context.Context, cancel context.CancelFunc, newConf *Config) {
-	defer slogutil.RecoverAndLog(ctx, svc.logger)
+	defer log.OnPanic("websvc: relaunching")
 
 	defer cancel()
 
 	err := svc.confMgr.UpdateWeb(ctx, newConf)
 	if err != nil {
-		svc.logger.ErrorContext(ctx, "updating web", slogutil.KeyError, err)
+		log.Error("websvc: updating web: %s", err)
 
 		return
 	}
@@ -105,18 +106,18 @@ func (svc *Service) relaunch(ctx context.Context, cancel context.CancelFunc, new
 	var newSvc agh.ServiceWithConfig[*Config]
 	for newSvc = svc.confMgr.Web(); newSvc == svc; {
 		if time.Since(updStart) >= maxUpdDur {
-			svc.logger.ErrorContext(ctx, "failed to update service on time", "duration", maxUpdDur)
+			log.Error("websvc: failed to update svc after %s", maxUpdDur)
 
 			return
 		}
 
-		svc.logger.DebugContext(ctx, "waiting for new service")
+		log.Debug("websvc: waiting for new websvc to be configured")
 
 		time.Sleep(100 * time.Millisecond)
 	}
 
-	err = newSvc.Start(ctx)
+	err = newSvc.Start()
 	if err != nil {
-		svc.logger.ErrorContext(ctx, "new service failed", slogutil.KeyError, err)
+		log.Error("websvc: new svc failed to start with error: %s", err)
 	}
 }

internal/next/websvc/http_test.go

@@ -13,8 +13,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -28,15 +26,14 @@ func TestService_HandlePatchSettingsHTTP(t *testing.T) {
 	}
 
 	svc, err := websvc.New(&websvc.Config{
-		Logger: slogutil.NewDiscardLogger(),
 		Pprof: &websvc.PprofConfig{
 			Enabled: false,
 		},
 		TLS: &tls.Config{
 			Certificates: []tls.Certificate{{}},
 		},
-		Addresses:       []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:0")},
-		SecureAddresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:0")},
+		Addresses:       []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:80")},
+		SecureAddresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:443")},
 		Timeout:         5 * time.Second,
 		ForceHTTPS:      true,
 	})
@@ -48,9 +45,9 @@ func TestService_HandlePatchSettingsHTTP(t *testing.T) {
 
 	_, addr := newTestServer(t, confMgr)
 	u := &url.URL{
-		Scheme: urlutil.SchemeHTTP,
+		Scheme: "http",
 		Host:   addr.String(),
-		Path:   websvc.PathPatternV1SettingsHTTP,
+		Path:   websvc.PathV1SettingsHTTP,
 	}
 
 	req := jobj{

internal/next/websvc/middleware.go

@@ -2,11 +2,15 @@ package websvc
 
 import (
 	"net/http"
+	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/golibs/httphdr"
+	"github.com/AdguardTeam/golibs/log"
 )
 
+// Middlewares
+
 // jsonMw sets the content type of the response to application/json.
 func jsonMw(h http.Handler) (wrapped http.HandlerFunc) {
 	f := func(w http.ResponseWriter, r *http.Request) {
@@ -17,3 +21,18 @@ func jsonMw(h http.Handler) (wrapped http.HandlerFunc) {
 
 	return http.HandlerFunc(f)
 }
+
+// logMw logs the queries with level debug.
+func logMw(h http.Handler) (wrapped http.HandlerFunc) {
+	f := func(w http.ResponseWriter, r *http.Request) {
+		start := time.Now()
+		m, u := r.Method, r.RequestURI
+
+		log.Debug("websvc: %s %s started", m, u)
+		defer func() { log.Debug("websvc: %s %s finished in %s", m, u, time.Since(start)) }()
+
+		h.ServeHTTP(w, r)
+	}
+
+	return http.HandlerFunc(f)
+}

internal/next/websvc/path.go

@@ -0,0 +1,14 @@
+package websvc
+
+// Path constants
+const (
+	PathRoot     = "/"
+	PathFrontend = "/*filepath"
+
+	PathHealthCheck = "/health-check"
+
+	PathV1SettingsAll  = "/api/v1/settings/all"
+	PathV1SettingsDNS  = "/api/v1/settings/dns"
+	PathV1SettingsHTTP = "/api/v1/settings/http"
+	PathV1SystemInfo   = "/api/v1/system/info"
+)

internal/next/websvc/route.go

@@ -1,73 +0,0 @@
-package websvc
-
-import (
-	"log/slog"
-	"net/http"
-
-	"github.com/AdguardTeam/golibs/netutil/httputil"
-)
-
-// Path pattern constants.
-const (
-	PathPatternFrontend       = "/"
-	PathPatternHealthCheck    = "/health-check"
-	PathPatternV1SettingsAll  = "/api/v1/settings/all"
-	PathPatternV1SettingsDNS  = "/api/v1/settings/dns"
-	PathPatternV1SettingsHTTP = "/api/v1/settings/http"
-	PathPatternV1SystemInfo   = "/api/v1/system/info"
-)
-
-// Route pattern constants.
-const (
-	routePatternFrontend            = http.MethodGet + " " + PathPatternFrontend
-	routePatternGetV1SettingsAll    = http.MethodGet + " " + PathPatternV1SettingsAll
-	routePatternGetV1SystemInfo     = http.MethodGet + " " + PathPatternV1SystemInfo
-	routePatternHealthCheck         = http.MethodGet + " " + PathPatternHealthCheck
-	routePatternPatchV1SettingsDNS  = http.MethodPatch + " " + PathPatternV1SettingsDNS
-	routePatternPatchV1SettingsHTTP = http.MethodPatch + " " + PathPatternV1SettingsHTTP
-)
-
-// route registers all necessary handlers in mux.
-func (svc *Service) route(mux *http.ServeMux) {
-	routes := []struct {
-		handler http.Handler
-		pattern string
-		isJSON  bool
-	}{{
-		handler: httputil.HealthCheckHandler,
-		pattern: routePatternHealthCheck,
-		isJSON:  false,
-	}, {
-		handler: http.FileServer(http.FS(svc.frontend)),
-		pattern: routePatternFrontend,
-		isJSON:  false,
-	}, {
-		handler: http.HandlerFunc(svc.handleGetSettingsAll),
-		pattern: routePatternGetV1SettingsAll,
-		isJSON:  true,
-	}, {
-		handler: http.HandlerFunc(svc.handlePatchSettingsDNS),
-		pattern: routePatternPatchV1SettingsDNS,
-		isJSON:  true,
-	}, {
-		handler: http.HandlerFunc(svc.handlePatchSettingsHTTP),
-		pattern: routePatternPatchV1SettingsHTTP,
-		isJSON:  true,
-	}, {
-		handler: http.HandlerFunc(svc.handleGetV1SystemInfo),
-		pattern: routePatternGetV1SystemInfo,
-		isJSON:  true,
-	}}
-
-	logMw := httputil.NewLogMiddleware(svc.logger, slog.LevelDebug)
-	for _, r := range routes {
-		var hdlr http.Handler
-		if r.isJSON {
-			hdlr = jsonMw(r.handler)
-		} else {
-			hdlr = r.handler
-		}
-
-		mux.Handle(r.pattern, logMw.Wrap(hdlr))
-	}
-}

internal/next/websvc/server.go

@@ -1,156 +0,0 @@
-package websvc
-
-import (
-	"context"
-	"crypto/tls"
-	"fmt"
-	"log/slog"
-	"net"
-	"net/http"
-	"net/netip"
-	"net/url"
-	"sync"
-	"time"
-
-	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
-)
-
-// server contains an *http.Server as well as entities and data associated with
-// it.
-//
-// TODO(a.garipov):  Join with similar structs in other projects and move to
-// golibs/netutil/httputil.
-//
-// TODO(a.garipov):  Once the above standardization is complete, consider
-// merging debugsvc and websvc into a single httpsvc.
-type server struct {
-	// mu protects http, logger, tcpListener, and url.
-	mu          *sync.Mutex
-	http        *http.Server
-	logger      *slog.Logger
-	tcpListener *net.TCPListener
-	url         *url.URL
-
-	tlsConf     *tls.Config
-	initialAddr netip.AddrPort
-}
-
-// loggerKeyServer is the key used by [server] to identify itself.
-const loggerKeyServer = "server"
-
-// newServer returns a *server that is ready to serve HTTP queries.  The TCP
-// listener is not started.  handler must not be nil.
-func newServer(
-	baseLogger *slog.Logger,
-	initialAddr netip.AddrPort,
-	tlsConf *tls.Config,
-	handler http.Handler,
-	timeout time.Duration,
-) (s *server) {
-	u := &url.URL{
-		Scheme: urlutil.SchemeHTTP,
-		Host:   initialAddr.String(),
-	}
-
-	if tlsConf != nil {
-		u.Scheme = urlutil.SchemeHTTPS
-	}
-
-	logger := baseLogger.With(loggerKeyServer, u)
-
-	return &server{
-		mu: &sync.Mutex{},
-		http: &http.Server{
-			Handler:           handler,
-			ReadTimeout:       timeout,
-			ReadHeaderTimeout: timeout,
-			WriteTimeout:      timeout,
-			IdleTimeout:       timeout,
-			ErrorLog:          slog.NewLogLogger(logger.Handler(), slog.LevelError),
-		},
-		logger: logger,
-		url:    u,
-
-		tlsConf:     tlsConf,
-		initialAddr: initialAddr,
-	}
-}
-
-// localAddr returns the local address of the server if the server has started
-// listening; otherwise, it returns nil.
-func (s *server) localAddr() (addr net.Addr) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	if l := s.tcpListener; l != nil {
-		return l.Addr()
-	}
-
-	return nil
-}
-
-// serve starts s.  baseLogger is used as a base logger for s.  If s fails to
-// serve with anything other than [http.ErrServerClosed], it causes an unhandled
-// panic.  It is intended to be used as a goroutine.
-//
-// TODO(a.garipov):  Improve error handling.
-func (s *server) serve(ctx context.Context, baseLogger *slog.Logger) {
-	l, err := net.ListenTCP("tcp", net.TCPAddrFromAddrPort(s.initialAddr))
-	if err != nil {
-		s.logger.ErrorContext(ctx, "listening tcp", slogutil.KeyError, err)
-
-		panic(fmt.Errorf("websvc: listening tcp: %w", err))
-	}
-
-	func() {
-		s.mu.Lock()
-		defer s.mu.Unlock()
-
-		s.tcpListener = l
-
-		// Reassign the address in case the port was zero.
-		s.url.Host = l.Addr().String()
-		s.logger = baseLogger.With(loggerKeyServer, s.url)
-		s.http.ErrorLog = slog.NewLogLogger(s.logger.Handler(), slog.LevelError)
-	}()
-
-	s.logger.InfoContext(ctx, "starting")
-	defer s.logger.InfoContext(ctx, "started")
-
-	err = s.http.Serve(l)
-	if err == nil || errors.Is(err, http.ErrServerClosed) {
-		return
-	}
-
-	s.logger.ErrorContext(ctx, "serving", slogutil.KeyError, err)
-
-	panic(fmt.Errorf("websvc: serving: %w", err))
-}
-
-// shutdown shuts s down.
-func (s *server) shutdown(ctx context.Context) (err error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	var errs []error
-	err = s.http.Shutdown(ctx)
-	if err != nil {
-		errs = append(errs, fmt.Errorf("shutting down server %s: %w", s.url, err))
-	}
-
-	// Close the listener separately, as it might not have been closed if the
-	// context has been canceled.
-	//
-	// NOTE:  The listener could remain uninitialized if [net.ListenTCP] failed
-	// in [s.serve].
-	if l := s.tcpListener; l != nil {
-		err = l.Close()
-		if err != nil && !errors.Is(err, net.ErrClosed) {
-			errs = append(errs, fmt.Errorf("closing listener for server %s: %w", s.url, err))
-		}
-	}
-
-	return errors.Join(errs...)
-}

internal/next/websvc/settings_test.go

@@ -1,6 +1,7 @@
 package websvc_test
 
 import (
+	"crypto/tls"
 	"encoding/json"
 	"net/http"
 	"net/netip"
@@ -12,8 +13,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -29,10 +28,16 @@ func TestService_HandleGetSettingsAll(t *testing.T) {
 		BootstrapPreferIPv6: true,
 	}
 
+	wantWeb := &websvc.HTTPAPIHTTPSettings{
+		Addresses:       []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:80")},
+		SecureAddresses: []netip.AddrPort{netip.MustParseAddrPort("127.0.0.1:443")},
+		Timeout:         aghhttp.JSONDuration(5 * time.Second),
+		ForceHTTPS:      true,
+	}
+
 	confMgr := newConfigManager()
 	confMgr.onDNS = func() (s agh.ServiceWithConfig[*dnssvc.Config]) {
 		c, err := dnssvc.New(&dnssvc.Config{
-			Logger:              slogutil.NewDiscardLogger(),
 			Addresses:           wantDNS.Addresses,
 			UpstreamServers:     wantDNS.UpstreamServers,
 			BootstrapServers:    wantDNS.BootstrapServers,
@@ -44,27 +49,34 @@ func TestService_HandleGetSettingsAll(t *testing.T) {
 		return c
 	}
 
-	svc, addr := newTestServer(t, confMgr)
-	u := &url.URL{
-		Scheme: urlutil.SchemeHTTP,
-		Host:   addr.String(),
-		Path:   websvc.PathPatternV1SettingsAll,
-	}
+	svc, err := websvc.New(&websvc.Config{
+		Pprof: &websvc.PprofConfig{
+			Enabled: false,
+		},
+		TLS: &tls.Config{
+			Certificates: []tls.Certificate{{}},
+		},
+		Addresses:       wantWeb.Addresses,
+		SecureAddresses: wantWeb.SecureAddresses,
+		Timeout:         time.Duration(wantWeb.Timeout),
+		ForceHTTPS:      true,
+	})
+	require.NoError(t, err)
 
 	confMgr.onWeb = func() (s agh.ServiceWithConfig[*websvc.Config]) {
 		return svc
 	}
 
-	wantWeb := &websvc.HTTPAPIHTTPSettings{
-		Addresses:       []netip.AddrPort{addr},
-		SecureAddresses: nil,
-		Timeout:         aghhttp.JSONDuration(testTimeout),
-		ForceHTTPS:      false,
+	_, addr := newTestServer(t, confMgr)
+	u := &url.URL{
+		Scheme: "http",
+		Host:   addr.String(),
+		Path:   websvc.PathV1SettingsAll,
 	}
 
 	body := httpGet(t, u, http.StatusOK)
 	resp := &websvc.RespGetV1SettingsAll{}
-	err := json.Unmarshal(body, resp)
+	err = json.Unmarshal(body, resp)
 	require.NoError(t, err)
 
 	assert.Equal(t, wantDNS, resp.DNS)

internal/next/websvc/system_test.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -18,9 +17,9 @@ func TestService_handleGetV1SystemInfo(t *testing.T) {
 	confMgr := newConfigManager()
 	_, addr := newTestServer(t, confMgr)
 	u := &url.URL{
-		Scheme: urlutil.SchemeHTTP,
+		Scheme: "http",
 		Host:   addr.String(),
-		Path:   websvc.PathPatternV1SystemInfo,
+		Path:   websvc.PathV1SystemInfo,
 	}
 
 	body := httpGet(t, u, http.StatusOK)

internal/next/websvc/waitlistener.go

@@ -0,0 +1,31 @@
+package websvc
+
+import (
+	"net"
+	"sync"
+)
+
+// Wait Listener
+
+// waitListener is a wrapper around a listener that also calls wg.Done() on the
+// first call to Accept.  It is useful in situations where it is important to
+// catch the precise moment of the first call to Accept, for example when
+// starting an HTTP server.
+//
+// TODO(a.garipov): Move to aghnet?
+type waitListener struct {
+	net.Listener
+
+	firstAcceptWG   *sync.WaitGroup
+	firstAcceptOnce sync.Once
+}
+
+// type check
+var _ net.Listener = (*waitListener)(nil)
+
+// Accept implements the [net.Listener] interface for *waitListener.
+func (l *waitListener) Accept() (conn net.Conn, err error) {
+	l.firstAcceptOnce.Do(l.firstAcceptWG.Done)
+
+	return l.Listener.Accept()
+}

internal/next/websvc/waitlistener_internal_test.go

@@ -0,0 +1,40 @@
+package websvc
+
+import (
+	"net"
+	"sync"
+	"sync/atomic"
+	"testing"
+
+	"github.com/AdguardTeam/golibs/testutil/fakenet"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestWaitListener_Accept(t *testing.T) {
+	var accepted atomic.Bool
+	var l net.Listener = &fakenet.Listener{
+		OnAccept: func() (conn net.Conn, err error) {
+			accepted.Store(true)
+
+			return nil, nil
+		},
+		OnAddr:  func() (addr net.Addr) { panic("not implemented") },
+		OnClose: func() (err error) { panic("not implemented") },
+	}
+
+	wg := &sync.WaitGroup{}
+	wg.Add(1)
+
+	go func() {
+		var wrapper net.Listener = &waitListener{
+			Listener:      l,
+			firstAcceptWG: wg,
+		}
+
+		_, _ = wrapper.Accept()
+	}()
+
+	wg.Wait()
+
+	assert.Eventually(t, accepted.Load, testTimeout, testTimeout/10)
+}

internal/next/websvc/websvc.go

@@ -10,18 +10,22 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"io"
 	"io/fs"
-	"log/slog"
+	"net"
 	"net/http"
 	"net/netip"
 	"runtime"
+	"sync"
 	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
 	"github.com/AdguardTeam/golibs/errors"
-	"github.com/AdguardTeam/golibs/netutil"
+	"github.com/AdguardTeam/golibs/log"
+	"github.com/AdguardTeam/golibs/mathutil"
 	"github.com/AdguardTeam/golibs/netutil/httputil"
+	httptreemux "github.com/dimfeld/httptreemux/v5"
 )
 
 // ConfigManager is the configuration manager interface.
@@ -36,14 +40,13 @@ type ConfigManager interface {
 // Service is the AdGuard Home web service.  A nil *Service is a valid
 // [agh.Service] that does nothing.
 type Service struct {
-	logger       *slog.Logger
 	confMgr      ConfigManager
 	frontend     fs.FS
 	tls          *tls.Config
-	pprof        *server
+	pprof        *http.Server
 	start        time.Time
 	overrideAddr netip.AddrPort
-	servers      []*server
+	servers      []*http.Server
 	timeout      time.Duration
 	pprofPort    uint16
 	forceHTTPS   bool
@@ -61,7 +64,6 @@ func New(c *Config) (svc *Service, err error) {
 	}
 
 	svc = &Service{
-		logger:       c.Logger,
 		confMgr:      c.ConfigManager,
 		frontend:     c.Frontend,
 		tls:          c.TLS,
@@ -71,18 +73,17 @@ func New(c *Config) (svc *Service, err error) {
 		forceHTTPS:   c.ForceHTTPS,
 	}
 
-	mux := http.NewServeMux()
-	svc.route(mux)
+	mux := newMux(svc)
 
 	if svc.overrideAddr != (netip.AddrPort{}) {
-		svc.servers = []*server{newServer(svc.logger, svc.overrideAddr, nil, mux, c.Timeout)}
+		svc.servers = []*http.Server{newSrv(svc.overrideAddr, nil, mux, c.Timeout)}
 	} else {
 		for _, a := range c.Addresses {
-			svc.servers = append(svc.servers, newServer(svc.logger, a, nil, mux, c.Timeout))
+			svc.servers = append(svc.servers, newSrv(a, nil, mux, c.Timeout))
 		}
 
 		for _, a := range c.SecureAddresses {
-			svc.servers = append(svc.servers, newServer(svc.logger, a, c.TLS, mux, c.Timeout))
+			svc.servers = append(svc.servers, newSrv(a, c.TLS, mux, c.Timeout))
 		}
 	}
 
@@ -111,7 +112,96 @@ func (svc *Service) setupPprof(c *PprofConfig) {
 	svc.pprofPort = c.Port
 	addr := netip.AddrPortFrom(netip.AddrFrom4([4]byte{127, 0, 0, 1}), c.Port)
 
-	svc.pprof = newServer(svc.logger, addr, nil, pprofMux, 10*time.Minute)
+	// TODO(a.garipov): Consider making pprof timeout configurable.
+	svc.pprof = newSrv(addr, nil, pprofMux, 10*time.Minute)
+}
+
+// newSrv returns a new *http.Server with the given parameters.
+func newSrv(
+	addr netip.AddrPort,
+	tlsConf *tls.Config,
+	h http.Handler,
+	timeout time.Duration,
+) (srv *http.Server) {
+	addrStr := addr.String()
+	srv = &http.Server{
+		Addr:              addrStr,
+		Handler:           h,
+		TLSConfig:         tlsConf,
+		ReadTimeout:       timeout,
+		WriteTimeout:      timeout,
+		IdleTimeout:       timeout,
+		ReadHeaderTimeout: timeout,
+	}
+
+	if tlsConf == nil {
+		srv.ErrorLog = log.StdLog("websvc: plain http: "+addrStr, log.ERROR)
+	} else {
+		srv.ErrorLog = log.StdLog("websvc: https: "+addrStr, log.ERROR)
+	}
+
+	return srv
+}
+
+// newMux returns a new HTTP request multiplexer for the AdGuard Home web
+// service.
+func newMux(svc *Service) (mux *httptreemux.ContextMux) {
+	mux = httptreemux.NewContextMux()
+
+	routes := []struct {
+		handler http.HandlerFunc
+		method  string
+		pattern string
+		isJSON  bool
+	}{{
+		handler: svc.handleGetHealthCheck,
+		method:  http.MethodGet,
+		pattern: PathHealthCheck,
+		isJSON:  false,
+	}, {
+		handler: http.FileServer(http.FS(svc.frontend)).ServeHTTP,
+		method:  http.MethodGet,
+		pattern: PathFrontend,
+		isJSON:  false,
+	}, {
+		handler: http.FileServer(http.FS(svc.frontend)).ServeHTTP,
+		method:  http.MethodGet,
+		pattern: PathRoot,
+		isJSON:  false,
+	}, {
+		handler: svc.handleGetSettingsAll,
+		method:  http.MethodGet,
+		pattern: PathV1SettingsAll,
+		isJSON:  true,
+	}, {
+		handler: svc.handlePatchSettingsDNS,
+		method:  http.MethodPatch,
+		pattern: PathV1SettingsDNS,
+		isJSON:  true,
+	}, {
+		handler: svc.handlePatchSettingsHTTP,
+		method:  http.MethodPatch,
+		pattern: PathV1SettingsHTTP,
+		isJSON:  true,
+	}, {
+		handler: svc.handleGetV1SystemInfo,
+		method:  http.MethodGet,
+		pattern: PathV1SystemInfo,
+		isJSON:  true,
+	}}
+
+	for _, r := range routes {
+		var hdlr http.Handler
+		if r.isJSON {
+			hdlr = jsonMw(r.handler)
+		} else {
+			hdlr = r.handler
+		}
+
+		mux.Handle(r.method, r.pattern, logMw(hdlr))
+	}
+
+	return mux
 }
 
 // addrs returns all addresses on which this server serves the HTTP API.  addrs
@@ -124,12 +214,14 @@ func (svc *Service) addrs() (addrs, secureAddrs []netip.AddrPort) {
 	}
 
 	for _, srv := range svc.servers {
-		addrPort := netutil.NetAddrToAddrPort(srv.localAddr())
-		if addrPort == (netip.AddrPort{}) {
-			continue
-		}
+		// Use MustParseAddrPort, since no errors should technically happen
+		// here, because all servers must have a valid address.
+		addrPort := netip.MustParseAddrPort(srv.Addr)
 
-		if srv.tlsConf == nil {
+		// [srv.Serve] will set TLSConfig to an almost empty value, so, instead
+		// of relying only on the nilness of TLSConfig, check the length of the
+		// certificates field as well.
+		if srv.TLSConfig == nil || len(srv.TLSConfig.Certificates) == 0 {
 			addrs = append(addrs, addrPort)
 		} else {
 			secureAddrs = append(secureAddrs, addrPort)
@@ -139,60 +231,74 @@ func (svc *Service) addrs() (addrs, secureAddrs []netip.AddrPort) {
 	return addrs, secureAddrs
 }
 
+// handleGetHealthCheck is the handler for the GET /health-check HTTP API.
+func (svc *Service) handleGetHealthCheck(w http.ResponseWriter, _ *http.Request) {
+	_, _ = io.WriteString(w, "OK")
+}
+
 // type check
-var _ agh.ServiceWithConfig[*Config] = (*Service)(nil)
+var _ agh.Service = (*Service)(nil)
 
 // Start implements the [agh.Service] interface for *Service.  svc may be nil.
 // After Start exits, all HTTP servers have tried to start, possibly failing and
 // writing error messages to the log.
-//
-// TODO(a.garipov):  Use the context for cancelation as well.
-func (svc *Service) Start(ctx context.Context) (err error) {
+func (svc *Service) Start() (err error) {
 	if svc == nil {
 		return nil
 	}
 
-	svc.logger.InfoContext(ctx, "starting")
-	defer svc.logger.InfoContext(ctx, "started")
+	pprofEnabled := svc.pprof != nil
+	srvNum := len(svc.servers) + mathutil.BoolToNumber[int](pprofEnabled)
 
+	wg := &sync.WaitGroup{}
+	wg.Add(srvNum)
 	for _, srv := range svc.servers {
-		go srv.serve(ctx, svc.logger)
+		go serve(srv, wg)
 	}
 
-	if svc.pprof != nil {
-		go svc.pprof.serve(ctx, svc.logger)
+	if pprofEnabled {
+		go serve(svc.pprof, wg)
 	}
 
-	return svc.wait(ctx)
-}
-
-// wait waits until either the context is canceled or all servers have started.
-func (svc *Service) wait(ctx context.Context) (err error) {
-	for !svc.serversHaveStarted() {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-			// Wait and let the other goroutines do their job.
-			runtime.Gosched()
-		}
-	}
+	wg.Wait()
 
 	return nil
 }
 
-// serversHaveStarted returns true if all servers have started serving.
-func (svc *Service) serversHaveStarted() (started bool) {
-	started = len(svc.servers) != 0
-	for _, srv := range svc.servers {
-		started = started && srv.localAddr() != nil
+// serve starts and runs srv and writes all errors into its log.
+func serve(srv *http.Server, wg *sync.WaitGroup) {
+	addr := srv.Addr
+	defer log.OnPanic(addr)
+
+	var proto string
+	var l net.Listener
+	var err error
+	if srv.TLSConfig == nil {
+		proto = "http"
+		l, err = net.Listen("tcp", addr)
+	} else {
+		proto = "https"
+		l, err = tls.Listen("tcp", addr, srv.TLSConfig)
+	}
+	if err != nil {
+		srv.ErrorLog.Printf("starting srv %s: binding: %s", addr, err)
 	}
 
-	if svc.pprof != nil {
-		started = started && svc.pprof.localAddr() != nil
+	// Update the server's address in case the address had the port zero, which
+	// would mean that a random available port was automatically chosen.
+	srv.Addr = l.Addr().String()
+
+	log.Info("websvc: starting srv %s://%s", proto, srv.Addr)
+
+	l = &waitListener{
+		Listener:      l,
+		firstAcceptWG: wg,
 	}
 
-	return started
+	err = srv.Serve(l)
+	if err != nil && !errors.Is(err, http.ErrServerClosed) {
+		srv.ErrorLog.Printf("starting srv %s: %s", addr, err)
+	}
 }
 
 // Shutdown implements the [agh.Service] interface for *Service.  svc may be
@@ -202,24 +308,20 @@ func (svc *Service) Shutdown(ctx context.Context) (err error) {
 		return nil
 	}
 
-	svc.logger.InfoContext(ctx, "shutting down")
-	defer svc.logger.InfoContext(ctx, "shut down")
-
 	defer func() { err = errors.Annotate(err, "shutting down: %w") }()
 
 	var errs []error
 	for _, srv := range svc.servers {
-		shutdownErr := srv.shutdown(ctx)
+		shutdownErr := srv.Shutdown(ctx)
 		if shutdownErr != nil {
-			// Don't wrap the error, because it's informative enough as is.
-			errs = append(errs, err)
+			errs = append(errs, fmt.Errorf("srv %s: %w", srv.Addr, shutdownErr))
 		}
 	}
 
 	if svc.pprof != nil {
-		shutdownErr := svc.pprof.shutdown(ctx)
+		shutdownErr := svc.pprof.Shutdown(ctx)
 		if shutdownErr != nil {
-			errs = append(errs, fmt.Errorf("pprof: %w", shutdownErr))
+			errs = append(errs, fmt.Errorf("pprof srv %s: %w", svc.pprof.Addr, shutdownErr))
 		}
 	}
 

internal/next/websvc/websvc_internal_test.go

@@ -0,0 +1,6 @@
+package websvc
+
+import "time"
+
+// testTimeout is the common timeout for tests.
+const testTimeout = 1 * time.Second

internal/next/websvc/websvc_test.go

@@ -15,15 +15,16 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/dnssvc"
 	"github.com/AdguardTeam/AdGuardHome/internal/next/websvc"
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"github.com/AdguardTeam/golibs/netutil/httputil"
-	"github.com/AdguardTeam/golibs/netutil/urlutil"
 	"github.com/AdguardTeam/golibs/testutil"
 	"github.com/AdguardTeam/golibs/testutil/fakefs"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+func TestMain(m *testing.M) {
+	testutil.DiscardLogOutput(m)
+}
+
 // testTimeout is the common timeout for tests.
 const testTimeout = 1 * time.Second
 
@@ -79,6 +80,8 @@ func newConfigManager() (m *configManager) {
 // newTestServer creates and starts a new web service instance as well as its
 // sole address.  It also registers a cleanup procedure, which shuts the
 // instance down.
+//
+// TODO(a.garipov): Use svc or remove it.
 func newTestServer(
 	t testing.TB,
 	confMgr websvc.ConfigManager,
@@ -86,7 +89,6 @@ func newTestServer(
 	t.Helper()
 
 	c := &websvc.Config{
-		Logger: slogutil.NewDiscardLogger(),
 		Pprof: &websvc.PprofConfig{
 			Enabled: false,
 		},
@@ -105,7 +107,7 @@ func newTestServer(
 	svc, err := websvc.New(c)
 	require.NoError(t, err)
 
-	err = svc.Start(testutil.ContextWithTimeout(t, testTimeout))
+	err = svc.Start()
 	require.NoError(t, err)
 	testutil.CleanupAndRequireSuccess(t, func() (err error) {
 		return svc.Shutdown(testutil.ContextWithTimeout(t, testTimeout))
@@ -179,12 +181,12 @@ func TestService_Start_getHealthCheck(t *testing.T) {
 	confMgr := newConfigManager()
 	_, addr := newTestServer(t, confMgr)
 	u := &url.URL{
-		Scheme: urlutil.SchemeHTTP,
+		Scheme: "http",
 		Host:   addr.String(),
-		Path:   websvc.PathPatternHealthCheck,
+		Path:   websvc.PathHealthCheck,
 	}
 
 	body := httpGet(t, u, http.StatusOK)
 
-	assert.Equal(t, []byte(httputil.HealthCheckHandler), body)
+	assert.Equal(t, []byte("OK"), body)
 }

internal/permcheck/check_unix.go

@@ -1,43 +0,0 @@
-//go:build unix
-
-package permcheck
-
-import (
-	"context"
-	"log/slog"
-
-	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
-)
-
-// check is the Unix-specific implementation of [Check].
-func check(
-	ctx context.Context,
-	l *slog.Logger,
-	workDir string,
-	dataDir string,
-	statsDir string,
-	querylogDir string,
-	confFilePath string,
-) {
-	dirLoggger, fileLogger := l.With("type", typeDir), l.With("type", typeFile)
-
-	for _, ent := range entities(workDir, dataDir, statsDir, querylogDir, confFilePath) {
-		if ent.Value {
-			checkDir(ctx, dirLoggger, ent.Key)
-		} else {
-			checkFile(ctx, fileLogger, ent.Key)
-		}
-	}
-}
-
-// checkDir checks the permissions of a single directory.  The results are
-// logged at the appropriate level.
-func checkDir(ctx context.Context, l *slog.Logger, dirPath string) {
-	checkPath(ctx, l, dirPath, aghos.DefaultPermDir)
-}
-
-// checkFile checks the permissions of a single file.  The results are logged at
-// the appropriate level.
-func checkFile(ctx context.Context, l *slog.Logger, filePath string) {
-	checkPath(ctx, l, filePath, aghos.DefaultPermFile)
-}

internal/permcheck/check_windows.go

@@ -1,60 +0,0 @@
-//go:build windows
-
-package permcheck
-
-import (
-	"context"
-	"log/slog"
-
-	"github.com/AdguardTeam/golibs/logutil/slogutil"
-	"golang.org/x/sys/windows"
-)
-
-// check is the Windows-specific implementation of [Check].
-//
-// Note, that it only checks the owner and the ACEs of the working directory.
-// This is due to the assumption that the working directory ACEs are inherited
-// by the underlying files and directories, since at least [migrate] sets this
-// inheritance mode.
-func check(ctx context.Context, l *slog.Logger, workDir, _, _, _, _ string) {
-	l = l.With("type", typeDir, "path", workDir)
-
-	dacl, owner, err := getSecurityInfo(workDir)
-	if err != nil {
-		l.ErrorContext(ctx, "getting security info", slogutil.KeyError, err)
-
-		return
-	}
-
-	if !owner.IsWellKnown(windows.WinBuiltinAdministratorsSid) {
-		l.WarnContext(ctx, "owner is not in administrators group")
-	}
-
-	err = rangeACEs(dacl, func(
-		hdr windows.ACE_HEADER,
-		mask windows.ACCESS_MASK,
-		sid *windows.SID,
-	) (cont bool) {
-		l.DebugContext(ctx, "checking access control entry", "mask", mask, "sid", sid)
-
-		warn := false
-		switch {
-		case hdr.AceType != windows.ACCESS_ALLOWED_ACE_TYPE:
-			// Skip non-allowed ACEs.
-		case !sid.IsWellKnown(windows.WinBuiltinAdministratorsSid):
-			// Non-administrator ACEs should not have any access rights.
-			warn = mask > 0
-		default:
-			// Administrators should full control access rights.
-			warn = mask&fullControlMask != fullControlMask
-		}
-		if warn {
-			l.WarnContext(ctx, "unexpected access control entry", "mask", mask, "sid", sid)
-		}
-
-		return true
-	})
-	if err != nil {
-		l.ErrorContext(ctx, "checking access control entries", slogutil.KeyError, err)
-	}
-}