all: github action for potential dups and improved issue forms

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,149 +1,142 @@
 'body':
   - 'attributes':
-        'description': >
-            Please make sure that the issue is not a duplicate or a question.
-            If it's a duplicate, please react to the original issue with a
-            thumbs up.  If it's a question, please post it to the GitHub
-            Discussions page.
-        'label': 'Prerequisites'
-        'options':
-          - 'label': >
-                I have checked the
-                [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
-                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a)
-                and found no answer
-            'required': true
-          - 'label': >
-                I have searched other issues and found no duplicates
-            'required': true
-          - 'label': >
-                I want to report a bug and not [ask a question or ask for
-                help](https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a)
-            'required': true
-          - 'label': >
-                I have set up AdGuard Home correctly and [configured clients to
-                use it](https://github.com/AdguardTeam/AdGuardHome/wiki/Clients).
-                (Use the
-                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions/categories/q-a)
-                for help with installing and configuring clients.)
-            'required': true
+      'description': >
+        Please make sure that the issue is not a duplicate or a question.
+        If it's a duplicate, please react to the original issue with a
+        thumbs up.  If it's a question, please post it to the GitHub
+        Discussions page.
+      'label': 'Prerequisites'
+      'options':
+        - 'label': >
+            I have checked the
+            [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
+            [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
+            and found no answer
+          'required': true
+        - 'label': >
+            I have searched other issues and found no duplicates
+          'required': true
+        - 'label': >
+            I want to report a bug and not ask a question
+          'required': true
     'id': 'prerequisites'
     'type': 'checkboxes'
   - 'attributes':
-        'description': 'On which Platform does the issue occur?'
-        'label': 'Platform (OS and CPU architecture)'
-        'options':
-          - 'Darwin (aka macOS)/AMD64 (aka x86_64)'
-          - 'Darwin (aka macOS)/ARM64'
-          - 'FreeBSD/386'
-          - 'FreeBSD/AMD64 (aka x86_64)'
-          - 'FreeBSD/ARM64'
-          - 'FreeBSD/ARMv5'
-          - 'FreeBSD/ARMv6'
-          - 'FreeBSD/ARMv7'
-          - 'Linux/386'
-          - 'Linux/AMD64 (aka x86_64)'
-          - 'Linux/ARM64'
-          - 'Linux/ARMv5'
-          - 'Linux/ARMv6'
-          - 'Linux/ARMv7'
-          - 'Linux/MIPS LE'
-          - 'Linux/MIPS'
-          - 'Linux/MIPS64 LE'
-          - 'Linux/MIPS64'
-          - 'Linux/PPC64 LE'
-          - 'OpenBSD/AMD64 (aka x86_64)'
-          - 'OpenBSD/ARM64'
-          - 'Windows/386'
-          - 'Windows/AMD64 (aka x86_64)'
-          - 'Windows/ARM64'
-          - 'Custom (please mention in the description)'
+      'description': 'On which operating system type does the issue occur?'
+      'label': 'Operating system type'
+      'options':
+        - 'FreeBSD'
+        - 'Linux, OpenWrt'
+        - 'Linux, Other (please mention the version in the description)'
+        - 'macOS (aka Darwin)'
+        - 'OpenBSD'
+        - 'Windows'
+        - 'Other (please mention in the description)'
     'id': 'os'
     'type': 'dropdown'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': 'How did you install AdGuard Home?'
-        'label': 'Installation'
-        'options':
-          - 'GitHub releases or script from README'
-          - 'Docker'
-          - 'Snapcraft'
-          - 'Custom package (OpenWrt, HomeAssistant, etc; please mention in the description)'
-          - 'Other (please mention in the description)'
+      'description': 'On which CPU architecture does the issue occur?'
+      'label': 'CPU architecture'
+      'options':
+        - 'AMD64'
+        - 'x86'
+        - '64-bit ARM'
+        - 'ARMv5'
+        - 'ARMv6'
+        - 'ARMv7'
+        - '64-bit MIPS'
+        - '64-bit MIPS LE'
+        - '32-bit MIPS'
+        - '32-bit MIPS LE'
+        - '64-bit PowerPC LE'
+        - 'Other (please mention in the description)'
+    'id': 'arch'
+    'type': 'dropdown'
+    'validations':
+      'required': true
+  - 'attributes':
+      'description': 'How did you install AdGuard Home?'
+      'label': 'Installation'
+      'options':
+        - 'GitHub releases or script from README'
+        - 'Docker'
+        - 'Snapcraft'
+        - 'Custom port'
+        - 'Other (please mention in the description)'
     'id': 'install'
     'type': 'dropdown'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': 'How did you setup AdGuard Home?'
-        'label': 'Setup'
-        'options':
-          - 'On one machine'
-          - 'On a router, DHCP is handled by the router'
-          - 'On a router, DHCP is handled by AdGuard Home'
-          - 'Other (please mention in the description)'
+      'description': 'How did you setup AdGuard Home?'
+      'label': 'Setup'
+      'options':
+        - 'On one machine'
+        - 'On a router, DHCP is handled by the router'
+        - 'On a router, DHCP is handled by AdGuard Home'
+        - 'Other (please mention in the description)'
     'id': 'setup'
     'type': 'dropdown'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': 'What version of AdGuard Home are you using?'
-        'label': 'AdGuard Home version'
+      'description': 'What version of AdGuard Home are you using?'
+      'label': 'AdGuard Home version'
     'id': 'version'
     'type': 'input'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': >
-            Please describe what you did.  An `nslookup` or a `dig` command is
-            the best way.  For crashes, please provide a full failure log.
-        'label': 'Action'
-        'value': |
-            ```sh
-            nslookup -debug -type=a 'www.example.com' '$YOUR_AGH_ADDRESS'
-            ```
-    'id': 'failing_action'
+      'description': 'Please provide a set of steps to reproduce the issue'
+      'label': 'Issue Details'
+      'placeholder':
+      'value': |
+        Steps to reproduce:
+        1.
+        2.
+        3.
+    'id': 'what-happened'
     'type': 'textarea'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': >
-            What did you expect to see?  Please add a description and/or
-            screenshots, if applicable.
-        'label': 'Expected result'
-        'placeholder': >
-            What did you expect to see?
-    'id': 'expected'
+      'label': 'Expected Behavior'
+      'description': 'Describe the expected behavior'
+      'placeholder': |
+        A clear and concise description of what you expected to happen.
+    'id': 'expected-behavior'
     'type': 'textarea'
     'validations':
-        'required': true
+      'required': false
   - 'attributes':
-        'description': >
-            What happened instead?  Please add a description and/or screenshots,
-            if applicable.
-        'label': 'Actual result'
-        'placeholder': >
-            What did you see instead?
-    'id': 'result'
+      'label': 'Actual Behavior'
+      'description': 'Describe the actual behavior'
+      'placeholder': 'A clear description of what happened instead.'
+    'id': 'actual-behavior'
     'type': 'textarea'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': >
-            Please add additional information, such as non-standard OS or port,
-            here.  You can also put screenshots here, if applicable.  For
-            example, it is better to copy and paste text from a terminal instead
-            of posting a screenshot of the terminal.
-        'label': 'Additional information and/or screenshots'
-        'placeholder': >
-            Additional OS information, screenshots of the UI, etc.
-    'id': 'additional'
+      'label': 'Screenshots'
+      'description': |
+        If applicable add screenshots explaining your problem.
+        You can drag and drop images or paste them from clipboard.
+        Use `<details> </details>` tag to hide screenshots under the spoiler.
+      'placeholder': 'If applicable add screenshots explaining your problem.'
+      'value': |
+        <details><summary>Screenshot 1:</summary>
+        
+        <!-- paste screenshot here -->
+        
+        </details>
+    'id': 'screenshots'
     'type': 'textarea'
     'validations':
-        'required': false
+      'required': false
 'description': >
-    Open a bug report.  Please do not open bug reports for questions or help
-    with configuring clients.  If you want to ask for help, use the Discussions
-    section.
-'name': 'Bug'
+  Open a bug report. Please do not open bug reports for questions. If you
+  want to ask a question, ask in in the Discussions section.
+'name': 'Bug report'
+'labels': [ 'bug' ]

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,54 +1,54 @@
 'body':
   - 'attributes':
-        'description': >
-            Please make sure that the issue is not a duplicate or a question.
-            If it's a duplicate, please react to the original issue with a
-            thumbs up.  If it's a question, please post it to the GitHub
-            Discussions page.
-        'label': 'Prerequisites'
-        'options':
-          - 'label': >
-                I have checked the
-                [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
-                [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
-                and found no answer
-            'required': true
-          - 'label': >
-                I have searched other issues and found no duplicates
-            'required': true
-          - 'label': >
-                I want to request a feature or enhancement and not ask a
-                question
-            'required': true
+      'description': >
+        Please make sure that the issue is not a duplicate or a question.
+        If it's a duplicate, please react to the original issue with a
+        thumbs up.  If it's a question, please post it to the GitHub
+        Discussions page.
+      'label': 'Prerequisites'
+      'options':
+        - 'label': >
+            I have checked the
+            [Wiki](https://github.com/AdguardTeam/AdGuardHome/wiki) and
+            [Discussions](https://github.com/AdguardTeam/AdGuardHome/discussions)
+            and found no answer
+          'required': true
+        - 'label': >
+            I have searched other issues and found no duplicates
+          'required': true
+        - 'label': >
+            I want to request a feature or enhancement and not ask a
+            question
+          'required': true
     'id': 'prerequisites'
     'type': 'checkboxes'
   - 'attributes':
-        'description': 'Please describe the problem you are trying to solve'
-        'label': 'The problem'
-        'placeholder': >
-            Please describe the problem you are trying to solve
-    'id': 'problem'
+      'description': 'What happened?'
+      'placeholder': |
+        Is your feature request related to a problem? Please add a clear and 
+        concise description of what the problem is.
+      'label': 'Issue Details'
+    'id': 'what-happened'
     'type': 'textarea'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'description': 'What feature are you proposing to solve this problem?'
-        'label': 'Proposed solution'
-        'placeholder': >
-            What feature are you proposing to solve this problem?
-    'id': 'proposed_solution'
+      'description': 'What do you propose to change in AdGuard Home?'
+      'placeholder': |
+        Describe the solution you'd like in a clear and concise manner.
+      'label': 'Proposed solution'
+    'id': 'proposed-solution'
     'type': 'textarea'
     'validations':
-        'required': true
+      'required': true
   - 'attributes':
-        'label': 'Alternatives considered and additional information'
-        'placeholder': >
-            Are there any other ways to solve the problem?
-    'id': 'additional'
+      'description': 'Are there any other ways to solve the problem?'
+      'placeholder': |
+        A clear and concise description of any alternative solutions or features
+        you've considered.
+      'label': 'Alternative solution'
+    'id': 'alternative-solution'
     'type': 'textarea'
-    'validations':
-        'required': false
 'description': 'Suggest a feature or an enhancement for AdGuard Home'
-'labels':
-  - 'feature request'
 'name': 'Feature request or enhancement'
+'labels': [ 'feature request' ]

.github/PULL_REQUEST_TEMPLATE

@@ -1,20 +0,0 @@
-Before submitting a PR please make sure that:
-
-1.  You have discussed your solution in an issue and have got an
-    approval from a maintainer.
-
-2.  This isn't a localization fix; please send those to our
-    [CrowdIn](https://crowdin.com/project/adguard-applications/en#/adguard-home)
-    page.
-
-3.  Your code follows our
-    [code guidelines](https://github.com/AdguardTeam/CodeGuidelines/blob/master/Go/Go.md).
-
-Add a short description here.  The description should include:
-
-1.  Which issue this PR closes (`Closes #NNNN.`) or updates (`Updates
-    #NNNN.`).
-
-2.  A short description of how the change achieves that.
-
-Do not forget to remove these instructions.

.github/workflows/potential-duplicates.yml

@@ -1,18 +1,34 @@
 'name': 'potential-duplicates'
 'on':
-    'issues':
-        'types':
-          - 'opened'
+  'issues':
+    'types': [ 'opened', 'edited' ]
 'jobs':
-    'run':
-        'runs-on': 'ubuntu-latest'
-        'steps':
-          - 'uses': 'wow-actions/potential-duplicates@v1'
-            'with':
-                'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}'
-                'state': 'all'
-                'threshold': 0.6
-                'comment': |
-                    Potential duplicates: {{#issues}}
-                     *  [#{{ number }}] {{ title }} ({{ accuracy }}%)
-                    {{/issues}}
+  'run':
+    'runs-on': 'ubuntu-latest'
+    'steps':
+      - 'uses': 'wow-actions/potential-duplicates@v1'
+        'with':
+          'GITHUB_TOKEN': ${{ secrets.GITHUB_TOKEN }}
+          # Issue title filter work with https://www.npmjs.com/package/anymatch.
+          # Any matched issue will stop detection immediately.
+          # You can specify multi filters in each line.
+          # 'filter': ''
+          # Exclude keywords in title before detecting.
+          # 'exclude': ''
+          # Label to set, when potential duplicates are detected.
+          'label': 'potential-duplicate'
+          # Get issues with state to compare. Supported state: 'all', 'closed',
+          # 'open'.
+          'state': 'all'
+          # If similarity is higher than this threshold([0,1]), issue will be
+          # marked as duplicate.
+          'threshold': 0.6
+          # Reactions to be add to comment when potential duplicates are
+          # detected. Available reactions: "-1", "+1", "confused", "laugh",
+          # "heart", "hooray", "rocket", "eyes".
+          # 'reactions': 'eyes, confused'
+          # Comment to post when potential duplicates are detected.
+          'comment': >
+            Potential duplicates: {{#issues}}
+              - [#{{ number }}] {{ title }} ({{ accuracy }}%)
+            {{/issues}}

.gitignore

@@ -16,13 +16,10 @@
 /dist/
 /filtering/tests/filtering.TestLotsOfRules*.pprof
 /filtering/tests/top-1m.csv
-/internal/next/AdGuardHome.yaml
 /launchpad_credentials
 /querylog.json*
 /snapcraft_login
-AdGuardHome
-AdGuardHome.exe
-AdGuardHome.yaml*
+AdGuardHome*
 coverage.txt
 node_modules/
 

CHANGELOG.md

@@ -14,132 +14,26 @@ and this project adheres to
 <!--
 ## [v0.108.0] - TBA
 
-## [v0.107.33] - 2023-06-28 (APPROX.)
+## [v0.107.32] - 2023-06-28 (APPROX.)
 
-See also the [v0.107.33 GitHub milestone][ms-v0.107.33].
+See also the [v0.107.32 GitHub milestone][ms-v0.107.32].
 
-[ms-v0.107.33]: https://github.com/AdguardTeam/AdGuardHome/milestone/68?closed=1
+[ms-v0.107.32]: https://github.com/AdguardTeam/AdGuardHome/milestone/68?closed=1
 
 NOTE: Add new changes BELOW THIS COMMENT.
 -->
 
 ### Added
 
-- The new command-line flag `--web-addr` is the address to serve the web UI on,
-  in the host:port format.
-- The ability to set inactivity periods for filtering blocked services, both
-  globally and per client, in the configuration file ([#951]).  The UI changes
-  are coming in the upcoming releases.
 - The ability to edit rewrite rules via `PUT /control/rewrite/update` HTTP API
-  and the Web UI ([#1577]).
-
-### Changed
-
-#### Configuration Changes
-
-In this release, the schema version has changed from 20 to 22.
-
-- Property `clients.persistent.blocked_services`, which in schema versions 21
-  and earlier used to be a list containing ids of blocked services, is now an
-  object containing ids and schedule for blocked services:
-
-  ```yaml
-  # BEFORE:
-  'clients':
-    'persistent':
-      - 'name': 'client-name'
-        'blocked_services':
-        - id_1
-        - id_2
-
-  # AFTER:
-  'clients':
-    'persistent':
-    - 'name': client-name
-      'blocked_services':
-        'ids':
-        - id_1
-        - id_2
-      'schedule':
-        'time_zone': 'Local'
-        'sun':
-          'start': '0s'
-          'end': '24h'
-        'mon':
-          'start': '1h'
-          'end': '23h'
-  ```
-
-  To rollback this change, replace `clients.persistent.blocked_services` object
-  with the list of ids of blocked services and change the `schema_version` back
-  to `21`.
-- Property `dns.blocked_services`, which in schema versions 20 and earlier used
-  to be a list containing ids of blocked services, is now an object containing
-  ids and schedule for blocked services:
-
-  ```yaml
-  # BEFORE:
-  'blocked_services':
-  - id_1
-  - id_2
-
-  # AFTER:
-  'blocked_services':
-    'ids':
-    - id_1
-    - id_2
-    'schedule':
-      'time_zone': 'Local'
-      'sun':
-        'start': '0s'
-        'end': '24h'
-      'mon':
-        'start': '10m'
-        'end': '23h30m'
-      'tue':
-        'start': '20m'
-        'end': '23h'
-      'wed':
-        'start': '30m'
-        'end': '22h30m'
-      'thu':
-        'start': '40m'
-        'end': '22h'
-      'fri':
-        'start': '50m'
-        'end': '21h30m'
-      'sat':
-        'start': '1h'
-        'end': '21h'
-  ```
-
-  To rollback this change, replace `dns.blocked_services` object with the list
-  of ids of blocked services and change the `schema_version` back to `20`.
-
-### Deprecated
-
-- Flags `-h`, `--host`, `-p`, `--port` have been deprecated.  The `-h` flag
-  will work as an alias for `--help`, instead of the deprecated `--host` in the
-  future releases.
+  ([#1577]).
 
 ### Fixed
 
-- Excessive error logging when using DNS-over-QUIC ([#5285]).
-- Cannot set `bind_host` in AdGuardHome.yaml (docker version)([#4231], [#4235]).
-- The blocklists can now be deleted properly ([#5700]).
-- Queries with the question-section target `.`, for example `NS .`, are now
-  counted in the statistics and correctly shown in the query log ([#5910]).
-- Safe Search not working with `AAAA` queries for domains that don't have `AAAA`
-  records ([#5913]).
+ - DNSCrypt upstream not resetting the client and resolver information on
+   dialing errors ([#5872]).
 
-[#951]:  https://github.com/AdguardTeam/AdGuardHome/issues/951
 [#1577]: https://github.com/AdguardTeam/AdGuardHome/issues/1577
-[#4231]: https://github.com/AdguardTeam/AdGuardHome/issues/4231
-[#4235]: https://github.com/AdguardTeam/AdGuardHome/pull/4235
-[#5285]: https://github.com/AdguardTeam/AdGuardHome/issues/5285
-[#5700]: https://github.com/AdguardTeam/AdGuardHome/issues/5700
-[#5910]: https://github.com/AdguardTeam/AdGuardHome/issues/5910
-[#5913]: https://github.com/AdguardTeam/AdGuardHome/issues/5913
 
 <!--
 NOTE: Add new changes ABOVE THIS COMMENT.
@@ -147,16 +41,6 @@ NOTE: Add new changes ABOVE THIS COMMENT.
 
 
 
-## [v0.107.32] - 2023-06-13
-
-### Fixed
-
-- DNSCrypt upstream not resetting the client and resolver information on
-  dialing errors ([#5872]).
-
-
-
-
 ## [v0.107.31] - 2023-06-08
 
 See also the [v0.107.31 GitHub milestone][ms-v0.107.31].
@@ -2125,12 +2009,11 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
 
 
 <!--
-[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.33...HEAD
-[v0.107.33]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.32...v0.107.33
--->
-
 [Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.32...HEAD
 [v0.107.32]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.31...v0.107.32
+-->
+
+[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.31...HEAD
 [v0.107.31]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.30...v0.107.31
 [v0.107.30]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.29...v0.107.30
 [v0.107.29]:  https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.28...v0.107.29

bamboo-specs/bamboo.yaml

@@ -1,8 +1,5 @@
----
-!include release.yaml
-
----
-!include snapcraft.yaml
-
 ---
 !include test.yaml
+
+---
+!include release.yaml

bamboo-specs/release.yaml

@@ -1,290 +1,348 @@
 ---
 'version': 2
 'plan':
-    'project-key': 'AGH'
-    'key': 'AGHBSNAPSPECS'
-    'name': 'AdGuard Home - Build and publish release'
+  'project-key': 'AGH'
+  'key': 'AGHBSNAPSPECS'
+  'name': 'AdGuard Home - Build and publish release'
 # Make sure to sync any changes with the branch overrides below.
 'variables':
-    'channel': 'edge'
-    'dockerGo': 'adguard/golang-ubuntu:6.7'
+  'channel': 'edge'
+  'dockerGo': 'adguard/golang-ubuntu:6.7'
 
 'stages':
-  - 'Build frontend':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Build frontend'
+- 'Build frontend':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Build frontend'
 
-  - 'Make release':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Make release'
+- 'Make release':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Make release'
 
-  - 'Make and publish docker':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Make and publish docker'
+- 'Make and publish docker':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Make and publish docker'
 
-  - 'Publish to static storage':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Publish to static storage'
+- 'Publish to static storage':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Publish to static storage'
 
-  - 'Publish to GitHub Releases':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Publish to GitHub Releases'
+- 'Publish to Snapstore':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Publish to Snapstore'
+
+- 'Publish to GitHub Releases':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Publish to GitHub Releases'
 
 'Build frontend':
-    'docker':
-        'image': '${bamboo.dockerGo}'
-        'volumes':
-            '${system.YARN_DIR}': '${bamboo.cacheYarn}'
-    'key': 'BF'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'docker':
+    'image': '${bamboo.dockerGo}'
+    'volumes':
+      '${system.YARN_DIR}': '${bamboo.cacheYarn}'
+  'key': 'BF'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'checkout':
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                # Explicitly checkout the revision that we need.
-                git checkout "${bamboo.repository.revision.number}"
+        # Explicitly checkout the revision that we need.
+        git checkout "${bamboo.repository.revision.number}"
 
-                make js-deps js-build
-    'artifacts':
-      - 'name': 'AdGuardHome frontend'
-        'pattern': 'build/**'
-        'shared': true
-        'required': true
-    'requirements':
-      - 'adg-docker': 'true'
+        make js-deps js-build
+  'artifacts':
+  - 'name': 'AdGuardHome frontend'
+    'pattern': 'build*/**'
+    'shared': true
+    'required': true
+  'requirements':
+  - 'adg-docker': 'true'
 
 'Make release':
-    'docker':
-        'image': '${bamboo.dockerGo}'
-        'volumes':
-            '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
-            '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
-    'key': 'MR'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'docker':
+    'image': '${bamboo.dockerGo}'
+    'volumes':
+      '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
+      '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
+  'key': 'MR'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'checkout':
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                # Explicitly checkout the revision that we need.
-                git checkout "${bamboo.repository.revision.number}"
+        # Explicitly checkout the revision that we need.
+        git checkout "${bamboo.repository.revision.number}"
 
-                # Run the build with the specified channel.
-                echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
-                        | awk '{ gsub(/\\n/, "\n"); print; }'\
-                        | gpg --import --batch --yes
+        # Run the build with the specified channel.
+        echo "${bamboo.gpgSecretKeyPart1}${bamboo.gpgSecretKeyPart2}"\
+                | awk '{ gsub(/\\n/, "\n"); print; }'\
+                | gpg --import --batch --yes
 
-                make\
-                        CHANNEL=${bamboo.channel}\
-                        GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
-                        FRONTEND_PREBUILT=1\
-                        PARALLELISM=1\
-                        VERBOSE=2\
-                        build-release
-    # TODO(a.garipov): Use more fine-grained artifact rules.
-    'artifacts':
-      - 'name': 'AdGuardHome dists'
-        'pattern': 'dist/**'
-        'shared': true
-        'required': true
-    'requirements':
-      - 'adg-docker': 'true'
+        make\
+                CHANNEL=${bamboo.channel}\
+                GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
+                FRONTEND_PREBUILT=1\
+                PARALLELISM=1\
+                VERBOSE=2\
+                build-release
+  # TODO(a.garipov): Use more fine-grained artifact rules.
+  'artifacts':
+  - 'name': 'AdGuardHome dists'
+    'pattern': 'dist/**'
+    'shared': true
+    'required': true
+  'requirements':
+  - 'adg-docker': 'true'
 
 'Make and publish docker':
-    'key': 'MPD'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'key': 'MPD'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'checkout':
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                COMMIT="${bamboo.repository.revision.number}"
-                export COMMIT
-                readonly COMMIT
+        COMMIT="${bamboo.repository.revision.number}"
+        export COMMIT
+        readonly COMMIT
 
-                # Explicitly checkout the revision that we need.
-                git checkout "$COMMIT"
+        # Explicitly checkout the revision that we need.
+        git checkout "$COMMIT"
 
-                # 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 inspect --bootstrap
+        # 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 inspect --bootstrap
 
-                # Login to DockerHub.
-                docker login -u="${bamboo.dockerHubUsername}"\
-                        -p="${bamboo.dockerHubPassword}"
+        # Login to DockerHub.
+        docker login -u="${bamboo.dockerHubUsername}"\
+                -p="${bamboo.dockerHubPassword}"
 
-                # Boot the builder.
-                docker buildx inspect --bootstrap
+        # Boot the builder.
+        docker buildx inspect --bootstrap
 
-                # Print Docker info.
-                docker info
+        # Print Docker info.
+        docker info
 
-                # Prepare and push the build.
-                env\
-                        CHANNEL="${bamboo.channel}"\
-                        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':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
+        # Prepare and push the build.
+        env\
+                CHANNEL="${bamboo.channel}"\
+                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':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
 
 'Publish to static storage':
-    'key': 'PUB'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'clean'
-      - 'checkout':
-            'repository': 'bamboo-deploy-publisher'
-            'path': 'bamboo-deploy-publisher'
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'key': 'PUB'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'clean'
+  - 'checkout':
+      'repository': 'bamboo-deploy-publisher'
+      'path': 'bamboo-deploy-publisher'
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                cd ./dist/
+        cd ./dist/
 
-                CHANNEL="${bamboo.channel}"
-                export CHANNEL
+        CHANNEL="${bamboo.channel}"
+        export CHANNEL
 
-                ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
-    'final-tasks':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
+        ../bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
+  'final-tasks':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
+
+'Publish to Snapstore':
+  'docker':
+    'image': '${bamboo.dockerGo}'
+  'key': 'PTS'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'clean'
+  - 'checkout':
+      'repository': 'bamboo-deploy-publisher'
+      'path': 'bamboo-deploy-publisher'
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
+
+        set -e -f -u -x
+
+        cd ./dist/
+
+        channel="${bamboo.channel}"
+        readonly channel
+
+        case "$channel"
+        in
+        ('release')
+                snapchannel='candidate'
+                ;;
+        ('beta')
+                snapchannel='beta'
+                ;;
+        ('edge')
+                snapchannel='edge'
+                ;;
+        (*)
+                echo "invalid channel '$channel'"
+                exit 1
+                ;;
+        esac
+
+        env\
+                SNAPCRAFT_CHANNEL="$snapchannel"\
+                SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
+                SNAPCRAFT_STORE_CREDENTIALS="${bamboo.snapcraftMacaroonPassword}"\
+                ../bamboo-deploy-publisher/deploy.sh adguard-home-snap
+  'final-tasks':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
 
 'Publish to GitHub Releases':
-    'key': 'PTGR'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'clean'
-      - 'checkout':
-            'repository': 'bamboo-deploy-publisher'
-            'path': 'bamboo-deploy-publisher'
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'key': 'PTGR'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'clean'
+  - 'checkout':
+      'repository': 'bamboo-deploy-publisher'
+      'path': 'bamboo-deploy-publisher'
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                channel="${bamboo.channel}"
-                readonly channel
+        channel="${bamboo.channel}"
+        readonly channel
 
-                if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
-                then
-                        echo "don't publish to GitHub Releases for this channel"
+        if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
+        then
+                echo "don't publish to GitHub Releases for this channel"
 
-                        exit 0
-                fi
+                exit 0
+        fi
 
-                cd ./dist/
+        cd ./dist/
 
-                env\
-                        GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
-                        ../bamboo-deploy-publisher/deploy.sh adguard-home-github
-    'final-tasks':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
+        env\
+                GITHUB_TOKEN="${bamboo.githubPublicRepoPassword}"\
+                ../bamboo-deploy-publisher/deploy.sh adguard-home-github
+  'final-tasks':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
 
 'triggers':
-    # Don't use minute values that end with a zero or a five as these are often
-    # used in CI and so resources during these minutes can be quite busy.
-  - 'cron': '0 42 13 ? * MON-FRI *'
+# Don't use minute values that end with a zero or a five as these are often used
+# in CI and so resources during these minutes can be quite busy.
+- 'cron': '0 42 13 ? * MON-FRI *'
 'branches':
-    'create': 'manually'
-    'delete':
-        'after-deleted-days': 1
-        'after-inactive-days': 30
-    'integration':
-        'push-on-success': false
-        'merge-from': 'AdGuard Home   - Build and publish release'
-    'link-to-jira': true
+  'create': 'manually'
+  'delete':
+    'after-deleted-days': 1
+    'after-inactive-days': 30
+  'integration':
+    'push-on-success': false
+    'merge-from': 'AdGuard Home - Build and publish release'
+  'link-to-jira': true
 
 'notifications':
-  - 'events':
-      - 'plan-completed'
-    'recipients':
-      - 'webhook':
-            'name': 'Build webhook'
-            'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
+- 'events':
+  - 'plan-completed'
+  'recipients':
+  - 'webhook':
+      'name': 'Build webhook'
+      'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
 
 'labels': []
 'other':
-    'concurrent-build-plugin': 'system-default'
+  'concurrent-build-plugin': 'system-default'
 
 'branch-overrides':
-    # beta-vX.Y branches are the branches into which the commits that are needed
-    # to release a new patch version are initially cherry-picked.
-  - '^beta-v[0-9]+\.[0-9]+':
-        # Build betas on release branches manually.
-        'triggers': []
-        # Set the default release channel on the release branch to beta, as we may
-        # need to build a few of these.
-        'variables':
-            'channel': 'beta'
-            'dockerGo': 'adguard/golang-ubuntu:6.7'
-    # release-vX.Y.Z branches are the branches from which the actual final
-    # release is built.
-  - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
-        # Disable integration branches for release branches.
-        'branch-config':
-            'integration':
-                'push-on-success': false
-                'merge-from': 'beta-v0.107'
-        # Build final releases on release branches manually.
-        'triggers': []
-        # Set the default release channel on the final branch to release, as these
-        # are the ones that actually get released.
-        'variables':
-            'channel': 'release'
-            'dockerGo': 'adguard/golang-ubuntu:6.7'
+# beta-vX.Y branches are the branches into which the commits that are needed to
+# release a new patch version are initially cherry-picked.
+- '^beta-v[0-9]+\.[0-9]+':
+    # Build betas on release branches manually.
+    'triggers': []
+    # Set the default release channel on the release branch to beta, as we may
+    # need to build a few of these.
+    'variables':
+      'channel': 'beta'
+      'dockerGo': 'adguard/golang-ubuntu:6.7'
+# release-vX.Y.Z branches are the branches from which the actual final release
+# is built.
+- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
+    # Disable integration branches for release branches.
+    'branch-config':
+      'integration':
+        'push-on-success': false
+        'merge-from': 'beta-v0.107'
+    # Build final releases on release branches manually.
+    'triggers': []
+    # Set the default release channel on the final branch to release, as these
+    # are the ones that actually get released.
+    'variables':
+      'channel': 'release'
+      'dockerGo': 'adguard/golang-ubuntu:6.7'

bamboo-specs/snapcraft.yaml

@@ -1,211 +0,0 @@
----
-# This part of the release build is separate from the one described in
-# release.yaml, because the Snapcraft infrastructure is brittle, and timeouts
-# during logins and uploads often lead to release blocking.
-'version': 2
-'plan':
-    'project-key': 'AGH'
-    'key': 'AGHSNAP'
-    'name': 'AdGuard Home - Build and publish Snapcraft release'
-# Make sure to sync any changes with the branch overrides below.
-'variables':
-    'channel': 'edge'
-    'dockerGo': 'adguard/golang-ubuntu:6.7'
-    'snapcraftChannel': 'edge'
-
-'stages':
-  - 'Download release':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Download release'
-
-  - 'Build packages':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Build packages'
-
-  - 'Publish to Snapstore':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Publish to Snapstore'
-
-# TODO(a.garipov): Consider using the Artifact Downloader Task if it ever learns
-# about plan branches.
-'Download release':
-    'artifacts':
-      - 'name': 'i386_binary'
-        'pattern': 'AdGuardHome_i386'
-        'shared': true
-        'required': true
-      - 'name': 'amd64_binary'
-        'pattern': 'AdGuardHome_amd64'
-        'shared': true
-        'required': true
-      - 'name': 'armhf_binary'
-        'pattern': 'AdGuardHome_armhf'
-        'shared': true
-        'required': true
-      - 'name': 'arm64_binary'
-        'pattern': 'AdGuardHome_arm64'
-        'shared': true
-        'required': true
-    'docker':
-        'image': '${bamboo.dockerGo}'
-    'key': 'DR'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-            - |
-              #!/bin/sh
-
-              set -e -f -u -x
-
-              env\
-                      CHANNEL="${bamboo.channel}"\
-                      VERBOSE='1'\
-                      sh ./scripts/snap/download.sh
-    'requirements':
-      - 'adg-docker': 'true'
-
-'Build packages':
-    'artifact-subscriptions':
-      - 'artifact': 'i386_binary'
-      - 'artifact': 'amd64_binary'
-      - 'artifact': 'armhf_binary'
-      - 'artifact': 'arm64_binary'
-    'artifacts':
-      - 'name': 'i386_snap'
-        'pattern': 'AdGuardHome_i386.snap'
-        'shared': true
-        'required': true
-      - 'name': 'amd64_snap'
-        'pattern': 'AdGuardHome_amd64.snap'
-        'shared': true
-        'required': true
-      - 'name': 'armhf_snap'
-        'pattern': 'AdGuardHome_armhf.snap'
-        'shared': true
-        'required': true
-      - 'name': 'arm64_snap'
-        'pattern': 'AdGuardHome_arm64.snap'
-        'shared': true
-        'required': true
-    'docker':
-        'image': '${bamboo.dockerGo}'
-    'key': 'BP'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-            - |
-              #!/bin/sh
-
-              set -e -f -u -x
-
-              env\
-                      VERBOSE='1'\
-                      sh ./scripts/snap/build.sh
-    'requirements':
-      - 'adg-docker': 'true'
-
-'Publish to Snapstore':
-    'artifact-subscriptions':
-      - 'artifact': 'i386_snap'
-      - 'artifact': 'amd64_snap'
-      - 'artifact': 'armhf_snap'
-      - 'artifact': 'arm64_snap'
-    'docker':
-        'image': '${bamboo.dockerGo}'
-    'key': 'PTS'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
-
-                set -e -f -u -x
-
-                env\
-                        SNAPCRAFT_CHANNEL="${bamboo.snapcraftChannel}"\
-                        SNAPCRAFT_STORE_CREDENTIALS="${bamboo.snapcraftMacaroonPassword}"\
-                        VERBOSE='1'\
-                        sh ./scripts/snap/upload.sh
-    'final-tasks':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
-
-'triggers':
-    # Don't use minute values that end with a zero or a five as these are often
-    # used in CI and so resources during these minutes can be quite busy.
-    #
-    # NOTE: The time is chosen to be exactly one hour after the main release
-    # build as defined as in release.yaml.
-  - 'cron': '0 42 14 ? * MON-FRI *'
-'branches':
-    'create': 'manually'
-    'delete':
-        'after-deleted-days': 1
-        'after-inactive-days': 30
-    'integration':
-        'push-on-success': false
-        'merge-from': 'AdGuard Home - Build and publish Snapcraft release'
-    'link-to-jira': true
-
-'notifications':
-  - 'events':
-      - 'plan-completed'
-    'recipients':
-      - 'webhook':
-            'name': 'Build webhook'
-            'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo?channel=adguard-qa'
-
-'labels': []
-'other':
-    'concurrent-build-plugin': 'system-default'
-
-'branch-overrides':
-    # beta-vX.Y branches are the branches into which the commits that are needed
-    # to release a new patch version are initially cherry-picked.
-  - '^beta-v[0-9]+\.[0-9]+':
-        # Build betas on release branches manually.
-        'triggers': []
-        # Set the default release channel on the release branch to beta, as we may
-        # need to build a few of these.
-        'variables':
-            'channel': 'beta'
-            'dockerGo': 'adguard/golang-ubuntu:6.7'
-            'snapcraftChannel': 'beta'
-    # release-vX.Y.Z branches are the branches from which the actual final
-    # release is built.
-  - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
-        # Disable integration branches for release branches.
-        'branch-config':
-            'integration':
-                'push-on-success': false
-                'merge-from': 'beta-v0.107'
-        # Build final releases on release branches manually.
-        'triggers': []
-        # Set the default release channel on the final branch to release, as these
-        # are the ones that actually get released.
-        'variables':
-            'channel': 'release'
-            'dockerGo': 'adguard/golang-ubuntu:6.7'
-            'snapcraftChannel': 'candidate'

bamboo-specs/test.yaml

@@ -1,64 +1,64 @@
 ---
 'version': 2
 'plan':
-    'project-key': 'AGH'
-    'key': 'AHBRTSPECS'
-    'name': 'AdGuard Home - Build and run tests'
+  'project-key': 'AGH'
+  'key': 'AHBRTSPECS'
+  'name': 'AdGuard Home - Build and run tests'
 'variables':
-    'dockerGo': 'adguard/golang-ubuntu:6.7'
+  'dockerGo': 'adguard/golang-ubuntu:6.7'
 
 'stages':
-  - 'Tests':
-        'manual': false
-        'final': false
-        'jobs':
-          - 'Test'
+- 'Tests':
+    'manual': false
+    'final': false
+    'jobs':
+    - 'Test'
 
 'Test':
-    'docker':
-        'image': '${bamboo.dockerGo}'
-        'volumes':
-            '${system.YARN_DIR}': '${bamboo.cacheYarn}'
-            '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
-            '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
-    'key': 'TEST'
-    'other':
-        'clean-working-dir': true
-    'tasks':
-      - 'checkout':
-            'force-clean-build': true
-      - 'script':
-            'interpreter': 'SHELL'
-            'scripts':
-              - |
-                #!/bin/sh
+  'docker':
+    'image': '${bamboo.dockerGo}'
+    'volumes':
+      '${system.YARN_DIR}': '${bamboo.cacheYarn}'
+      '${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
+      '${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
+  'key': 'TEST'
+  'other':
+    'clean-working-dir': true
+  'tasks':
+  - 'checkout':
+      'force-clean-build': true
+  - 'script':
+      'interpreter': 'SHELL'
+      'scripts':
+      - |
+        #!/bin/sh
 
-                set -e -f -u -x
+        set -e -f -u -x
 
-                make VERBOSE=1 ci go-tools lint
-    'final-tasks':
-      - 'clean'
-    'requirements':
-      - 'adg-docker': 'true'
+        make VERBOSE=1 ci go-tools lint
+  'final-tasks':
+  - 'clean'
+  'requirements':
+  - 'adg-docker': 'true'
 
 'branches':
-    'create': 'for-pull-request'
-    'delete':
-        'after-deleted-days': 1
-        'after-inactive-days': 5
-    'integration':
-        'push-on-success': false
-        'merge-from': 'AdGuard Home - Build and run tests'
-    'link-to-jira': true
+  'create': 'for-pull-request'
+  'delete':
+    'after-deleted-days': 1
+    'after-inactive-days': 5
+  'integration':
+    'push-on-success': false
+    'merge-from': 'AdGuard Home - Build and run tests'
+  'link-to-jira': true
 
 'notifications':
-  - 'events':
-      - 'plan-status-changed'
-    'recipients':
-      - 'webhook':
-            'name': 'Build webhook'
-            'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
+- 'events':
+  - 'plan-status-changed'
+  'recipients':
+  - 'webhook':
+      'name': 'Build webhook'
+      'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
 
 'labels': []
 'other':
-    'concurrent-build-plugin': 'system-default'
+  'concurrent-build-plugin': 'system-default'

client/src/__locales/be.json

@@ -475,9 +475,7 @@
     "setup_dns_notice": "Каб выкарыстоўваць <1>DNS-over-HTTPS</1> ці <1>DNS-over-TLS</1>, вам патрэбна <0>наладзіць шыфраванне</0> у наладах AdGuard Home.",
     "rewrite_added": "Правіла перанакіравання DNS для «{{key}}» паспяхова дададзена",
     "rewrite_deleted": "Правіла перанакіравання DNS для «{{key}}» паспяхова выдалена",
-    "rewrite_updated": "Перазапіс DNS паспяхова абноўлены",
     "rewrite_add": "Дадаць правіла перанакіравання DNS",
-    "rewrite_edit": "Рэдагаваць перазапіс DNS",
     "rewrite_not_found": "Не знойдзена правілаў перанакіравання DNS",
     "rewrite_confirm_delete": "Вы ўпэўнены, што хочаце выдаліць правіла перанакіравання DNS для «{{key}}»?",
     "rewrite_desc": "Дазваляе лёгка наладзіць карыстацкі DNS-адказ для пэўнага дамена.",

client/src/__locales/cs.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Pro použití <1>DNS skrze HTTPS</1> nebo <1>DNS skrze TLS</1> potřebujete v nastaveních AdGuard Home <0>nakonfigurovat šifrování</0>.",
     "rewrite_added": "Přesměrování DNS pro „{{key}}“ úspěšně přidáno",
     "rewrite_deleted": "Přesměrování DNS pro „{{key}}“ úspěšně smazáno",
-    "rewrite_updated": "Přesměrování DNS bylo úspěšně aktualizováno",
     "rewrite_add": "Přidat přesměrování DNS",
-    "rewrite_edit": "Upravit přesměrování DNS",
     "rewrite_not_found": "Přesměrování DNS nenalezeny",
     "rewrite_confirm_delete": "Jste si jisti, že chcete smazat přesměrování DNS pro „{{key}}“?",
     "rewrite_desc": "Umožňuje snadno nakonfigurovat vlastní DNS odezvy pro konkrétní název domény.",

client/src/__locales/da.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "For at kunne bruge <1>DNS-over-HTTPS</1> eller <1>DNS-over-TLS</1>, skal du <0>opsætte Krypteringen</0> i AdGuard Homes indstillinger.",
     "rewrite_added": "DNS-omskrivning for \"{{key}}\" blev tilføjet",
     "rewrite_deleted": "DNS-omskrivning for \"{{key}}\" blev slettet",
-    "rewrite_updated": "DNS-omskrivning hermed opdateret",
     "rewrite_add": "Tilføj DNS-omskrivning",
-    "rewrite_edit": "Redigér DNS-omskrivning",
     "rewrite_not_found": "Ingen DNS-omskrivninger fundet",
     "rewrite_confirm_delete": "Sikker på, at du vil slette DNS-omskrivning for \"{{key}}\"?",
     "rewrite_desc": "Gør det nemt at opsætte det tilpassede DNS-svar for et specifikt domænenavn.",

client/src/__locales/de.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Um <1>DNS-over-HTTTPS</1> oder <1>DNS-over-TLS</1> verwenden zu können, müssen Sie in den AdGuard Home Einstellungen die <0>Verschlüsselung konfigurieren</0>.",
     "rewrite_added": "DNS-Umschreibung für „{{key}}“ erfolgreich hinzugefügt",
     "rewrite_deleted": "DNS-Umschreibung für „{{key}}“ erfolgreich entfernt",
-    "rewrite_updated": "DNS-Rewrite erfolgreich aktualisiert",
     "rewrite_add": "DNS-Umschreibung hinzufügen",
-    "rewrite_edit": "DNS-Rewrite bearbeiten",
     "rewrite_not_found": "Keine DNS-Umschreibungen gefunden",
     "rewrite_confirm_delete": "Möchten Sie die DNS-Umschreibung für „{{key}}“ wirklich entfernen?",
     "rewrite_desc": "Ermöglicht die einfache Konfiguration der benutzerdefinierten DNS-Antwort für einen bestimmten Domainnamen.",

client/src/__locales/en.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "In order to use <1>DNS-over-HTTPS</1> or <1>DNS-over-TLS</1>, you need to <0>configure Encryption</0> in AdGuard Home settings.",
     "rewrite_added": "DNS rewrite for \"{{key}}\" successfully added",
     "rewrite_deleted": "DNS rewrite for \"{{key}}\" successfully deleted",
-    "rewrite_updated": "DNS rewrite successfully updated",
     "rewrite_add": "Add DNS rewrite",
-    "rewrite_edit": "Edit DNS rewrite",
     "rewrite_not_found": "No DNS rewrites found",
     "rewrite_confirm_delete": "Are you sure you want to delete DNS rewrite for \"{{key}}\"?",
     "rewrite_desc": "Allows to easily configure custom DNS response for a specific domain name.",

client/src/__locales/es.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Para utilizar <1>DNS mediante HTTPS</1> o <1>DNS mediante TLS</1>, debes <0>configurar el cifrado</0> en la configuración de AdGuard Home.",
     "rewrite_added": "Reescritura DNS para \"{{key}}\" añadido correctamente",
     "rewrite_deleted": "Reescritura DNS para \"{{key}}\" eliminado correctamente",
-    "rewrite_updated": "Reconfiguración de DNS actualizada correctamente",
     "rewrite_add": "Añadir reescritura DNS",
-    "rewrite_edit": "Editar reconfiguración de DNS",
     "rewrite_not_found": "No se han encontrado reescrituras DNS",
     "rewrite_confirm_delete": "¿Estás seguro de que deseas eliminar la reescritura DNS para \"{{key}}\"?",
     "rewrite_desc": "Permite configurar fácilmente la respuesta DNS personalizada para un nombre de dominio específico.",

client/src/__locales/fa.json

@@ -440,9 +440,7 @@
     "setup_dns_notice": "به منظور استفاده از <1>DNS-over-HTTPS</1> یا <1>DNS-over-TLS</1>، شما نیاز به <0>پیکربندی رمزگذاری</0> در تنظیمات AdGuard Home دارید.",
     "rewrite_added": "بازنویسی DNS برای \"{{key}}\" با موفقیت اضافه شد",
     "rewrite_deleted": "بازنویسی DNS برای \"{{key}}\" با موفقیت حذف شد",
-    "rewrite_updated": "بازنویسی DNS با موفقیت به روز شد",
     "rewrite_add": "افزودن بازنویسی DNS",
-    "rewrite_edit": "بازنویسی DNS را ویرایش کنید",
     "rewrite_not_found": "بازنویسی DNS یافت نشد",
     "rewrite_confirm_delete": "آیا واقعا میخواهید بازنویسی DNS برای \"{{key}}\" را حذف کنید؟",
     "rewrite_desc": "به آسانی اجازه پیکربندی پاسخ DNS دستی برای یک نام دامنه خاص را می دهد.",

client/src/__locales/fi.json

@@ -222,7 +222,7 @@
     "all_lists_up_to_date_toast": "Kaikki listat ovat ajan tasalla",
     "updated_upstream_dns_toast": "Ylävirtojen palvelimet tallennettiin",
     "dns_test_ok_toast": "Määritetyt DNS-palvelimet toimivat oikein",
-    "dns_test_not_ok_toast": "Palvelin \"{{key}}\": Ei voitu käyttää, tarkista oikeinkirjoitus",
+    "dns_test_not_ok_toast": "Palvelin \"{{key}}\": ei voitu käyttää, tarkista sen oikeinkirjoitus",
     "dns_test_warning_toast": "Datavuon \"{{key}}\" ei vastaa testipyyntöihin eikä välttämättä toimi kunnolla",
     "unblock": "Salli",
     "block": "Estä",
@@ -478,9 +478,7 @@
     "setup_dns_notice": "<1>DNS-over-HTTPS</1> tai <1>DNS-over-TLS</1> -toteutuksia varten, on AdGuard Homen <0>Salausasetukset</0> määritettävä.",
     "rewrite_added": "Kohteen \"{{key}}\" DNS-uudelleenohjaus lisättiin",
     "rewrite_deleted": "Kohteen \"{{key}}\" DNS-uudelleenohjaus poistettiin",
-    "rewrite_updated": "DNS-uudelleenohjaukset päivitettiin",
     "rewrite_add": "Lisää DNS-uudelleenohjaus",
-    "rewrite_edit": "Muokkaa DNS-uudelleenohjausta",
     "rewrite_not_found": "DNS-uudelleenohjauksia ei löytynyt",
     "rewrite_confirm_delete": "Haluatko varmasti poistaa DNS-uudelleenohjauksen kohteelle \"{{key}}\"?",
     "rewrite_desc": "Mahdollistaa oman DNS-vastauksen helpon määrityksen tietylle verkkotunnukselle.",

client/src/__locales/fr.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Pour utiliser le <1>DNS-over-HTTPS</1> ou le <1>DNS-over-TLS</1>, vous devez <0>configurer le Chiffrement</0> dans les paramètres de AdGuard Home.",
     "rewrite_added": "Réécriture DNS pour « {{key}} » ajoutée",
     "rewrite_deleted": "Réécriture DNS pour « {{key}} » supprimée",
-    "rewrite_updated": "Réécriture DNS mise à jour",
     "rewrite_add": "Ajouter une réécriture DNS",
-    "rewrite_edit": "Modifier la réécriture DNS",
     "rewrite_not_found": "Aucune réécriture DNS trouvée",
     "rewrite_confirm_delete": "Voulez-vous vraiment supprimer la réécriture DNS pour « {{key}} » ?",
     "rewrite_desc": "Permet de configurer facilement la réponse DNS personnalisée pour un nom de domaine spécifique.",

client/src/__locales/hr.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Da biste koristili <1>DNS-over-HTTPS</1> ili <1>DNS-over-TLS</1>, morate <0>postaviti šifriranje</0> u AdGuard Home postavkama.",
     "rewrite_added": "DNS prijepis za \"{{key}}\" je uspješno dodan",
     "rewrite_deleted": "DNS prijepis za \"{{key}}\" je uspješno uklonjen",
-    "rewrite_updated": "Prepisivanje DNS-a uspješno ažurirano",
     "rewrite_add": "Dodaj DNS prijepis",
-    "rewrite_edit": "Uredite prepisivanje DNS-a",
     "rewrite_not_found": "Nema DNS prijepisa",
     "rewrite_confirm_delete": "Jeste li sigurni da želite ukloniti DNS prijepis za \"{{key}}\" klijenta?",
     "rewrite_desc": "Omogućuje jednostavno postavljanje prilagođenog DNS odgovora za određenu domenu.",

client/src/__locales/hu.json

@@ -167,7 +167,6 @@
     "enabled_parental_toast": "Szülői felügyelet engedélyezve",
     "disabled_safe_search_toast": "Biztonságos keresés letiltva",
     "enabled_save_search_toast": "Biztonságos keresés engedélyezve",
-    "updated_save_search_toast": "A Biztonságos keresés beállításai frissítve",
     "enabled_table_header": "Engedélyezve",
     "name_table_header": "Név",
     "list_url_table_header": "Lista URL-je",
@@ -291,8 +290,6 @@
     "rate_limit": "Kérések korlátozása",
     "edns_enable": "EDNS kliens alhálózat engedélyezése",
     "edns_cs_desc": "Adja hozzá az EDNS Client Subnet beállítást (ECS) a felfelé irányuló kérésekhez, és naplózza a kliensek által küldött értékeket a lekérdezési naplóban.",
-    "edns_use_custom_ip": "Használjon egyéni IP-címet az EDNS-hez",
-    "edns_use_custom_ip_desc": "Engedélyezze az egyéni IP-cím használatát az EDNS-hez",
     "rate_limit_desc": "Maximálisan hány kérést küldhet egy kliens másodpercenkén. Ha 0-ra állítja, akkor nincs korlátozás.",
     "blocking_ipv4_desc": "A blokkolt A kéréshez visszaadandó IP-cím",
     "blocking_ipv6_desc": "A blokkolt AAAA kéréshez visszaadandó IP-cím",
@@ -478,9 +475,7 @@
     "setup_dns_notice": "Ahhoz, hogy a <1>DNS-over-HTTPS</1> vagy a <1>DNS-over-TLS</1> valamelyikét használja, muszáj <0>beállítania a titkosítást</0> az AdGuard Home beállításaiban.",
     "rewrite_added": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen hozzáadva",
     "rewrite_deleted": "DNS átírás a(z) \"{{key}}\" kulcshoz sikeresen törölve",
-    "rewrite_updated": "A DNS újraírása sikeresen frissítve",
     "rewrite_add": "DNS átírás hozzáadása",
-    "rewrite_edit": "DNS újraírás szerkesztése",
     "rewrite_not_found": "Nem találhatók DNS átírások",
     "rewrite_confirm_delete": "Biztosan törölni szeretné a DNS átírást ehhez: \"{{key}}\"?",
     "rewrite_desc": "Lehetővé teszi, hogy egyszerűen beállítson egyéni DNS választ egy adott domain névhez.",
@@ -528,10 +523,6 @@
     "statistics_retention_confirm": "Biztos benne, hogy megváltoztatja a statisztika megőrzési idejét? Ha csökkentette az értéket, a megadottnál korábbi adatok elvesznek",
     "statistics_cleared": "A statisztikák sikeresen vissza lettek állítva",
     "statistics_enable": "Statisztikák engedélyezése",
-    "ignore_domains": "Figyelmen kívül hagyott domainek (újsorral elválasztva)",
-    "ignore_domains_title": "Figyelmen kívül hagyott domainek",
-    "ignore_domains_desc_stats": "Az ezekre a tartományokra vonatkozó lekérdezések nem kerülnek a statisztikákba",
-    "ignore_domains_desc_query": "Az ezekhez a tartományokhoz tartozó lekérdezések nem kerülnek a lekérdezési naplóba",
     "interval_hours": "{{count}} óra",
     "interval_hours_plural": "{{count}} óra",
     "filters_configuration": "Szűrők beállításai",
@@ -652,29 +643,5 @@
     "confirm_dns_cache_clear": "Biztos benne, hogy törölni szeretné a DNS-gyorsítótárat?",
     "cache_cleared": "A DNS gyorsítótár sikeresen törlődött",
     "clear_cache": "Gyorsítótár törlése",
-    "make_static": "Statikussá tétel",
-    "theme_auto_desc": "Automatikus (az eszköz színsémájától függően)",
-    "theme_dark_desc": "Sötét téma",
-    "theme_light_desc": "Világos téma",
-    "disable_for_seconds": "{{count}} másodpercig",
-    "disable_for_seconds_plural": "{{count}} másodpercig",
-    "disable_for_minutes": "{{count}} percig",
-    "disable_for_minutes_plural": "{{count}} percig",
-    "disable_for_hours": "{{count}} óráig",
-    "disable_for_hours_plural": "{{count}} óráig",
-    "disable_until_tomorrow": "Holnapig",
-    "disable_notify_for_seconds": "Kapcsolja ki a védelmet {{count}} másodpercre",
-    "disable_notify_for_seconds_plural": "Kapcsolja ki a védelmet {{count}} másodpercre",
-    "disable_notify_for_minutes": "Kapcsolja ki a védelmet {{count}} percre",
-    "disable_notify_for_minutes_plural": "Kapcsolja ki a védelmet {{count}} percre",
-    "disable_notify_for_hours": "Kapcsolja ki a védelmet {{count}} órára",
-    "disable_notify_for_hours_plural": "Kapcsolja ki a védelmet {{count}} órára",
-    "disable_notify_until_tomorrow": "Holnapig kapcsolja ki a védelmet",
-    "enable_protection_timer": "A védelem {{time}}-kor aktiválódik",
-    "custom_retention_input": "Adja meg a megőrzést órákban",
-    "custom_rotation_input": "Írja be a forgatást órákban",
-    "protection_section_label": "Védelem",
-    "log_and_stats_section_label": "Lekérdezési napló és statisztikák",
-    "ignore_query_log": "Figyelmen kívül hagyja ezt az ügyfelet a lekérdezési naplóban",
-    "ignore_statistics": "Hagyja figyelmen kívül ezt az ügyfelet a statisztikákban"
+    "protection_section_label": "Védelem"
 }

client/src/__locales/id.json

@@ -474,9 +474,7 @@
     "setup_dns_notice": "Jikalau ingin menggunakan <1>DNS-over-HTTPS</1> atau <1>DNS-over-TLS</1>, Anda perlu <0>mengatur Enkripsi</0> pada pengaturan AdGuard Home.",
     "rewrite_added": "DNS rewrite untuk \"{{key}}\" berhasil ditambahkan",
     "rewrite_deleted": "DNS rewrite untuk \"{{key}}\" berhasil dihapus",
-    "rewrite_updated": "Penulisan ulang DNS berhasil diperbarui",
     "rewrite_add": "Tambah DNS rewrite",
-    "rewrite_edit": "Edit penulisan ulang DNS",
     "rewrite_not_found": "Tidak ada DNS rewrite ditemukan",
     "rewrite_confirm_delete": "Apakah anda yakin ingin menghapus DNS rewrite untuk \"{{key}}\"?",
     "rewrite_desc": "Memungkinkan untuk dengan mudah mengkonfigurasi respons DNS kustom untuk nama domain tertentu.",

client/src/__locales/it.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Per utilizzare <1>DNS su HTTPS</1> o <1>DNS su TLS</1>, è necessario <0>configurare la crittografia</0> nelle impostazioni di AdGuard Home.",
     "rewrite_added": "Riscrittura DNS per \"{{key}}\" aggiunta correttamente",
     "rewrite_deleted": "La riscrittura DNS per \"{{key}}\" è stata eliminata correttamente",
-    "rewrite_updated": "Riscrittura DNS aggiornata correttamente",
     "rewrite_add": "Aggiungi la riscrittura DNS",
-    "rewrite_edit": "Modifica della riscrittura DNS",
     "rewrite_not_found": "Nessuna riscrittura DNS trovata",
     "rewrite_confirm_delete": "Sei sicuro di voler cancellare la riscrittura DNS per \"{{key}}\"?",
     "rewrite_desc": "Consente di configurare facilmente la risposta DNS personalizzata per un nome di dominio specifico.",

client/src/__locales/ja.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "<1>DNS-over-HTTPS</1>または<1>DNS-over-TLS</1>を使用するには、AdGuard Home 設定の<0>暗号化設定</0>が必要です。",
     "rewrite_added": "\"{{key}}\" のDNS書き換え情報を追加完了しました",
     "rewrite_deleted": "\"{{key}}\" のDNS書き換え情報を削除完了しました",
-    "rewrite_updated": "DNS rewrite を更新完了しました。",
     "rewrite_add": "DNS書き換え情報を追加する",
-    "rewrite_edit": "DNS rewrite を編集する",
     "rewrite_not_found": "DNS書き換え情報はありません",
     "rewrite_confirm_delete": "\"{{key}}\" のDNS書き換え情報を削除してもよろしいですか？",
     "rewrite_desc": "特定のドメイン名に対するDNS応答を簡単にカスタマイズすることを可能にします。",

client/src/__locales/ko.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "<1>DNS-over-HTTPS</1> 또는 <1>DNS-over-TLS를</1> 사용하려면 AdGuard Home 설정에서 <0>암호화를 구성해야 합니다.</0>",
     "rewrite_added": "'{{key}}'에 대한 DNS 수정 정보를 성공적으로 추가 됩니다",
     "rewrite_deleted": "'{{key}}'에 대한 DNS 수정 정보를 성공적으로 삭제 됩니다",
-    "rewrite_updated": "DNS 다시 쓰기 업데이트 완료",
     "rewrite_add": "DNS 변환 정보를 추가합니다",
-    "rewrite_edit": "DNS 다시 쓰기 편집",
     "rewrite_not_found": "DNS 변경 정보를 찾을 수 없습니다",
     "rewrite_confirm_delete": "'{{key}}'에 대한 DNS 변경 정보를 삭제하시겠습니까?",
     "rewrite_desc": "특정 도메인 이름에 대한 사용자 지정 DNS 응답을 쉽게 구성할 수 있습니다.",

client/src/__locales/nl.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Om <1>DNS-via-HTTPS</1> of <1>DNS-via-TLS</1> te gebruiken, moet je <0>Versleuteling configureren</0> in de AdGuard Home instellingen.",
     "rewrite_added": "DNS-herschrijving voor \"{{key}}\" met succes toegevoegd",
     "rewrite_deleted": "DNS-herschrijving voor \"{{key}}\" met succes verwijderd",
-    "rewrite_updated": "DNS-herschrijven succesvol bijgewerkt",
     "rewrite_add": "DNS-herschrijving toevoegen",
-    "rewrite_edit": "DNS-herschrijven bewerken",
     "rewrite_not_found": "Geen DNS-herschrijving gevonden",
     "rewrite_confirm_delete": "Bent u zeker dat u DNS-herschrijving \"{{key}}\" wilt verwijderen?",
     "rewrite_desc": "Hiermee kunt u eenvoudig aangepaste DNS-antwoorden configureren voor een specifieke domeinnaam.",

client/src/__locales/no.json

@@ -457,9 +457,7 @@
     "setup_dns_notice": "For å benytte <1>DNS-over-HTTPS</1> eller <1>DNS-over-TLS</1>, må du <0>sette opp Kryptering</0> i AdGuard Home-innstillingene.",
     "rewrite_added": "DNS-omdirigeringen for «{{key}}» ble vellykket lagt til",
     "rewrite_deleted": "DNS-omdirigeringen for «{{key}}» ble vellykket slettet",
-    "rewrite_updated": "DNS-omskriving ble oppdatert",
     "rewrite_add": "Legg til DNS-omdirigering",
-    "rewrite_edit": "Rediger DNS-omskriving",
     "rewrite_not_found": "Ingen DNS-omdirigeringer ble funnet",
     "rewrite_confirm_delete": "Er du sikker på at du vil slette DNS-omdirigeringen for «{{key}}»?",
     "rewrite_desc": "Lar deg enkelt konfigurere selvvalgte DNS-tilbakemeldinger for et spesifikt domenenavn.",

client/src/__locales/pl.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Aby skorzystać z <1>DNS-over-HTTPS</1> lub <1>DNS-over-TLS</1>, musisz w ustawieniach AdGuard Home <0>skonfigurować szyfrowanie</0>.",
     "rewrite_added": "Pomyślnie dodano przepisanie DNS dla „{{key}}”",
     "rewrite_deleted": "Przepisanie DNS dla „{{key}}” zostało pomyślnie usunięte",
-    "rewrite_updated": "Pomyślnie zaktualizowano przepisywanie DNS",
     "rewrite_add": "Dodaj przepisywanie DNS",
-    "rewrite_edit": "Edytuj przepisywanie DNS",
     "rewrite_not_found": "Nie znaleziono przepisywania DNS",
     "rewrite_confirm_delete": "Czy na pewno chcesz usunąć przepisywanie DNS dla „{{key}}”?",
     "rewrite_desc": "Pozwala łatwo skonfigurować niestandardową odpowiedź DNS dla określonej nazwy domeny.",

client/src/__locales/pt-br.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Para usar o <1>DNS-sobre-HTTPS</1> ou <1>DNS-sobre-TLS</1>, você precisa <0>configurar a criptografia</0> nas configurações do AdGuard Home.",
     "rewrite_added": "Reescrita de DNS para \"{{key}}\" adicionada com sucesso",
     "rewrite_deleted": "Reescrita de DNS para \"{{key}}\" excluída com sucesso",
-    "rewrite_updated": "Reconfiguração de DNS atualizada com êxito",
     "rewrite_add": "Adicionar reescrita de DNS",
-    "rewrite_edit": "Editar reconfiguração de DNS",
     "rewrite_not_found": "Nenhuma reescrita de DNS foi encontrada",
     "rewrite_confirm_delete": "Você tem certeza de que deseja excluir a reescrita de DNS para \"{{key}}\"?",
     "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",

client/src/__locales/pt-pt.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Para usar o <1>DNS-sobre-HTTPS</1> ou <1>DNS-sobre-TLS</1>, precisa de <0>configurar a criptografia</0> nas configurações do AdGuard Home.",
     "rewrite_added": "Reescrita de DNS para \"{{key}}\" adicionada com sucesso",
     "rewrite_deleted": "Reescrita de DNS para \"{{key}}\" excluída com sucesso",
-    "rewrite_updated": "Reedição de DNS atualizada com sucesso",
     "rewrite_add": "Adicionar reescrita de DNS",
-    "rewrite_edit": "Editar reedição de DNS",
     "rewrite_not_found": "Nenhuma reescrita de DNS foi encontrada",
     "rewrite_confirm_delete": "Tem a certeza de que deseja excluir a reescrita de DNS para \"{{key}}\"?",
     "rewrite_desc": "Permite configurar uma resposta personalizada do DNS para um nome de domínio específico.",

client/src/__locales/ro.json

@@ -167,7 +167,6 @@
     "enabled_parental_toast": "Control Parental activat",
     "disabled_safe_search_toast": "Căutare protejată dezactivată",
     "enabled_save_search_toast": "Căutare protejată activată",
-    "updated_save_search_toast": "Setări Căutare sigură actualizate",
     "enabled_table_header": "Activat",
     "name_table_header": "Nume",
     "list_url_table_header": "Lista URL",
@@ -257,12 +256,12 @@
     "query_log_cleared": "Jurnalul de interogare a fost șters cu succes",
     "query_log_updated": "Jurnalul de solicitări a fost actualizat cu succes",
     "query_log_clear": "Curăță jurnalele",
-    "query_log_retention": "Interogarea jurnalelor de rotație",
+    "query_log_retention": "Retenție jurnale interogare",
     "query_log_enable": "Activați jurnal",
     "query_log_configuration": "Configurația jurnalelor",
     "query_log_disabled": "Jurnalul de interogare este dezactivat și poate fi configurat în <0>setări</0>",
     "query_log_strict_search": "Utilizați ghilimele duble pentru căutare strictă",
-    "query_log_retention_confirm": "Sigur doriți să modificați rotația jurnalului de interogări? Dacă micșorați valoarea intervalului, unele date se vor pierde",
+    "query_log_retention_confirm": "Sunteți sigur că doriți să schimbați retenția jurnalului de interogare? Reducând valoarea intervalului, unele date vor fi pierdute",
     "anonymize_client_ip": "Anonimizare client IP",
     "anonymize_client_ip_desc": "Nu salvați adresa IP completă a clientului în jurnale și statistici",
     "dns_config": "Configurația serverului DNS",
@@ -291,8 +290,6 @@
     "rate_limit": "Limita ratei",
     "edns_enable": "Activați subrețeaua de clienți EDNS",
     "edns_cs_desc": "Adaugă opțiunea EDNS Client Subnet (ECS) la solicitările în amonte și înregistrează valorile trimise de clienți în jurnalul de interogare.",
-    "edns_use_custom_ip": "Utilizați IP personalizat pentru EDNS",
-    "edns_use_custom_ip_desc": "Permiteți utilizarea IP-ului personalizat pentru EDNS",
     "rate_limit_desc": "Numărul de interogări pe secundă permise pe client. Setarea la 0 înseamnă că nu există limită.",
     "blocking_ipv4_desc": "Adresa IP de returnat pentru o cerere A de blocare",
     "blocking_ipv6_desc": "Adresa IP de returnat pentru o cerere AAAA de blocare",
@@ -478,9 +475,7 @@
     "setup_dns_notice": "Pentru a utiliza <1>DNS-over-HTTPS</1> sau <1>DNS-over-TLS</1>, trebuie să <0>configurați Criptarea</0> în setările AdGuard Home.",
     "rewrite_added": "Rescriere DNS pentru \"{{key}}\" adăugată cu succes",
     "rewrite_deleted": "Rescriere DNS pentru \"{{key}}\" ștearsă cu succes",
-    "rewrite_updated": "DNS rescrie actualizat cu succes",
     "rewrite_add": "Adăugați rescriere DNS",
-    "rewrite_edit": "Editați rescrierea DNS",
     "rewrite_not_found": "Nu s-au găsit rescrieri DNS",
     "rewrite_confirm_delete": "Sunteți sigur că doriți să ștergeți rescrierea DNS pentru \"{{key}}\"?",
     "rewrite_desc": "Permite configurarea cu ușurință a răspunsului personalizat DNS pentru un nume de domeniu specific.",
@@ -528,10 +523,6 @@
     "statistics_retention_confirm": "Sunteți sigur că doriți să schimbați păstrarea statisticilor? Dacă reduceți valoarea intervalului, unele date vor fi pierdute",
     "statistics_cleared": "Statisticile au fost șterse cu succes",
     "statistics_enable": "Activați statisticile",
-    "ignore_domains": "Domenii ignorate (separate prin linie nouă)",
-    "ignore_domains_title": "Domenii ignorate",
-    "ignore_domains_desc_stats": "Interogările pentru aceste domenii nu sunt scrise în statistici",
-    "ignore_domains_desc_query": "Interogările pentru aceste domenii nu sunt scrise în jurnalul de interogări",
     "interval_hours": "{{count}} oră",
     "interval_hours_plural": "{{count}} ore",
     "filters_configuration": "Configurația filtrelor",
@@ -652,29 +643,5 @@
     "confirm_dns_cache_clear": "Sunteți sigur că doriți să ștergeți memoria cache DNS?",
     "cache_cleared": "Cache-ul DNS a fost golit cu succes",
     "clear_cache": "Goliți memoria cache",
-    "make_static": "Faceți static",
-    "theme_auto_desc": "Auto (pe baza schemei de culori a dispozitivului dvs.)",
-    "theme_dark_desc": "Temă întunecată",
-    "theme_light_desc": "Temă luminoasă",
-    "disable_for_seconds": "Timp de {{count}} secundă",
-    "disable_for_seconds_plural": "Timp de {{count}} secunde",
-    "disable_for_minutes": "Timp de {{count}} minut",
-    "disable_for_minutes_plural": "Timp de {{count}} minute",
-    "disable_for_hours": "Timp de {{count}} oră",
-    "disable_for_hours_plural": "Timp de {{count}} ore",
-    "disable_until_tomorrow": "Până mâine",
-    "disable_notify_for_seconds": "Dezactivați protecția timp de {{count}} secundă",
-    "disable_notify_for_seconds_plural": "Dezactivați protecția timp de {{count}} secunde",
-    "disable_notify_for_minutes": "Dezactivați protecția timp de {{count}} minut",
-    "disable_notify_for_minutes_plural": "Dezactivați protecția timp de {{count}} minute",
-    "disable_notify_for_hours": "Dezactivează protecția timp de {{count}} oră",
-    "disable_notify_for_hours_plural": "Dezactivați protecția timp de {{count}} ore",
-    "disable_notify_until_tomorrow": "Dezactivează protecția până mâine",
-    "enable_protection_timer": "Protecția va fi activată în {{time}}",
-    "custom_retention_input": "Introduceți reținerea în ore",
-    "custom_rotation_input": "Introduceți rotația în ore",
-    "protection_section_label": "Protecție",
-    "log_and_stats_section_label": "Jurnal de interogări și statistici",
-    "ignore_query_log": "Ignorați acest client în jurnalul de interogări",
-    "ignore_statistics": "Ignorați acest client în statistici"
+    "protection_section_label": "Protecție"
 }

client/src/__locales/ru.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Чтобы использовать <1>DNS-over-HTTPS</1> или <1>DNS-over-TLS</1>, вам нужно <0>настроить шифрование</0> в настройках AdGuard Home.",
     "rewrite_added": "Правило перезаписи DNS-запросов для «{{key}}» успешно добавлено",
     "rewrite_deleted": "Правило перезаписи DNS-запросов для «{{key}}» успешно удалено",
-    "rewrite_updated": "Правило перезаписи DNS-запросов успешно обновлено",
     "rewrite_add": "Добавить правило перезаписи DNS-запросов",
-    "rewrite_edit": "Редактировать правило перезаписи DNS-запросов",
     "rewrite_not_found": "Не найдено правил перезаписи DNS-запросов",
     "rewrite_confirm_delete": "Вы уверены, что хотите удалить правило перезаписи DNS-запросов для «{{key}}»?",
     "rewrite_desc": "Позволяет легко настроить пользовательский DNS-ответ для определеннного домена.",

client/src/__locales/si-lk.json

@@ -153,7 +153,6 @@
     "enabled_parental_toast": "දෙමාපිය පාලනය සබල කෙරිණි",
     "disabled_safe_search_toast": "ආරක්‍ෂිත සෙවුම අබල කෙරිණි",
     "enabled_save_search_toast": "ආරක්‍ෂිත සෙවුම සබල කෙරිණි",
-    "updated_save_search_toast": "ආරක්‍ෂිත සෙවුමේ සැකසුම් යාවත්කාල විය",
     "enabled_table_header": "සබලයි",
     "name_table_header": "නම",
     "list_url_table_header": "ඒ.ස.නි.(URL) ලැයිස්තුව",
@@ -238,12 +237,12 @@
     "query_log_cleared": "විමසුම් සටහන සාර්ථකව හිස් කර ඇත",
     "query_log_updated": "විමසුම් සටහන සාර්ථකව යාවත්කාල කෙරිණි",
     "query_log_clear": "විමසුම් සටහන් හිස් කරන්න",
-    "query_log_retention": "විමසුම් සටහන් රැඳවීම",
+    "query_log_retention": "විමසුම් සටහන් රඳවා තබා ගැනීම",
     "query_log_enable": "සටහන සබල කරන්න",
     "query_log_configuration": "සටහන් වින්‍යාසය",
     "query_log_disabled": "විමසුම් සටහන අබල කර ඇති අතර එය <0>සැකසුම්</0> තුළ වින්‍යාසගත කළ හැකිය",
     "query_log_strict_search": "ඉතා නිවැරදිව සෙවීමට ද්විත්ව උද්ධෘතය භාවිතා කරන්න",
-    "query_log_retention_confirm": "විමසුම් සටහන රඳවා තබා ගැනීම වෙනස් කිරීමට වුවමනා ද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
+    "query_log_retention_confirm": "විමසුම් සටහන රඳවා තබා ගැනීම වෙනස් කිරීමට ඇවැසි බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
     "anonymize_client_ip": "අනුග්‍රාහකයෙහි අ.ජා.කෙ. (IP) නිර්නාමික කරන්න",
     "anonymize_client_ip_desc": "සටහන් සහ සංඛ්‍යාලේඛන තුළ අනුග්‍රාහකයේ පූර්ණ අ.ජා.කෙ. ලිපිනය සුරකින්න එපා",
     "dns_config": "ව.නා.ප. සේවාදායක වින්‍යාසය",
@@ -271,8 +270,6 @@
     "form_enter_rate_limit": "අනුපාත සීමාව ඇතුල් කරන්න",
     "rate_limit": "අනුපාත සීමාව",
     "edns_enable": "EDNS අනුග්‍රාහක අනුජාලය සබල කරන්න",
-    "edns_use_custom_ip": "EDNS සඳහා අභිරුචි අ.ජා.කෙ. යොදාගන්න",
-    "edns_use_custom_ip_desc": "EDNS සඳහා අභිරුචි අ.ජා.කෙ. භාවිතයට ඉඩදෙන්න",
     "rate_limit_desc": "එක් අනුග්‍රාහකයකට ඉඩ දී ඇති තත්පරයට ඉල්ලීම් ගණන. එය 0 ලෙස සැකසීම යනුවෙන් අදහස් කරන්නේ සීමාවක් නැති බවයි.",
     "blocking_ipv4_desc": "අවහිර කළ A ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
     "blocking_ipv6_desc": "අවහිර කළ AAAA ඉල්ලීමක් සඳහා ආපසු එවිය යුතු අ.ජා.කෙ. (IP) ලිපිනය",
@@ -281,9 +278,6 @@
     "blocking_mode_nxdomain": "නොපවතින වසම: NXDOMAIN කේතය සමඟ ප්‍රතිචාර දක්වයි",
     "blocking_mode_null_ip": "අභිශූන්‍යය අ.ජා.කෙ.: ශුන්‍ය අ.ජා.කෙ. ලිපිනය සමඟ ප්‍රතිචාර දක්වයි (A සඳහා 0.0.0.0; AAAA සඳහා ::)",
     "blocking_mode_custom_ip": "අභිරුචි අන්තර්ජාල කෙටුම්පත: අතින් සැකසූ අ.ජා. කෙ. ලිපිනයක් සමඟ ප්‍රතිචාර දක්වයි",
-    "theme_auto": "ස්වයං",
-    "theme_light": "දීප්ත",
-    "theme_dark": "අඳුරු",
     "upstream_dns_client_desc": "ඔබ මෙම ක්ෂේත්‍රය හිස්ව තබා ගන්නේ නම්, ඇඩ්ගාර්ඩ් හෝම් විසින් <0>ව.නා.ප. සැකසුම්</0> හි වින්‍යාසගත කර ඇති සේවාදායක භාවිතා කරනු ඇත.",
     "tracker_source": "ලුහුබැඳීම් මූලාශ්‍රය",
     "source_label": "මූලාශ්‍රය",
@@ -376,7 +370,6 @@
     "encryption_issuer": "නිකුත් කරන්නා",
     "encryption_hostnames": "ධාරක නාම",
     "encryption_reset": "සංකේතාංකන සැකසුම් යළි පිහිටුවීමට අවශ්‍ය බව ඔබට විශ්වාස ද?",
-    "encryption_warning": "අවවාදයයි",
     "topline_expiring_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත්වීමට ආසන්න වී ඇත. <0>සංකේතන සැකසුම්</0> යාවත්කාල කරන්න.",
     "topline_expired_certificate": "ඔබගේ SSL සහතිකය කල් ඉකුත් වී ඇත. <0>සංකේතන සැකසුම්</0> යාවත්කාල කරන්න.",
     "form_error_port_range": "80-65535 පරාසය හි තොටක අගයක් ඇතුල් කරන්න",
@@ -497,10 +490,8 @@
     "statistics_clear": "සංඛ්‍යාලේඛන හිස් කරන්න",
     "statistics_clear_confirm": "සංඛ්‍යාලේඛන ඉවත් කිරීමට වුවමනා ද?",
     "statistics_retention_confirm": "සංඛ්‍යාලේඛන රඳවා තබා ගැනීම වෙනස් කිරීමට අවශ්‍ය බව ඔබට විශ්වාසද? ඔබ කාල පරතරයෙහි අගය අඩු කළහොත් සමහර දත්ත නැති වී යනු ඇත",
-    "statistics_cleared": "සංඛ්‍යාලේඛන සාර්ථකව හිස් කෙරිණි",
+    "statistics_cleared": "සංඛ්‍යාලේඛන සාර්ථකව ඉවත් කෙරිණි",
     "statistics_enable": "සංඛ්‍යාලේඛන සබල කරන්න",
-    "ignore_domains": "නොසලකන වසම් (පේළියකට එක බැගින්)",
-    "ignore_domains_title": "නොසලකන වසම්",
     "interval_hours": "පැය {{count}}",
     "interval_hours_plural": "පැය {{count}}",
     "filters_configuration": "පෙරහන් වින්‍යාසය",
@@ -610,31 +601,5 @@
     "parental_control": "දෙමාපිය පාලනය",
     "safe_browsing": "ආරක්‍ෂිත පිරික්සුම",
     "served_from_cache": "{{value}} <i>(නිහිතයෙන් ගැනිණි)</i>",
-    "form_error_password_length": "මුරපදය අවම වශයෙන් අකුරු {{value}} ක් දිගු විය යුතුමයි",
-    "cache_cleared": "ව.නා.ප. නිහිතය හිස් කෙරිණි",
-    "clear_cache": "නිහිතය මකන්න",
-    "make_static": "ස්ථිතික කරන්න",
-    "theme_dark_desc": "අඳුරු තේමාව",
-    "theme_light_desc": "දීප්ත තේමාව",
-    "disable_for_seconds": "තත්පර {{count}} ක්",
-    "disable_for_seconds_plural": "තත්පර {{count}} ක්",
-    "disable_for_minutes": "විනාඩි {{count}} ක්",
-    "disable_for_minutes_plural": "විනාඩි {{count}} ක්",
-    "disable_for_hours": "පැය {{count}} ක්",
-    "disable_for_hours_plural": "පැය {{count}} ක්",
-    "disable_until_tomorrow": "හෙට වනතුරු",
-    "disable_notify_for_seconds": "තත්. {{count}} කට රැකවරණය අබල කරන්න",
-    "disable_notify_for_seconds_plural": "තත්. {{count}} කට රැකවරණය අබල කරන්න",
-    "disable_notify_for_minutes": "විනාඩි {{count}} කට රැකවරණය අබල කරන්න",
-    "disable_notify_for_minutes_plural": "විනාඩි {{count}} කට රැකවරණය අබල කරන්න",
-    "disable_notify_for_hours": "පැය {{count}} කට රැකවරණය අබල කරන්න",
-    "disable_notify_for_hours_plural": "පැය {{count}} කට රැකවරණය අබල කරන්න",
-    "disable_notify_until_tomorrow": "හෙට වනතුරු රැකවරණය අබල කරන්න",
-    "enable_protection_timer": "{{time}} න් රැකවරණය සබල කෙරේ",
-    "custom_retention_input": "රඳවා ගැනීම පැය වලින්",
-    "custom_rotation_input": "රඳවා ගැනීම පැය වලින්",
-    "protection_section_label": "රැකවරණය",
-    "log_and_stats_section_label": "විමසුම් සටහන හා සංඛ්‍යාලේඛන",
-    "ignore_query_log": "සටහනෙහි අනුග්‍රාහකය නොසලකන්න",
-    "ignore_statistics": "සංඛ්‍යාලේඛනයට අනුග්‍රාහකය නොසලකන්න"
+    "form_error_password_length": "මුරපදය අවම වශයෙන් අකුරු {{value}} ක් දිගු විය යුතුමයි"
 }

client/src/__locales/sk.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Pre použitie <1>DNS-over-HTTPS</1> alebo <1>DNS-over-TLS</1>, potrebujete v nastaveniach AdGuard Home <0>nakonfigurovať šifrovanie</0>.",
     "rewrite_added": "DNS prepísanie pre \"{{key}}\" bolo úspešne pridané",
     "rewrite_deleted": "DNS prepísanie pre \"{{key}}\" bolo úspešne vymazané",
-    "rewrite_updated": "Prepísanie DNS bolo úspešne aktualizované",
     "rewrite_add": "Pridať DNS prepísanie",
-    "rewrite_edit": "Upraviť prepísanie DNS",
     "rewrite_not_found": "Neboli nájdené žiadne DNS prepísania",
     "rewrite_confirm_delete": "Naozaj chcete odstrániť prepísanie DNS pre \"{{key}}\"?",
     "rewrite_desc": "Umožňuje ľahko nakonfigurovať vlastnú odpoveď DNS pre konkrétne meno domény.",

client/src/__locales/sl.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Za uporabo <1>DNS-prek-HTTPS</1> ali <1>DNS-prek-TLS</1>, morate <0>konfigurirati šifriranje</0> v nastavitvah AdGuard Home.",
     "rewrite_added": "Uspešno je dodano DNS prepisovanje za \"{{key}}\"",
     "rewrite_deleted": "Uspešno je izbrisano DNS prepisovanje za \"{{key}}\"",
-    "rewrite_updated": "DNS prepisovanje uspešno posodobljen",
     "rewrite_add": "Dodaj prepisovanje DNS",
-    "rewrite_edit": "Urejanje prepisa DNS",
     "rewrite_not_found": "Ni bilo najdenih prepisovanj DNS",
     "rewrite_confirm_delete": "Ali ste prepričani, da želite izbrisati prepisovanje DNS za \"{{key}}\"?",
     "rewrite_desc": "Omogoča enostavno konfiguriranje odgovora DNS po meri za določeno ime domene.",

client/src/__locales/sr-cs.json

@@ -475,9 +475,7 @@
     "setup_dns_notice": "Kako biste koristili <1>DNS-over-HTTPS</1> ili <1>DNS-over-TLS</1>, potrebno je da <0>konfigurišete šifrovanje</0> u AdGuard Home postavkama.",
     "rewrite_added": "DNS prepisivanje za \"{{key}}\" je uspešno dodato",
     "rewrite_deleted": "DNS prepisivanje za \"{{key}}\" uspešno izbrisano",
-    "rewrite_updated": "DNS ponovo napisao uspešno ažuriran",
     "rewrite_add": "Dodaj DNS prepisivanje",
-    "rewrite_edit": "Uređivanje DNS prepravke",
     "rewrite_not_found": "DNS prepisivanja nisu pronađena",
     "rewrite_confirm_delete": "Jeste li sigurni da želite da izbrišete DNS prepisivanje za \"{{key}}\"?",
     "rewrite_desc": "Dozvoljava da jednostavno konfigurišete prilagođeni DNS odgovor za određeni domen.",

client/src/__locales/sv.json

@@ -475,9 +475,7 @@
     "setup_dns_notice": "För att kunna använda <1>DNS-över-HTTPS</1> eller <1>DNS-över-TLS</1>, behöver du <0>konfigurera Kryptering</0> i AdGuard Home-inställningar.",
     "rewrite_added": "DNS-omskrivning för \"{{key}}\" lyckad",
     "rewrite_deleted": "DNS-omskrivning för \"{{key}}\" har tagits bort",
-    "rewrite_updated": "DNS-omskrivning har uppdaterats",
     "rewrite_add": "Lägg till DNS omskrivning",
-    "rewrite_edit": "Redigera DNS-omskrivning",
     "rewrite_not_found": "Inga DNS omskrivningar hittades",
     "rewrite_confirm_delete": "Är du säker på att du vill ta bort DNS-omskrivningen för \"{{key}}\"?",
     "rewrite_desc": "Gör det enkelt att konfigurera anpassat DNS svar för ett specifikt domännamn.",

client/src/__locales/tr.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "<1>DNS-over-HTTPS</1> veya <1>DNS-over-TLS</1> protokolünü kullanmak için AdGuard Home üzerinde <0>Şifreleme ayarları</0> bölümünden ayarları yapmanız gerekir.",
     "rewrite_added": "\"{{key}}\" için DNS yeniden yazımı başarıyla eklendi",
     "rewrite_deleted": "\"{{key}}\" için DNS yeniden yazımı başarıyla silindi",
-    "rewrite_updated": "DNS yeniden yazma başarıyla güncellendi",
     "rewrite_add": "DNS yeniden yazımı ekle",
-    "rewrite_edit": "DNS yeniden yazmayı düzenle",
     "rewrite_not_found": "DNS yeniden yazımı bulunamadı",
     "rewrite_confirm_delete": "\"{{key}}\" için DNS yeniden yazımını silmek istediğinize emin misiniz?",
     "rewrite_desc": "Belirli bir alan adı için özel DNS yanıtını kolayca yapılandırmanızı sağlar.",

client/src/__locales/uk.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "Для використання <1>DNS-over-HTTPS</1> або <1>DNS-over-TLS</1>, вам потрібно <0>налаштувати Шифрування</0> в налаштуваннях AdGuard Home.",
     "rewrite_added": "Перезапис DNS для «{{key}}» успішно додано",
     "rewrite_deleted": "Перезапис DNS для «{{key}}» успішно видалено",
-    "rewrite_updated": "Перезапис DNS успішно оновлено",
     "rewrite_add": "Додати перезапис DNS",
-    "rewrite_edit": "Редагувати перезапис DNS",
     "rewrite_not_found": "Перезаписів DNS не знайдено",
     "rewrite_confirm_delete": "Ви впевнені, що хочете видалити перезапис DNS для «{{key}}»?",
     "rewrite_desc": "Дозволяє легко налаштувати власну відповідь DNS для певного доменного імені.",

client/src/__locales/vi.json

@@ -167,7 +167,6 @@
     "enabled_parental_toast": "Đã bật quản lý của phụ huynh",
     "disabled_safe_search_toast": "Đã tắt tìm kiếm an toàn",
     "enabled_save_search_toast": "Đã bật tìm kiếm an toàn",
-    "updated_save_search_toast": "Cài đặt Tìm kiếm an toàn đã được cập nhật",
     "enabled_table_header": "Kích hoạt",
     "name_table_header": "Tên",
     "list_url_table_header": "URL bộ lọc",
@@ -257,12 +256,12 @@
     "query_log_cleared": "Nhật ký truy vấn đã được xóa thành công",
     "query_log_updated": "Cập nhật thành công nhật kí truy xuất",
     "query_log_clear": "Xóa nhật ký truy vấn",
-    "query_log_retention": "Xoay vòng nhật ký truy vấn",
+    "query_log_retention": "Lưu giữ nhật ký truy vấn",
     "query_log_enable": "Bật nhật ký",
     "query_log_configuration": "Cấu hình nhật ký",
     "query_log_disabled": "Nhật ký truy vấn bị vô hiệu hóa và có thể được định cấu hình trong <0>cài đặt</ 0>",
     "query_log_strict_search": "Sử dụng dấu ngoặc kép để tìm kiếm nghiêm ngặt",
-    "query_log_retention_confirm": "Bạn có chắc chắn muốn thay đổi xoay vòng nhật ký truy vấn không? Nếu bạn giảm giá trị khoảng thời gian, một số dữ liệu sẽ bị mất",
+    "query_log_retention_confirm": "Bạn có chắc chắn muốn thay đổi lưu giữ nhật ký truy vấn? Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
     "anonymize_client_ip": "Ẩn danh IP khách",
     "anonymize_client_ip_desc": "Không lưu địa chỉ IP đầy đủ của khách hàng trong nhật ký và thống kê",
     "dns_config": "Thiết lập máy chủ DNS",
@@ -291,8 +290,6 @@
     "rate_limit": "Giới hạn yêu cầu",
     "edns_enable": "Bật mạng con EDNS Client",
     "edns_cs_desc": "Thêm tùy chọn EDNS Client Subnet (ECS) vào các yêu cầu ngược dòng và ghi lại các giá trị được gửi bởi các máy khách trong nhật ký truy vấn.",
-    "edns_use_custom_ip": "Sử dụng địa chỉ IP tùy chỉnh cho EDNS",
-    "edns_use_custom_ip_desc": "Cho phép sử dụng địa chỉ IP tùy chỉnh cho EDNS",
     "rate_limit_desc": "Số lượng yêu cầu mỗi giây mà một khách hàng được phép thực hiện (0: không giới hạn)",
     "blocking_ipv4_desc": "Địa chỉ IP được trả lại cho một yêu cầu A bị chặn",
     "blocking_ipv6_desc": "Địa chỉ IP được trả lại cho một yêu cầu AAA bị chặn",
@@ -478,9 +475,7 @@
     "setup_dns_notice": "Để sử dụng <1>DNS-over-HTTPS</1> hoặc <1>DNS-over-TLS</1>, bạn cần <0>định cấu hình Mã hóa</0> trong cài đặt AdGuard Home.",
     "rewrite_added": "DNS viết lại cho \"{{key}}\" đã thêm thành công",
     "rewrite_deleted": "DNS viết lại cho \"{{key}}\" đã xóa thành công",
-    "rewrite_updated": "Viết lại DNS được cập nhật thành công",
     "rewrite_add": "Thêm DNS viết lại",
-    "rewrite_edit": "Chỉnh sửa viết lại DNS",
     "rewrite_not_found": "Không tìm thấy DNS viết lại",
     "rewrite_confirm_delete": "Bạn có chắc chắn muốn xóa DNS viết lại cho \"{{key}}\" không?",
     "rewrite_desc": "Cho phép dễ dàng định cấu hình tùy chỉnh DNS phản hồi cho một tên miền cụ thể.",
@@ -528,10 +523,6 @@
     "statistics_retention_confirm": "Bạn có chắc chắn muốn thay đổi lưu giữ số liệu thống kê? Nếu bạn giảm giá trị khoảng, một số dữ liệu sẽ bị mất",
     "statistics_cleared": "Xoá thống kê thành công",
     "statistics_enable": "Bật thống kê",
-    "ignore_domains": "Các miền bị bỏ qua (cách nhau bởi dòng mới)",
-    "ignore_domains_title": "Các miền bị bỏ qua",
-    "ignore_domains_desc_stats": "Các truy vấn cho các miền này sẽ không được ghi vào thống kê",
-    "ignore_domains_desc_query": "Các truy vấn cho các miền này sẽ không được ghi vào nhật ký truy vấn",
     "interval_hours": "{{count}} giờ",
     "interval_hours_plural": "{{count}} giờ",
     "filters_configuration": "Cấu hình bộ lọc",
@@ -652,29 +643,5 @@
     "confirm_dns_cache_clear": "Bạn có chắc chắn muốn xóa bộ đệm ẩn DNS không?",
     "cache_cleared": "Đã xóa thành công bộ đệm DNS",
     "clear_cache": "Xóa bộ nhớ cache",
-    "make_static": "Chuyển sang tĩnh",
-    "theme_auto_desc": "Tự động (dựa trên chủ đề màu của thiết bị của bạn)",
-    "theme_dark_desc": "Chủ đề tối",
-    "theme_light_desc": "Chủ đề sáng",
-    "disable_for_seconds": "Trong {{count}} giây",
-    "disable_for_seconds_plural": "Trong {{count}} giây",
-    "disable_for_minutes": "Trong {{count}} phút",
-    "disable_for_minutes_plural": "Trong {{count}} phút",
-    "disable_for_hours": "Trong {{count}} giờ",
-    "disable_for_hours_plural": "Trong {{count}} giờ",
-    "disable_until_tomorrow": "Cho đến ngày mai",
-    "disable_notify_for_seconds": "Tắt bảo vệ trong {{count}} giây",
-    "disable_notify_for_seconds_plural": "Tắt bảo vệ trong {{count}} giây",
-    "disable_notify_for_minutes": "Tắt bảo vệ trong {{count}} phút",
-    "disable_notify_for_minutes_plural": "Tắt bảo vệ trong {{count}} phút",
-    "disable_notify_for_hours": "Tắt bảo vệ trong {{count}} giờ",
-    "disable_notify_for_hours_plural": "Tắt bảo vệ trong {{count}} giờ",
-    "disable_notify_until_tomorrow": "Vô hiệu hóa bảo vệ cho đến ngày mai",
-    "enable_protection_timer": "Bảo vệ sẽ được bật trong {{time}}",
-    "custom_retention_input": "Nhập thời gian giữ lại theo giờ",
-    "custom_rotation_input": "Nhập chu kỳ theo giờ",
-    "protection_section_label": "Sự bảo vệ",
-    "log_and_stats_section_label": "Nhật ký truy vấn và thống kê",
-    "ignore_query_log": "Bỏ qua máy khách này trong nhật ký truy vấn",
-    "ignore_statistics": "Bỏ qua máy khách này trong thống kê"
+    "protection_section_label": "Sự bảo vệ"
 }

client/src/__locales/zh-cn.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "为了使用 <1>DNS-over-HTTPS</1> 或者 <1>DNS-over-TLS</1> ，您需要在 AdGuard Home 设置中 <0>配置加密</0> 。",
     "rewrite_added": "已成功添加 \"{{key}}\" 的 DNS 重写",
     "rewrite_deleted": "已成功删除 \"{{key}}\" 的 DNS 重写",
-    "rewrite_updated": "DNS 重写已成功更新",
     "rewrite_add": "添加 DNS 重写",
-    "rewrite_edit": "编辑 DNS 重写",
     "rewrite_not_found": "未找到 DNS 重写",
     "rewrite_confirm_delete": "您确定要删除 \"{{key}}\" 的 DNS 重写？",
     "rewrite_desc": "可以轻松地为特定域名配置自定义 DNS 响应。",

client/src/__locales/zh-hk.json

@@ -48,7 +48,6 @@
     "out_of_range_error": "必須介於 \"{{start}}\" - \"{{end}}\" 範圍之外",
     "lower_range_start_error": "必須小於起始值",
     "greater_range_start_error": "必須大於起始值",
-    "gateway_or_subnet_invalid": "無效子網路",
     "dhcp_form_gateway_input": "閘道 IP 位址",
     "dhcp_form_subnet_input": "子網路遮罩",
     "dhcp_form_range_title": "IP 位址範圍",
@@ -196,7 +195,6 @@
     "form_error_url_or_path_format": "列表中含有的 URL 網址或絕對路徑",
     "custom_filter_rules": "自訂過濾規則",
     "custom_filter_rules_hint": "一行一條規則。您可以使用「adblock」語法或「hosts檔案」的語法。",
-    "system_host_files": "系統 hosts 檔案",
     "examples_title": "範例",
     "example_meaning_filter_block": "封鎖對 example.org 網域及其所有子網域的存取",
     "example_meaning_filter_whitelist": "解除對 example.org 網域及其所有子網域存取封鎖",
@@ -281,8 +279,6 @@
     "rate_limit": "速率限制",
     "edns_enable": "啟用 EDNS Client Subnet",
     "edns_cs_desc": "傳送用戶端的子網路給 DNS 伺服器。",
-    "edns_use_custom_ip": "使用自訂 EDNS IP",
-    "edns_use_custom_ip_desc": "允許使用自訂 EDNS IP",
     "rate_limit_desc": "限制單一裝置每秒發出的查詢次數（設定為 0 即表示無限制）",
     "blocking_ipv4_desc": "回覆指定 IPv4 位址給被封鎖的網域的 A 紀錄查詢",
     "blocking_ipv6_desc": "回覆指定 IPv6 位址給被封鎖的網域的 AAAA 紀錄查詢",
@@ -291,9 +287,6 @@
     "blocking_mode_nxdomain": "NXDOMAIN：回應 NXDOMAIN 狀態碼",
     "blocking_mode_null_ip": "Null IP：回應零值的 IP 位址（A 紀錄回應 0.0.0.0 ，AAAA 紀錄回應 ::）",
     "blocking_mode_custom_ip": "自訂 IP 位址：回應一個自訂的 IP 位址",
-    "theme_auto": "自動",
-    "theme_light": "明亮",
-    "theme_dark": "深色",
     "upstream_dns_client_desc": "如果您將此欄位留白，AdGuard Home 將使用 <0>DNS 設定</0> 內的設定的 DNS 伺服器。",
     "tracker_source": "追蹤器來源",
     "source_label": "來源",
@@ -404,7 +397,6 @@
     "dns_providers": "下列為常見的<0> DNS 伺服器</0>。",
     "update_now": "立即更新",
     "update_failed": "自動更新發生錯誤。請嘗試依照<a>以下步驟</a> 來手動更新。",
-    "manual_update": "請嘗試依照<a>下列步驟</a>來手動更新。",
     "processing_update": "請稍候，AdGuard Home 正在更新",
     "clients_title": "用戶端",
     "clients_desc": "對已連接到 AdGuard Home 的裝置進行設定",
@@ -621,22 +613,5 @@
     "original_response": "原始回應",
     "click_to_view_queries": "按一下以檢視查詢結果",
     "port_53_faq_link": "連接埠 53 經常被「DNSStubListener」或「systemd-resolved」服務佔用。請閱讀下列有關解決<0>這個問題</0>的說明",
-    "adg_will_drop_dns_queries": "AdGuard Home 將停止回應此用戶端的所有 DNS 查詢。",
-    "safe_browsing": "安全瀏覽",
-    "served_from_cache": "{{value}} <i>(由快取回應)</i>",
-    "form_error_password_length": "密碼必須至少 {{value}} 個字元長度",
-    "theme_dark_desc": "深色主題",
-    "theme_light_desc": "淺色主題",
-    "disable_for_seconds": "{{count}} 秒",
-    "disable_for_seconds_plural": "{{count}} 秒",
-    "disable_for_minutes": "{{count}} 分鐘",
-    "disable_for_minutes_plural": "{{count}} 分鐘",
-    "disable_for_hours": "{{count}} 小時",
-    "disable_for_hours_plural": "{{count}} 小時",
-    "disable_until_tomorrow": "直到明天",
-    "disable_notify_for_seconds": "暫停防護 {{count}} 秒",
-    "disable_notify_for_seconds_plural": "暫停防護 {{count}} 秒",
-    "disable_notify_for_minutes": "暫停防護 {{count}} 分鐘",
-    "disable_notify_for_minutes_plural": "暫停防護 {{count}} 分鐘",
-    "disable_notify_for_hours": "暫停防護 {{count}} 小時"
+    "adg_will_drop_dns_queries": "AdGuard Home 將停止回應此用戶端的所有 DNS 查詢。"
 }

client/src/__locales/zh-tw.json

@@ -478,9 +478,7 @@
     "setup_dns_notice": "為了使用 <1>DNS-over-HTTPS</1> 或 <1>DNS-over-TLS</1>，您需要在 AdGuard Home 設定裡<0>配置加密</0>。",
     "rewrite_added": "對於 \"{{key}}\" 之 DNS 改寫被成功地加入",
     "rewrite_deleted": "對於 \"{{key}}\" 之 DNS 改寫被成功地刪除",
-    "rewrite_updated": "DNS 重寫已成功更新",
     "rewrite_add": "新增 DNS 改寫",
-    "rewrite_edit": "編輯 DNS 重寫",
     "rewrite_not_found": "無已發現之 DNS 改寫",
     "rewrite_confirm_delete": "您確定您想要刪除對於 \"{{key}}\" 之 DNS 改寫嗎？",
     "rewrite_desc": "允許輕易地配置自訂的 DNS 回應供特定的域名。",

client/src/actions/rewrites.js

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

client/src/api/Api.js

@@ -455,8 +455,6 @@ class Api {
 
     REWRITE_ADD = { path: 'rewrite/add', method: 'POST' };
 
-    REWRITE_UPDATE = { path: 'rewrite/update', method: 'PUT' };
-
     REWRITE_DELETE = { path: 'rewrite/delete', method: 'POST' };
 
     getRewritesList() {
@@ -472,14 +470,6 @@ class Api {
         return this.makeRequest(path, method, parameters);
     }
 
-    updateRewrite(config) {
-        const { path, method } = this.REWRITE_UPDATE;
-        const parameters = {
-            data: config,
-        };
-        return this.makeRequest(path, method, parameters);
-    }
-
     deleteRewrite(config) {
         const { path, method } = this.REWRITE_DELETE;
         const parameters = {

client/src/components/Filters/Rewrites/Form.js

@@ -105,7 +105,6 @@ Form.propTypes = {
     submitting: PropTypes.bool.isRequired,
     processingAdd: PropTypes.bool.isRequired,
     t: PropTypes.func.isRequired,
-    initialValues: PropTypes.object,
 };
 
 export default flow([

client/src/components/Filters/Rewrites/Modal.js

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

client/src/components/Filters/Rewrites/Table.js

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import ReactTable from 'react-table';
 import { withTranslation } from 'react-i18next';
 import { sortIp } from '../../../helpers/helpers';
-import { MODAL_TYPE } from '../../../helpers/constants';
 
 class Table extends Component {
     cellWrap = ({ value }) => (
@@ -32,44 +31,24 @@ class Table extends Component {
             maxWidth: 100,
             sortable: false,
             resizable: false,
-            Cell: (value) => {
-                const currentRewrite = {
-                    answer: value.row.answer,
-                    domain: value.row.domain,
-                };
-
-                return (
-                    <div className="logs__row logs__row--center">
-                        <button
-                            type="button"
-                            className="btn btn-icon btn-outline-primary btn-sm mr-2"
-                            onClick={() => {
-                                this.props.toggleRewritesModal({
-                                    type: MODAL_TYPE.EDIT_REWRITE,
-                                    currentRewrite,
-                                });
-                            }}
-                            disabled={this.props.processingUpdate}
-                            title={this.props.t('edit_table_action')}
-                        >
-                            <svg className="icons icon12">
-                                <use xlinkHref="#edit" />
-                            </svg>
-                        </button>
-
-                        <button
-                            type="button"
-                            className="btn btn-icon btn-outline-secondary btn-sm"
-                            onClick={() => this.props.handleDelete(currentRewrite)}
-                            title={this.props.t('delete_table_action')}
-                        >
-                            <svg className="icons">
-                                <use xlinkHref="#delete" />
-                            </svg>
-                        </button>
-                    </div>
-                );
-            },
+            Cell: (value) => (
+                <div className="logs__row logs__row--center">
+                    <button
+                        type="button"
+                        className="btn btn-icon btn-icon--green btn-outline-secondary btn-sm"
+                        onClick={() => this.props.handleDelete({
+                            answer: value.row.answer,
+                            domain: value.row.domain,
+                        })
+                        }
+                        title={this.props.t('delete_table_action')}
+                    >
+                        <svg className="icons">
+                            <use xlinkHref="#delete" />
+                        </svg>
+                    </button>
+                </div>
+            ),
         },
     ];
 
@@ -105,9 +84,7 @@ Table.propTypes = {
     processing: PropTypes.bool.isRequired,
     processingAdd: PropTypes.bool.isRequired,
     processingDelete: PropTypes.bool.isRequired,
-    processingUpdate: PropTypes.bool.isRequired,
     handleDelete: PropTypes.func.isRequired,
-    toggleRewritesModal: PropTypes.func.isRequired,
 };
 
 export default withTranslation()(Table);

client/src/components/Filters/Rewrites/index.js

@@ -6,13 +6,16 @@ import Table from './Table';
 import Modal from './Modal';
 import Card from '../../ui/Card';
 import PageTitle from '../../ui/PageTitle';
-import { MODAL_TYPE } from '../../../helpers/constants';
 
 class Rewrites extends Component {
     componentDidMount() {
         this.props.getRewritesList();
     }
 
+    handleSubmit = (values) => {
+        this.props.addRewrite(values);
+    };
+
     handleDelete = (values) => {
         // eslint-disable-next-line no-alert
         if (window.confirm(this.props.t('rewrite_confirm_delete', { key: values.domain }))) {
@@ -20,19 +23,6 @@ class Rewrites extends Component {
         }
     };
 
-    handleSubmit = (values) => {
-        const { modalType, currentRewrite } = this.props.rewrites;
-
-        if (modalType === MODAL_TYPE.EDIT_REWRITE && currentRewrite) {
-            this.props.updateRewrite({
-                target: currentRewrite,
-                update: values,
-            });
-        } else {
-            this.props.addRewrite(values);
-        }
-    };
-
     render() {
         const {
             t,
@@ -46,9 +36,6 @@ class Rewrites extends Component {
             processing,
             processingAdd,
             processingDelete,
-            processingUpdate,
-            modalType,
-            currentRewrite,
         } = rewrites;
 
         return (
@@ -67,15 +54,13 @@ class Rewrites extends Component {
                             processing={processing}
                             processingAdd={processingAdd}
                             processingDelete={processingDelete}
-                            processingUpdate={processingUpdate}
                             handleDelete={this.handleDelete}
-                            toggleRewritesModal={toggleRewritesModal}
                         />
 
                         <button
                             type="button"
                             className="btn btn-success btn-standard mt-3"
-                            onClick={() => toggleRewritesModal({ type: MODAL_TYPE.ADD_REWRITE })}
+                            onClick={() => toggleRewritesModal()}
                             disabled={processingAdd}
                         >
                             <Trans>rewrite_add</Trans>
@@ -83,13 +68,10 @@ class Rewrites extends Component {
 
                         <Modal
                             isModalOpen={isModalOpen}
-                            modalType={modalType}
                             toggleRewritesModal={toggleRewritesModal}
                             handleSubmit={this.handleSubmit}
                             processingAdd={processingAdd}
                             processingDelete={processingDelete}
-                            processingUpdate={processingUpdate}
-                            currentRewrite={currentRewrite}
                         />
                     </Fragment>
                 </Card>
@@ -104,7 +86,6 @@ Rewrites.propTypes = {
     toggleRewritesModal: PropTypes.func.isRequired,
     addRewrite: PropTypes.func.isRequired,
     deleteRewrite: PropTypes.func.isRequired,
-    updateRewrite: PropTypes.func.isRequired,
     rewrites: PropTypes.object.isRequired,
 };
 

client/src/components/Filters/Table.js

@@ -48,7 +48,6 @@ class Table extends Component {
             Header: <Trans>list_url_table_header</Trans>,
             accessor: 'url',
             minWidth: 180,
-            // eslint-disable-next-line react/prop-types
             Cell: ({ value }) => (
                 <div className="logs__row">
                     {isValidAbsolutePath(value) ? value

client/src/components/ProtectionTimer/index.js

@@ -32,8 +32,6 @@ const ProtectionTimer = ({
 };
 
 ProtectionTimer.propTypes = {
-    protectionDisabledDuration: PropTypes.number,
-    toggleProtectionSuccess: PropTypes.func.isRequired,
     setProtectionTimerTime: PropTypes.func.isRequired,
 };
 

client/src/components/Settings/LogsConfig/Form.js

@@ -27,6 +27,7 @@ import {
 } from '../../../helpers/constants';
 import '../FormButton.css';
 
+
 const getIntervalTitle = (interval, t) => {
     switch (interval) {
         case RETENTION_CUSTOM:

client/src/components/Settings/StatsConfig/Form.js

@@ -7,6 +7,7 @@ import { Trans, withTranslation } from 'react-i18next';
 import flow from 'lodash/flow';
 import { connect } from 'react-redux';
 
+
 import {
     renderRadioField,
     toNumber,

client/src/components/ui/Icons.js

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-unknown-property */
 import React from 'react';
 
 import './Icons.css';

client/src/containers/DnsRewrites.js

@@ -3,7 +3,6 @@ import {
     getRewritesList,
     addRewrite,
     deleteRewrite,
-    updateRewrite,
     toggleRewritesModal,
 } from '../actions/rewrites';
 import Rewrites from '../components/Filters/Rewrites';
@@ -18,7 +17,6 @@ const mapDispatchToProps = {
     getRewritesList,
     addRewrite,
     deleteRewrite,
-    updateRewrite,
     toggleRewritesModal,
 };
 

client/src/helpers/constants.js

@@ -173,8 +173,6 @@ export const MODAL_TYPE = {
     ADD_FILTERS: 'ADD_FILTERS',
     EDIT_FILTERS: 'EDIT_FILTERS',
     CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST',
-    ADD_REWRITE: 'ADD_REWRITE',
-    EDIT_REWRITE: 'EDIT_REWRITE',
 };
 
 export const CLIENT_ID = {

client/src/helpers/helpers.js

@@ -845,6 +845,7 @@ export const sortIp = (a, b) => {
     }
 };
 
+
 /**
  * @param {number} filterId
  * @returns {string}

client/src/reducers/rewrites.js

@@ -30,27 +30,7 @@ const rewrites = handleActions(
         [actions.deleteRewriteFailure]: (state) => ({ ...state, processingDelete: false }),
         [actions.deleteRewriteSuccess]: (state) => ({ ...state, processingDelete: false }),
 
-        [actions.updateRewriteRequest]: (state) => ({ ...state, processingUpdate: true }),
-        [actions.updateRewriteFailure]: (state) => ({ ...state, processingUpdate: false }),
-        [actions.updateRewriteSuccess]: (state) => {
-            const newState = {
-                ...state,
-                processingUpdate: false,
-            };
-            return newState;
-        },
-
-        [actions.toggleRewritesModal]: (state, { payload }) => {
-            if (payload) {
-                const newState = {
-                    ...state,
-                    modalType: payload.type || '',
-                    isModalOpen: !state.isModalOpen,
-                    currentRewrite: payload.currentRewrite,
-                };
-                return newState;
-            }
-
+        [actions.toggleRewritesModal]: (state) => {
             const newState = {
                 ...state,
                 isModalOpen: !state.isModalOpen,
@@ -62,10 +42,7 @@ const rewrites = handleActions(
         processing: true,
         processingAdd: false,
         processingDelete: false,
-        processingUpdate: false,
         isModalOpen: false,
-        modalType: '',
-        currentRewrite: {},
         list: [],
     },
 );

docker/Dockerfile

@@ -82,5 +82,6 @@ CMD [ \
 	"/opt/adguardhome/AdGuardHome", \
 	"--no-check-update", \
 	"-c", "/opt/adguardhome/conf/AdGuardHome.yaml", \
+	"-h", "0.0.0.0", \
 	"-w", "/opt/adguardhome/work" \
 ]

go.mod

@@ -3,13 +3,11 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.19
 
 require (
-	// TODO(a.garipov): Update to a tagged version when it's released.
-	github.com/AdguardTeam/dnsproxy v0.50.3-0.20230628054307-31e374065768
-	github.com/AdguardTeam/golibs v0.13.3
+	github.com/AdguardTeam/dnsproxy v0.50.2
+	github.com/AdguardTeam/golibs v0.13.2
 	github.com/AdguardTeam/urlfilter v0.16.1
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/ameshkov/dnscrypt/v2 v2.2.7
-	github.com/bluele/gcache v0.0.2
 	github.com/digineo/go-ipset/v2 v2.2.1
 	github.com/dimfeld/httptreemux/v5 v5.5.0
 	github.com/fsnotify/fsnotify v1.6.0
@@ -18,7 +16,7 @@ require (
 	github.com/google/gopacket v1.1.19
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.3.0
-	github.com/insomniacslk/dhcp v0.0.0-20230612134759-b20c9ba983df
+	github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb
 	github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86
 	github.com/kardianos/service v1.2.2
 	github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
@@ -27,15 +25,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.55
+	github.com/miekg/dns v1.1.54
 	github.com/quic-go/quic-go v0.35.1
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.8.2
 	github.com/ti-mo/netfilter v0.5.0
 	go.etcd.io/bbolt v1.3.7
-	golang.org/x/crypto v0.10.0
-	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
-	golang.org/x/net v0.11.0
-	golang.org/x/sys v0.9.0
+	golang.org/x/crypto v0.9.0
+	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
+	golang.org/x/net v0.10.0
+	golang.org/x/sys v0.8.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	howett.net/plist v1.0.0
@@ -46,22 +44,23 @@ require (
 	github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
 	github.com/ameshkov/dnsstamps v1.0.3 // indirect
 	github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect
+	github.com/bluele/gcache v0.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
-	github.com/onsi/ginkgo/v2 v2.11.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.10.0 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pierrec/lz4/v4 v4.1.18 // indirect
+	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
 	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
 	github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
-	golang.org/x/mod v0.11.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
-	golang.org/x/tools v0.10.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/sync v0.2.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/tools v0.9.3 // indirect
 )

go.sum

@@ -1,9 +1,9 @@
-github.com/AdguardTeam/dnsproxy v0.50.3-0.20230628054307-31e374065768 h1:5Ia6wA+tqAlTyzuaOVGSlHmb0osLWXeJUs3NxCuC4gA=
-github.com/AdguardTeam/dnsproxy v0.50.3-0.20230628054307-31e374065768/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
+github.com/AdguardTeam/dnsproxy v0.50.2 h1:p1471SsMZ6SMo7T51Olw4aNluahvMwSLMorwxYV18ts=
+github.com/AdguardTeam/dnsproxy v0.50.2/go.mod h1:CQhZTkqC8X0ID6glrtyaxgqRRdiYfn1gJulC1cZ5Dn8=
 github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
 github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
-github.com/AdguardTeam/golibs v0.13.3 h1:RT3QbzThtaLiFLkIUDS6/hlGEXrh0zYvdf4bd7UWpGo=
-github.com/AdguardTeam/golibs v0.13.3/go.mod h1:wkJ6EUsN4np/9Gp7+9QeooY9E2U2WCLJYAioLCzkHsI=
+github.com/AdguardTeam/golibs v0.13.2 h1:BPASsyQKmb+b8VnvsNOHp7bKfcZl9Z+Z2UhPjOiupSc=
+github.com/AdguardTeam/golibs v0.13.2/go.mod h1:7ylQLv2Lqsc3UW3jHoITynYk6Y1tYtgEMkR09ppfsN8=
 github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
 github.com/AdguardTeam/urlfilter v0.16.1 h1:ZPi0rjqo8cQf2FVdzo6cqumNoHZx2KPXj2yZa1A5BBw=
 github.com/AdguardTeam/urlfilter v0.16.1/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
@@ -58,8 +58,8 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
-github.com/insomniacslk/dhcp v0.0.0-20230612134759-b20c9ba983df h1:pF1MMIzEJzJ/MyI4bXYXVYyN8CJgoQ2PPKT2z3O/Cl4=
-github.com/insomniacslk/dhcp v0.0.0-20230612134759-b20c9ba983df/go.mod h1:7474bZ1YNCvarT6WFKie4kEET6J0KYRDC4XJqqXzQW4=
+github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb h1:6fDKEAXwe3rsfS4khW3EZ8kEqmSiV9szhMPcDrD+Y7Q=
+github.com/insomniacslk/dhcp v0.0.0-20230516061539-49801966e6cb/go.mod h1:7474bZ1YNCvarT6WFKie4kEET6J0KYRDC4XJqqXzQW4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
@@ -85,18 +85,18 @@ github.com/mdlayher/socket v0.2.1/go.mod h1:QLlNPkFR88mRUNQIzRBMfXxwKal8H7u1h3bL
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
 github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
-github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
-github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/miekg/dns v1.1.54 h1:5jon9mWcb0sFJGpnI99tOMhCPyJ+RPVz5b63MQG0VWI=
+github.com/miekg/dns v1.1.54/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
-github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
-github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
+github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs=
+github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE=
+github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
-github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
+github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -113,13 +113,17 @@ github.com/quic-go/quic-go v0.35.1/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5
 github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
 github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/ti-mo/netfilter v0.2.0/go.mod h1:8GbBGsY/8fxtyIdfwy29JiluNcPK4K7wIT+x42ipqUU=
 github.com/ti-mo/netfilter v0.5.0 h1:MZmsUw5bFRecOb0AeyjOPxTHg4UxYzyEs0Ek/6Lxoy8=
 github.com/ti-mo/netfilter v0.5.0/go.mod h1:nt+8B9hx/QpqHr7Hazq+2qMCCA8u2OTkyc/7+U9ARz8=
@@ -134,15 +138,15 @@ go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
 go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
 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.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
-golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
-golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME=
-golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
-golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -152,12 +156,12 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
-golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -177,22 +181,22 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/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.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
-golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
-golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/aghnet/interfaces_windows.go

@@ -0,0 +1,17 @@
+//go:build windows
+
+package aghnet
+
+import (
+	"net"
+
+	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
+)
+
+// listenPacketReusable announces on the local network address additionally
+// configuring the socket to have a reusable binding.
+func listenPacketReusable(_, _, _ string) (c net.PacketConn, err error) {
+	// TODO(e.burkov):  Check if we are able to control sockets on Windows
+	// in the same way as on Unix.
+	return nil, aghos.Unsupported("listening packet reusable")
+}

internal/dhcpd/bitset.go

@@ -25,8 +25,11 @@ func (s *bitSet) isSet(n uint64) (ok bool) {
 
 	var word uint64
 	word, ok = s.words[wordIdx]
+	if !ok {
+		return false
+	}
 
-	return ok && word&(1<<bitIdx) != 0
+	return word&(1<<bitIdx) != 0
 }
 
 // set sets or unsets a bit.

internal/dhcpd/conn_bsd.go

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

internal/dhcpd/conn_linux.go

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

internal/dhcpd/dhcpd.go

@@ -28,9 +28,8 @@ const (
 	defaultBackoff     time.Duration = 500 * time.Millisecond
 )
 
-// Lease contains the necessary information about a DHCP lease.  It's used as is
-// in the database, so don't change it until it's absolutely necessary, see
-// [dataVersion].
+// Lease contains the necessary information about a DHCP lease.  It's used in
+// various places.  So don't change it without good reason.
 type Lease struct {
 	// Expiry is the expiration time of the lease.
 	Expiry time.Time `json:"expires"`
@@ -42,6 +41,8 @@ type Lease struct {
 	HWAddr net.HardwareAddr `json:"mac"`
 
 	// IP is the IP address leased to the client.
+	//
+	// TODO(a.garipov): Migrate leases.db.
 	IP netip.Addr `json:"ip"`
 
 	// IsStatic defines if the lease is static.

internal/dhcpd/os_windows.go

@@ -0,0 +1,15 @@
+//go:build windows
+
+package dhcpd
+
+import (
+	"net"
+
+	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
+	"golang.org/x/net/ipv4"
+)
+
+// Create a socket for receiving broadcast packets
+func newBroadcastPacketConn(_ net.IP, _ int, _ string) (*ipv4.PacketConn, error) {
+	return nil, aghos.Unsupported("newBroadcastPacketConn")
+}

internal/dhcpd/routeradv.go

@@ -200,7 +200,7 @@ func createICMPv6RAPacket(params icmpv6RA) (data []byte, err error) {
 func (ra *raCtx) Init() (err error) {
 	ra.stop.Store(0)
 	ra.conn = nil
-	if !ra.raAllowSLAAC && !ra.raSLAACOnly {
+	if !(ra.raAllowSLAAC || ra.raSLAACOnly) {
 		return nil
 	}
 

internal/dhcpsvc/config.go

@@ -1,86 +0,0 @@
-package dhcpsvc
-
-import (
-	"net/netip"
-	"time"
-
-	"github.com/google/gopacket/layers"
-)
-
-// Config is the configuration for the DHCP service.
-type Config struct {
-	// Interfaces stores configurations of DHCP server specific for the network
-	// interface identified by its name.
-	Interfaces map[string]*InterfaceConfig
-
-	// LocalDomainName is the top-level domain name to use for resolving DHCP
-	// clients' hostnames.
-	LocalDomainName string
-
-	// ICMPTimeout is the timeout for checking another DHCP server's presence.
-	ICMPTimeout time.Duration
-
-	// Enabled is the state of the service, whether it is enabled or not.
-	Enabled bool
-}
-
-// InterfaceConfig is the configuration of a single DHCP interface.
-type InterfaceConfig struct {
-	// IPv4 is the configuration of DHCP protocol for IPv4.
-	IPv4 *IPv4Config
-
-	// IPv6 is the configuration of DHCP protocol for IPv6.
-	IPv6 *IPv6Config
-}
-
-// IPv4Config is the interface-specific configuration for DHCPv4.
-type IPv4Config struct {
-	// GatewayIP is the IPv4 address of the network's gateway.  It is used as
-	// the default gateway for DHCP clients and also used in calculating the
-	// network-specific broadcast address.
-	GatewayIP netip.Addr
-
-	// SubnetMask is the IPv4 subnet mask of the network.  It should be a valid
-	// IPv4 subnet mask (i.e. all 1s followed by all 0s).
-	SubnetMask netip.Addr
-
-	// RangeStart is the first address in the range to assign to DHCP clients.
-	RangeStart netip.Addr
-
-	// RangeEnd is the last address in the range to assign to DHCP clients.
-	RangeEnd netip.Addr
-
-	// Options is the list of DHCP options to send to DHCP clients.
-	Options layers.DHCPOptions
-
-	// LeaseDuration is the TTL of a DHCP lease.
-	LeaseDuration time.Duration
-
-	// Enabled is the state of the DHCPv4 service, whether it is enabled or not
-	// on the specific interface.
-	Enabled bool
-}
-
-// IPv6Config is the interface-specific configuration for DHCPv6.
-type IPv6Config struct {
-	// RangeStart is the first address in the range to assign to DHCP clients.
-	RangeStart netip.Addr
-
-	// Options is the list of DHCP options to send to DHCP clients.
-	Options layers.DHCPOptions
-
-	// LeaseDuration is the TTL of a DHCP lease.
-	LeaseDuration time.Duration
-
-	// RASlaacOnly defines whether the DHCP clients should only use SLAAC for
-	// address assignment.
-	RASLAACOnly bool
-
-	// RAAllowSlaac defines whether the DHCP clients may use SLAAC for address
-	// assignment.
-	RAAllowSLAAC bool
-
-	// Enabled is the state of the DHCPv6 service, whether it is enabled or not
-	// on the specific interface.
-	Enabled bool
-}

internal/dhcpsvc/dhcpsvc.go

@@ -1,120 +0,0 @@
-// Package dhcpsvc contains the AdGuard Home DHCP service.
-//
-// TODO(e.burkov): Add tests.
-package dhcpsvc
-
-import (
-	"context"
-	"net"
-	"net/netip"
-	"time"
-
-	"github.com/AdguardTeam/AdGuardHome/internal/next/agh"
-)
-
-// Lease is a DHCP lease.
-//
-// TODO(e.burkov):  Consider it to [agh], since it also may be needed in
-// [websvc].  Also think of implementing iterating methods with appropriate
-// signatures.
-type Lease struct {
-	// IP is the IP address leased to the client.
-	IP netip.Addr
-
-	// Expiry is the expiration time of the lease.
-	Expiry time.Time
-
-	// Hostname of the client.
-	Hostname string
-
-	// HWAddr is the physical hardware address (MAC address).
-	HWAddr net.HardwareAddr
-
-	// IsStatic defines if the lease is static.
-	IsStatic bool
-}
-
-type Interface interface {
-	agh.ServiceWithConfig[*Config]
-
-	// Enabled returns true if DHCP provides information about clients.
-	Enabled() (ok bool)
-
-	// HostByIP returns the hostname of the DHCP client with the given IP
-	// address.  The address will be netip.Addr{} if there is no such client,
-	// due to an assumption that a DHCP client must always have an IP address.
-	HostByIP(ip netip.Addr) (host string)
-
-	// MACByIP returns the MAC address for the given IP address leased.  It
-	// returns nil if there is no such client, due to an assumption that a DHCP
-	// client must always have a MAC address.
-	MACByIP(ip netip.Addr) (mac net.HardwareAddr)
-
-	// IPByHost returns the IP address of the DHCP client with the given
-	// hostname.  The hostname will be an empty string if there is no such
-	// client, due to an assumption that a DHCP client must always have a
-	// hostname, either set by the client or assigned automatically.
-	IPByHost(host string) (ip netip.Addr)
-
-	// Leases returns all the DHCP leases.
-	Leases() (leases []*Lease)
-
-	// AddLease adds a new DHCP lease.  It returns an error if the lease is
-	// invalid or already exists.
-	AddLease(l *Lease) (err error)
-
-	// EditLease changes an existing DHCP lease.  It returns an error if there
-	// is no lease equal to old or if new is invalid or already exists.
-	EditLease(old, new *Lease) (err error)
-
-	// RemoveLease removes an existing DHCP lease.  It returns an error if there
-	// is no lease equal to l.
-	RemoveLease(l *Lease) (err error)
-
-	// Reset removes all the DHCP leases.
-	Reset() (err error)
-}
-
-// Empty is an [Interface] implementation that does nothing.
-type Empty struct{}
-
-// type check
-var _ Interface = Empty{}
-
-// Start implements the [Service] interface for Empty.
-func (Empty) Start() (err error) { return nil }
-
-// Shutdown implements the [Service] interface for Empty.
-func (Empty) Shutdown(_ context.Context) (err error) { return nil }
-
-var _ agh.ServiceWithConfig[*Config] = Empty{}
-
-// Config implements the [ServiceWithConfig] interface for Empty.
-func (Empty) Config() (conf *Config) { return nil }
-
-// Enabled implements the [Interface] interface for Empty.
-func (Empty) Enabled() (ok bool) { return false }
-
-// HostByIP implements the [Interface] interface for Empty.
-func (Empty) HostByIP(_ netip.Addr) (host string) { return "" }
-
-// MACByIP implements the [Interface] interface for Empty.
-func (Empty) MACByIP(_ netip.Addr) (mac net.HardwareAddr) { return nil }
-
-// IPByHost implements the [Interface] interface for Empty.
-func (Empty) IPByHost(_ string) (ip netip.Addr) { return netip.Addr{} }
-
-// Leases implements the [Interface] interface for Empty.
-func (Empty) Leases() (leases []*Lease) { return nil }
-
-// AddLease implements the [Interface] interface for Empty.
-func (Empty) AddLease(_ *Lease) (err error) { return nil }
-
-// EditLease implements the [Interface] interface for Empty.
-func (Empty) EditLease(_, _ *Lease) (err error) { return nil }
-
-// RemoveLease implements the [Interface] interface for Empty.
-func (Empty) RemoveLease(_ *Lease) (err error) { return nil }
-
-// Reset implements the [Interface] interface for Empty.
-func (Empty) Reset() (err error) { return nil }

internal/dnsforward/dns.go

@@ -145,13 +145,10 @@ func (s *Server) handleDNSRequest(_ *proxy.Proxy, pctx *proxy.DNSContext) error
 // processRecursion checks the incoming request and halts its handling by
 // answering NXDOMAIN if s has tried to resolve it recently.
 func (s *Server) processRecursion(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing recursion")
-	defer log.Debug("dnsforward: finished processing recursion")
-
 	pctx := dctx.proxyCtx
 
 	if msg := pctx.Req; msg != nil && s.recDetector.check(*msg) {
-		log.Debug("dnsforward: recursion detected resolving %q", msg.Question[0].Name)
+		log.Debug("recursion detected resolving %q", msg.Question[0].Name)
 		pctx.Res = s.genNXDomain(pctx.Req)
 
 		return resultCodeFinish
@@ -161,13 +158,10 @@ func (s *Server) processRecursion(dctx *dnsContext) (rc resultCode) {
 }
 
 // processInitial terminates the following processing for some requests if
-// needed and enriches dctx with some client-specific information.
+// needed and enriches the ctx with some client-specific information.
 //
 // TODO(e.burkov):  Decompose into less general processors.
 func (s *Server) processInitial(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing initial")
-	defer log.Debug("dnsforward: finished processing initial")
-
 	pctx := dctx.proxyCtx
 	q := pctx.Req.Question[0]
 	qt := q.Qtype
@@ -288,9 +282,6 @@ func (s *Server) onDHCPLeaseChanged(flags int) {
 //
 // See https://www.ietf.org/archive/id/draft-ietf-add-ddr-10.html.
 func (s *Server) processDDRQuery(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing ddr")
-	defer log.Debug("dnsforward: finished processing ddr")
-
 	if !s.conf.HandleDDR {
 		return resultCodeSuccess
 	}
@@ -384,9 +375,6 @@ func (s *Server) makeDDRResponse(req *dns.Msg) (resp *dns.Msg) {
 // processDetermineLocal determines if the client's IP address is from locally
 // served network and saves the result into the context.
 func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing local detection")
-	defer log.Debug("dnsforward: finished processing local detection")
-
 	rc = resultCodeSuccess
 
 	var ip net.IP
@@ -417,9 +405,6 @@ func (s *Server) dhcpHostToIP(host string) (ip netip.Addr, ok bool) {
 //
 // TODO(a.garipov): Adapt to AAAA as well.
 func (s *Server) processDHCPHosts(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing dhcp hosts")
-	defer log.Debug("dnsforward: finished processing dhcp hosts")
-
 	pctx := dctx.proxyCtx
 	req := pctx.Req
 	q := req.Question[0]
@@ -559,9 +544,6 @@ func extractARPASubnet(domain string) (pref netip.Prefix, err error) {
 // processRestrictLocal responds with NXDOMAIN to PTR requests for IP addresses
 // in locally served network from external clients.
 func (s *Server) processRestrictLocal(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing local restriction")
-	defer log.Debug("dnsforward: finished processing local restriction")
-
 	pctx := dctx.proxyCtx
 	req := pctx.Req
 	q := req.Question[0]
@@ -631,9 +613,6 @@ func (s *Server) ipToDHCPHost(ip netip.Addr) (host string, ok bool) {
 // processDHCPAddrs responds to PTR requests if the target IP is leased by the
 // DHCP server.
 func (s *Server) processDHCPAddrs(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing dhcp addrs")
-	defer log.Debug("dnsforward: finished processing dhcp addrs")
-
 	pctx := dctx.proxyCtx
 	if pctx.Res != nil {
 		return resultCodeSuccess
@@ -679,9 +658,6 @@ func (s *Server) processDHCPAddrs(dctx *dnsContext) (rc resultCode) {
 // processLocalPTR responds to PTR requests if the target IP is detected to be
 // inside the local network and the query was not answered from DHCP.
 func (s *Server) processLocalPTR(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing local ptr")
-	defer log.Debug("dnsforward: finished processing local ptr")
-
 	pctx := dctx.proxyCtx
 	if pctx.Res != nil {
 		return resultCodeSuccess
@@ -716,9 +692,6 @@ func (s *Server) processLocalPTR(dctx *dnsContext) (rc resultCode) {
 
 // Apply filtering logic
 func (s *Server) processFilteringBeforeRequest(ctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing filtering before req")
-	defer log.Debug("dnsforward: finished processing filtering before req")
-
 	if ctx.proxyCtx.Res != nil {
 		// Go on since the response is already set.
 		return resultCodeSuccess
@@ -752,9 +725,6 @@ func ipStringFromAddr(addr net.Addr) (ipStr string) {
 
 // processUpstream passes request to upstream servers and handles the response.
 func (s *Server) processUpstream(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing upstream")
-	defer log.Debug("dnsforward: finished processing upstream")
-
 	pctx := dctx.proxyCtx
 	req := pctx.Req
 	q := req.Question[0]
@@ -901,9 +871,6 @@ func (s *Server) setCustomUpstream(pctx *proxy.DNSContext, clientID string) {
 
 // Apply filtering logic after we have received response from upstream servers
 func (s *Server) processFilteringAfterResponse(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing filtering after resp")
-	defer log.Debug("dnsforward: finished processing filtering after resp")
-
 	pctx := dctx.proxyCtx
 	switch res := dctx.result; res.Reason {
 	case filtering.NotFilteredAllowList:

internal/dnsforward/dnsforward.go

@@ -48,33 +48,12 @@ var webRegistered bool
 
 // hostToIPTable is a convenient type alias for tables of host names to an IP
 // address.
-//
-// TODO(e.burkov):  Use the [DHCP] interface instead.
 type hostToIPTable = map[string]netip.Addr
 
 // ipToHostTable is a convenient type alias for tables of IP addresses to their
 // host names.  For example, for use with PTR queries.
-//
-// TODO(e.burkov):  Use the [DHCP] interface instead.
 type ipToHostTable = map[netip.Addr]string
 
-// DHCP is an interface for accessing DHCP lease data needed in this package.
-type DHCP interface {
-	// HostByIP returns the hostname of the DHCP client with the given IP
-	// address.  The address will be netip.Addr{} if there is no such client,
-	// due to an assumption that a DHCP client must always have an IP address.
-	HostByIP(ip netip.Addr) (host string)
-
-	// IPByHost returns the IP address of the DHCP client with the given
-	// hostname.  The hostname will be an empty string if there is no such
-	// client, due to an assumption that a DHCP client must always have a
-	// hostname, either set by the client or assigned automatically.
-	IPByHost(host string) (ip netip.Addr)
-
-	// Enabled returns true if DHCP provides information about clients.
-	Enabled() (ok bool)
-}
-
 // Server is the main way to start a DNS server.
 //
 // Example:
@@ -236,7 +215,7 @@ func (s *Server) Close() {
 	s.dnsProxy = nil
 
 	if err := s.ipset.close(); err != nil {
-		log.Error("dnsforward: closing ipset: %s", err)
+		log.Error("closing ipset: %s", err)
 	}
 }
 
@@ -464,7 +443,7 @@ func (s *Server) setupResolvers(localAddrs []string) (err error) {
 		return err
 	}
 
-	log.Debug("dnsforward: upstreams to resolve ptr for local addresses: %v", localAddrs)
+	log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
 
 	var upsConfig *proxy.UpstreamConfig
 	upsConfig, err = proxy.ParseUpstreamsConfig(
@@ -677,9 +656,7 @@ func (s *Server) Reconfigure(conf *ServerConfig) error {
 	s.serverLock.Lock()
 	defer s.serverLock.Unlock()
 
-	log.Info("dnsforward: starting reconfiguring server")
-	defer log.Info("dnsforward: finished reconfiguring server")
-
+	log.Print("Start reconfiguring the server")
 	err := s.stopLocked()
 	if err != nil {
 		return fmt.Errorf("could not reconfigure the server: %w", err)
@@ -731,13 +708,13 @@ func (s *Server) IsBlockedClient(ip netip.Addr, clientID string) (blocked bool,
 	// Allow if at least one of the checks allows in allowlist mode, but block
 	// if at least one of the checks blocks in blocklist mode.
 	if allowlistMode && blockedByIP && blockedByClientID {
-		log.Debug("dnsforward: client %v (id %q) is not in access allowlist", ip, clientID)
+		log.Debug("client %v (id %q) is not in access allowlist", ip, clientID)
 
 		// Return now without substituting the empty rule for the
 		// clientID because the rule can't be empty here.
 		return true, rule
 	} else if !allowlistMode && (blockedByIP || blockedByClientID) {
-		log.Debug("dnsforward: client %v (id %q) is in access blocklist", ip, clientID)
+		log.Debug("client %v (id %q) is in access blocklist", ip, clientID)
 
 		blocked = true
 	}

internal/dnsforward/filter.go

@@ -53,14 +53,14 @@ func (s *Server) beforeRequestHandler(
 // getClientRequestFilteringSettings looks up client filtering settings using
 // the client's IP address and ID, if any, from dctx.
 func (s *Server) getClientRequestFilteringSettings(dctx *dnsContext) *filtering.Settings {
-	setts := s.dnsFilter.Settings()
+	setts := s.dnsFilter.GetConfig()
 	setts.ProtectionEnabled = dctx.protectionEnabled
 	if s.conf.FilterHandler != nil {
 		ip, _ := netutil.IPAndPortFromAddr(dctx.proxyCtx.Addr)
-		s.conf.FilterHandler(ip, dctx.clientID, setts)
+		s.conf.FilterHandler(ip, dctx.clientID, &setts)
 	}
 
-	return setts
+	return &setts
 }
 
 // filterDNSRequest applies the dnsFilter and sets dctx.proxyCtx.Res if the

internal/dnsforward/ipset.go

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

internal/dnsforward/msg.go

@@ -57,13 +57,16 @@ func (s *Server) genDNSFilterMessage(
 		return s.genBlockedHost(req, s.conf.SafeBrowsingBlockHost, dctx)
 	case filtering.FilteredParental:
 		return s.genBlockedHost(req, s.conf.ParentalBlockHost, dctx)
-	case filtering.FilteredSafeSearch:
-		// If Safe Search generated the necessary IP addresses, use them.
-		// Otherwise, if there were no errors, there are no addresses for the
-		// requested IP version, so produce a NODATA response.
-		return s.genResponseWithIPs(req, ipsFromRules(res.Rules))
 	default:
-		return s.genForBlockingMode(req, ipsFromRules(res.Rules))
+		// If the query was filtered by Safe Search, filtering also must return
+		// the IP addresses that must be used in response.  Return them
+		// regardless of the filtering method.
+		ips := ipsFromRules(res.Rules)
+		if res.Reason == filtering.FilteredSafeSearch && len(ips) > 0 {
+			return s.genResponseWithIPs(req, ips)
+		}
+
+		return s.genForBlockingMode(req, ips)
 	}
 }
 

internal/dnsforward/stats.go

@@ -17,78 +17,60 @@ import (
 
 // Write Stats data and logs
 func (s *Server) processQueryLogsAndStats(dctx *dnsContext) (rc resultCode) {
-	log.Debug("dnsforward: started processing querylog and stats")
-	defer log.Debug("dnsforward: finished processing querylog and stats")
-
 	elapsed := time.Since(dctx.startTime)
 	pctx := dctx.proxyCtx
 
-	q := pctx.Req.Question[0]
+	shouldLog := true
+	msg := pctx.Req
+	q := msg.Question[0]
 	host := strings.ToLower(strings.TrimSuffix(q.Name, "."))
 
+	// don't log ANY request if refuseAny is enabled
+	if q.Qtype == dns.TypeANY && s.conf.RefuseAny {
+		shouldLog = false
+	}
+
 	ip, _ := netutil.IPAndPortFromAddr(pctx.Addr)
 	ip = slices.Clone(ip)
+
+	s.serverLock.RLock()
+	defer s.serverLock.RUnlock()
+
 	s.anonymizer.Load()(ip)
 
-	log.Debug("dnsforward: client ip for stats and querylog: %s", ip)
+	log.Debug("client ip: %s", ip)
 
 	ipStr := ip.String()
 	ids := []string{ipStr, dctx.clientID}
-	qt, cl := q.Qtype, q.Qclass
 
 	// Synchronize access to s.queryLog and s.stats so they won't be suddenly
 	// uninitialized while in use.  This can happen after proxy server has been
 	// stopped, but its workers haven't yet exited.
-	s.serverLock.RLock()
-	defer s.serverLock.RUnlock()
-
-	if s.shouldLog(host, qt, cl, ids) {
+	if shouldLog &&
+		s.queryLog != nil &&
+		// TODO(s.chzhen):  Use dnsforward.dnsContext when it will start
+		// containing persistent client.
+		s.queryLog.ShouldLog(host, q.Qtype, q.Qclass, ids) {
 		s.logQuery(dctx, pctx, elapsed, ip)
 	} else {
 		log.Debug(
-			"dnsforward: request %s %s %q from %s ignored; not adding to querylog",
-			dns.Class(cl),
-			dns.Type(qt),
+			"dnsforward: request %s %s from %s ignored; not logging",
+			dns.Type(q.Qtype),
 			host,
 			ip,
 		)
 	}
 
-	if s.shouldCountStat(host, qt, cl, ids) {
+	if s.stats != nil &&
+		// TODO(s.chzhen):  Use dnsforward.dnsContext when it will start
+		// containing persistent client.
+		s.stats.ShouldCount(host, q.Qtype, q.Qclass, ids) {
 		s.updateStats(dctx, elapsed, *dctx.result, ipStr)
-	} else {
-		log.Debug(
-			"dnsforward: request %s %s %q from %s ignored; not counting in stats",
-			dns.Class(cl),
-			dns.Type(qt),
-			host,
-			ip,
-		)
 	}
 
 	return resultCodeSuccess
 }
 
-// shouldLog returns true if the query with the given data should be logged in
-// the query log.  s.serverLock is expected to be locked.
-func (s *Server) shouldLog(host string, qt, cl uint16, ids []string) (ok bool) {
-	if qt == dns.TypeANY && s.conf.RefuseAny {
-		return false
-	}
-
-	// TODO(s.chzhen):  Use dnsforward.dnsContext when it will start containing
-	// persistent client.
-	return s.queryLog != nil && s.queryLog.ShouldLog(host, qt, cl, ids)
-}
-
-// shouldCountStat returns true if the query with the given data should be
-// counted in the statistics.  s.serverLock is expected to be locked.
-func (s *Server) shouldCountStat(host string, qt, cl uint16, ids []string) (ok bool) {
-	// TODO(s.chzhen):  Use dnsforward.dnsContext when it will start containing
-	// persistent client.
-	return s.stats != nil && s.stats.ShouldCount(host, qt, cl, ids)
-}
-
 // logQuery pushes the request details into the query log.
 func (s *Server) logQuery(
 	dctx *dnsContext,
@@ -141,10 +123,7 @@ func (s *Server) updateStats(
 	pctx := ctx.proxyCtx
 	e := stats.Entry{}
 	e.Domain = strings.ToLower(pctx.Req.Question[0].Name)
-	if e.Domain != "." {
-		// Remove last ".", but save the domain as is for "." queries.
-		e.Domain = e.Domain[:len(e.Domain)-1]
-	}
+	e.Domain = e.Domain[:len(e.Domain)-1] // remove last "."
 
 	if clientID := ctx.clientID; clientID != "" {
 		e.Client = clientID

internal/dnsforward/stats_test.go

@@ -46,10 +46,6 @@ type testStats struct {
 
 // Update implements the [stats.Interface] interface for *testStats.
 func (l *testStats) Update(e stats.Entry) {
-	if e.Domain == "" {
-		return
-	}
-
 	l.lastEntry = e
 }
 
@@ -58,12 +54,9 @@ func (l *testStats) ShouldCount(string, uint16, uint16, []string) bool {
 	return true
 }
 
-func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
-	const domain = "example.com."
-
+func TestProcessQueryLogsAndStats(t *testing.T) {
 	testCases := []struct {
 		name           string
-		domain         string
 		proto          proxy.Proto
 		addr           net.Addr
 		clientID       string
@@ -74,7 +67,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult stats.Result
 	}{{
 		name:           "success_udp",
-		domain:         domain,
 		proto:          proxy.ProtoUDP,
 		addr:           &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "",
@@ -85,7 +77,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult: stats.RNotFiltered,
 	}, {
 		name:           "success_tls_clientid",
-		domain:         domain,
 		proto:          proxy.ProtoTLS,
 		addr:           &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "cli42",
@@ -96,7 +87,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult: stats.RNotFiltered,
 	}, {
 		name:           "success_tls",
-		domain:         domain,
 		proto:          proxy.ProtoTLS,
 		addr:           &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "",
@@ -107,7 +97,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult: stats.RNotFiltered,
 	}, {
 		name:           "success_quic",
-		domain:         domain,
 		proto:          proxy.ProtoQUIC,
 		addr:           &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "",
@@ -118,7 +107,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult: stats.RNotFiltered,
 	}, {
 		name:           "success_https",
-		domain:         domain,
 		proto:          proxy.ProtoHTTPS,
 		addr:           &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "",
@@ -129,7 +117,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult: stats.RNotFiltered,
 	}, {
 		name:           "success_dnscrypt",
-		domain:         domain,
 		proto:          proxy.ProtoDNSCrypt,
 		addr:           &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "",
@@ -140,7 +127,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult: stats.RNotFiltered,
 	}, {
 		name:           "success_udp_filtered",
-		domain:         domain,
 		proto:          proxy.ProtoUDP,
 		addr:           &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "",
@@ -151,7 +137,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult: stats.RFiltered,
 	}, {
 		name:           "success_udp_sb",
-		domain:         domain,
 		proto:          proxy.ProtoUDP,
 		addr:           &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "",
@@ -162,7 +147,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult: stats.RSafeBrowsing,
 	}, {
 		name:           "success_udp_ss",
-		domain:         domain,
 		proto:          proxy.ProtoUDP,
 		addr:           &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "",
@@ -173,7 +157,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantStatResult: stats.RSafeSearch,
 	}, {
 		name:           "success_udp_pc",
-		domain:         domain,
 		proto:          proxy.ProtoUDP,
 		addr:           &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
 		clientID:       "",
@@ -182,17 +165,6 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		wantCode:       resultCodeSuccess,
 		reason:         filtering.FilteredParental,
 		wantStatResult: stats.RParental,
-	}, {
-		name:           "success_udp_pc_empty_fqdn",
-		domain:         ".",
-		proto:          proxy.ProtoUDP,
-		addr:           &net.UDPAddr{IP: net.IP{1, 2, 3, 5}, Port: 1234},
-		clientID:       "",
-		wantLogProto:   "",
-		wantStatClient: "1.2.3.5",
-		wantCode:       resultCodeSuccess,
-		reason:         filtering.FilteredParental,
-		wantStatResult: stats.RParental,
 	}}
 
 	ups, err := upstream.AddressToUpstream("1.1.1.1", nil)
@@ -209,7 +181,7 @@ func TestServer_ProcessQueryLogsAndStats(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			req := &dns.Msg{
 				Question: []dns.Question{{
-					Name: tc.domain,
+					Name: "example.com.",
 				}},
 			}
 			pctx := &proxy.DNSContext{

internal/filtering/blocked.go

@@ -2,12 +2,9 @@ package filtering
 
 import (
 	"encoding/json"
-	"fmt"
 	"net/http"
-	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
-	"github.com/AdguardTeam/AdGuardHome/internal/schedule"
 	"github.com/AdguardTeam/golibs/log"
 	"github.com/AdguardTeam/urlfilter/rules"
 	"golang.org/x/exp/slices"
@@ -47,57 +44,23 @@ func initBlockedServices() {
 	log.Debug("filtering: initialized %d services", l)
 }
 
-// BlockedServices is the configuration of blocked services.
-type BlockedServices struct {
-	// Schedule is blocked services schedule for every day of the week.
-	Schedule *schedule.Weekly `yaml:"schedule"`
+// BlockedSvcKnown returns true if a blocked service ID is known.
+func BlockedSvcKnown(s string) (ok bool) {
+	_, ok = serviceRules[s]
 
-	// IDs is the names of blocked services.
-	IDs []string `yaml:"ids"`
-}
-
-// Clone returns a deep copy of blocked services.
-func (s *BlockedServices) Clone() (c *BlockedServices) {
-	if s == nil {
-		return nil
-	}
-
-	return &BlockedServices{
-		Schedule: s.Schedule.Clone(),
-		IDs:      slices.Clone(s.IDs),
-	}
-}
-
-// Validate returns an error if blocked services contain unknown service ID.  s
-// must not be nil.
-func (s *BlockedServices) Validate() (err error) {
-	for _, id := range s.IDs {
-		_, ok := serviceRules[id]
-		if !ok {
-			return fmt.Errorf("unknown blocked-service %q", id)
-		}
-	}
-
-	return nil
+	return ok
 }
 
 // ApplyBlockedServices - set blocked services settings for this DNS request
-func (d *DNSFilter) ApplyBlockedServices(setts *Settings) {
-	d.confLock.RLock()
-	defer d.confLock.RUnlock()
-
+func (d *DNSFilter) ApplyBlockedServices(setts *Settings, list []string) {
 	setts.ServicesRules = []ServiceEntry{}
+	if list == nil {
+		d.confLock.RLock()
+		defer d.confLock.RUnlock()
 
-	bsvc := d.BlockedServices
-
-	// TODO(s.chzhen):  Use startTime from [dnsforward.dnsContext].
-	if !bsvc.Schedule.Contains(time.Now()) {
-		d.ApplyBlockedServicesList(setts, bsvc.IDs)
+		list = d.Config.BlockedServices
 	}
-}
 
-// ApplyBlockedServicesList appends filtering rules to the settings.
-func (d *DNSFilter) ApplyBlockedServicesList(setts *Settings, list []string) {
 	for _, name := range list {
 		rules, ok := serviceRules[name]
 		if !ok {
@@ -127,7 +90,7 @@ func (d *DNSFilter) handleBlockedServicesAll(w http.ResponseWriter, r *http.Requ
 
 func (d *DNSFilter) handleBlockedServicesList(w http.ResponseWriter, r *http.Request) {
 	d.confLock.RLock()
-	list := d.Config.BlockedServices.IDs
+	list := d.Config.BlockedServices
 	d.confLock.RUnlock()
 
 	_ = aghhttp.WriteJSONResponse(w, r, list)
@@ -143,7 +106,7 @@ func (d *DNSFilter) handleBlockedServicesSet(w http.ResponseWriter, r *http.Requ
 	}
 
 	d.confLock.Lock()
-	d.Config.BlockedServices.IDs = list
+	d.Config.BlockedServices = list
 	d.confLock.Unlock()
 
 	log.Debug("Updated blocked services list: %d", len(list))

internal/filtering/filtering.go

@@ -103,9 +103,9 @@ type Config struct {
 
 	Rewrites []*LegacyRewrite `yaml:"rewrites"`
 
-	// BlockedServices is the configuration of blocked services.
+	// Names of services to block (globally).
 	// Per-client settings can override this configuration.
-	BlockedServices *BlockedServices `yaml:"blocked_services"`
+	BlockedServices []string `yaml:"blocked_services"`
 
 	// EtcHosts is a container of IP-hostname pairs taken from the operating
 	// system configuration files (e.g. /etc/hosts).
@@ -298,12 +298,12 @@ func (d *DNSFilter) SetEnabled(enabled bool) {
 	atomic.StoreUint32(&d.enabled, mathutil.BoolToNumber[uint32](enabled))
 }
 
-// Settings returns filtering settings.
-func (d *DNSFilter) Settings() (s *Settings) {
+// GetConfig - get configuration
+func (d *DNSFilter) GetConfig() (s Settings) {
 	d.confLock.RLock()
 	defer d.confLock.RUnlock()
 
-	return &Settings{
+	return Settings{
 		FilteringEnabled:    atomic.LoadUint32(&d.Config.enabled) != 0,
 		SafeSearchEnabled:   d.Config.SafeSearchConf.Enabled,
 		SafeBrowsingEnabled: d.Config.SafeBrowsingEnabled,
@@ -987,13 +987,16 @@ func New(c *Config, blockFilters []Filter) (d *DNSFilter, err error) {
 		return nil, fmt.Errorf("rewrites: preparing: %s", err)
 	}
 
-	if d.BlockedServices != nil {
-		err = d.BlockedServices.Validate()
+	bsvcs := []string{}
+	for _, s := range d.BlockedServices {
+		if !BlockedSvcKnown(s) {
+			log.Debug("skipping unknown blocked-service %q", s)
 
-		if err != nil {
-			return nil, fmt.Errorf("filtering: %w", err)
+			continue
 		}
+		bsvcs = append(bsvcs, s)
 	}
+	d.BlockedServices = bsvcs
 
 	if blockFilters != nil {
 		err = d.initFiltering(nil, blockFilters)

internal/filtering/http.go

@@ -169,7 +169,7 @@ func (d *DNSFilter) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Requ
 		deleted = (*filters)[delIdx]
 		p := deleted.Path(d.DataDir)
 		err = os.Rename(p, p+".old")
-		if err != nil && !errors.Is(err, os.ErrNotExist) {
+		if err != nil {
 			log.Error("deleting filter %d: renaming file %q: %s", deleted.ID, p, err)
 
 			return
@@ -416,12 +416,12 @@ type checkHostResp struct {
 func (d *DNSFilter) handleCheckHost(w http.ResponseWriter, r *http.Request) {
 	host := r.URL.Query().Get("name")
 
-	setts := d.Settings()
+	setts := d.GetConfig()
 	setts.FilteringEnabled = true
 	setts.ProtectionEnabled = true
 
-	d.ApplyBlockedServices(setts)
-	result, err := d.CheckHost(host, dns.TypeA, setts)
+	d.ApplyBlockedServices(&setts, nil)
+	result, err := d.CheckHost(host, dns.TypeA, &setts)
 	if err != nil {
 		aghhttp.Error(
 			r,

internal/filtering/rewrite/storage.go

@@ -84,7 +84,7 @@ func (s *DefaultStorage) MatchRequest(dReq *urlfilter.DNSRequest) (rws []*rules.
 		return nil
 	}
 
-	// TODO(a.garipov): Check cnames for cycles on initialization.
+	// TODO(a.garipov): Check cnames for cycles on initialisation.
 	cnames := stringutil.NewSet()
 	host := dReq.Hostname
 	for len(rrules) > 0 && rrules[0].DNSRewrite != nil && rrules[0].DNSRewrite.NewCNAME != "" {

internal/filtering/safesearch/safesearch.go

@@ -161,8 +161,12 @@ func (ss *Default) resetEngine(
 // type check
 var _ filtering.SafeSearch = (*Default)(nil)
 
-// CheckHost implements the [filtering.SafeSearch] interface for *Default.
-func (ss *Default) CheckHost(host string, qtype rules.RRType) (res filtering.Result, err error) {
+// CheckHost implements the [filtering.SafeSearch] interface for
+// *DefaultSafeSearch.
+func (ss *Default) CheckHost(
+	host string,
+	qtype rules.RRType,
+) (res filtering.Result, err error) {
 	start := time.Now()
 	defer func() {
 		ss.log(log.DEBUG, "lookup for %q finished in %s", host, time.Since(start))
@@ -192,10 +196,14 @@ func (ss *Default) CheckHost(host string, qtype rules.RRType) (res filtering.Res
 		return filtering.Result{}, err
 	}
 
-	res = *fltRes
-	ss.setCacheResult(host, qtype, res)
+	if fltRes != nil {
+		res = *fltRes
+		ss.setCacheResult(host, qtype, res)
 
-	return res, nil
+		return res, nil
+	}
+
+	return filtering.Result{}, fmt.Errorf("no ipv4 addresses for %q", host)
 }
 
 // searchHost looks up DNS rewrites in the internal DNS filtering engine.
@@ -221,11 +229,7 @@ func (ss *Default) searchHost(host string, qtype rules.RRType) (res *rules.DNSRe
 }
 
 // newResult creates Result object from rewrite rule.  qtype must be either
-// [dns.TypeA] or [dns.TypeAAAA].  If err is nil, res is never nil, so that the
-// empty result is converted into a NODATA response.
-//
-// TODO(a.garipov): Use the main rewrite result mechanism used in
-// [dnsforward.Server.filterDNSRequest].
+// [dns.TypeA] or [dns.TypeAAAA].
 func (ss *Default) newResult(
 	rewrite *rules.DNSRewrite,
 	qtype rules.RRType,
@@ -239,10 +243,9 @@ func (ss *Default) newResult(
 	}
 
 	if rewrite.RRType == qtype {
-		v := rewrite.Value
-		ip, ok := v.(net.IP)
+		ip, ok := rewrite.Value.(net.IP)
 		if !ok || ip == nil {
-			return nil, fmt.Errorf("expected ip rewrite value, got %T(%[1]v)", v)
+			return nil, nil
 		}
 
 		res.Rules[0].IP = ip
@@ -252,14 +255,14 @@ func (ss *Default) newResult(
 
 	host := rewrite.NewCNAME
 	if host == "" {
-		return res, nil
+		return nil, nil
 	}
 
 	ss.log(log.DEBUG, "resolving %q", host)
 
 	ips, err := ss.resolver.LookupIP(context.Background(), qtypeToProto(qtype), host)
 	if err != nil {
-		return nil, fmt.Errorf("resolving cname: %w", err)
+		return nil, err
 	}
 
 	ss.log(log.DEBUG, "resolved %s", ips)
@@ -273,9 +276,11 @@ func (ss *Default) newResult(
 		}
 
 		res.Rules[0].IP = ip
+
+		return res, nil
 	}
 
-	return res, nil
+	return nil, nil
 }
 
 // qtypeToProto returns "ip4" for [dns.TypeA] and "ip6" for [dns.TypeAAAA].

internal/filtering/safesearch/safesearch_test.go

@@ -1,7 +1,6 @@
 package safesearch_test
 
 import (
-	"context"
 	"net"
 	"testing"
 	"time"
@@ -72,25 +71,6 @@ func TestDefault_CheckHost_yandex(t *testing.T) {
 	}
 }
 
-func TestDefault_CheckHost_yandexAAAA(t *testing.T) {
-	conf := testConf
-	ss, err := safesearch.NewDefault(conf, "", testCacheSize, testCacheTTL)
-	require.NoError(t, err)
-
-	res, err := ss.CheckHost("www.yandex.ru", dns.TypeAAAA)
-	require.NoError(t, err)
-
-	assert.True(t, res.IsFiltered)
-
-	// TODO(a.garipov): Currently, the safe-search filter returns a single rule
-	// with a nil IP address.  This isn't really necessary and should be changed
-	// once the TODO in [safesearch.Default.newResult] is resolved.
-	require.Len(t, res.Rules, 1)
-
-	assert.Nil(t, res.Rules[0].IP)
-	assert.EqualValues(t, filtering.SafeSearchListID, res.Rules[0].FilterListID)
-}
-
 func TestDefault_CheckHost_google(t *testing.T) {
 	resolver := &aghtest.TestResolver{}
 	ip, _ := resolver.HostToIPs("forcesafesearch.google.com")
@@ -125,56 +105,6 @@ func TestDefault_CheckHost_google(t *testing.T) {
 	}
 }
 
-// testResolver is a [filtering.Resolver] for tests.
-//
-// TODO(a.garipov): Move to aghtest and use everywhere.
-type testResolver struct {
-	OnLookupIP func(ctx context.Context, network, host string) (ips []net.IP, err error)
-}
-
-// type check
-var _ filtering.Resolver = (*testResolver)(nil)
-
-// LookupIP implements the [filtering.Resolver] interface for *testResolver.
-func (r *testResolver) LookupIP(
-	ctx context.Context,
-	network string,
-	host string,
-) (ips []net.IP, err error) {
-	return r.OnLookupIP(ctx, network, host)
-}
-
-func TestDefault_CheckHost_duckduckgoAAAA(t *testing.T) {
-	conf := testConf
-	conf.CustomResolver = &testResolver{
-		OnLookupIP: func(_ context.Context, network, host string) (ips []net.IP, err error) {
-			assert.Equal(t, "ip6", network)
-			assert.Equal(t, "safe.duckduckgo.com", host)
-
-			return nil, nil
-		},
-	}
-
-	ss, err := safesearch.NewDefault(conf, "", 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("www.duckduckgo.com", dns.TypeAAAA)
-	require.NoError(t, err)
-
-	assert.True(t, res.IsFiltered)
-
-	// TODO(a.garipov): Currently, the safe-search filter returns a single rule
-	// with a nil IP address.  This isn't really necessary and should be changed
-	// once the TODO in [safesearch.Default.newResult] is resolved.
-	require.Len(t, res.Rules, 1)
-
-	assert.Nil(t, res.Rules[0].IP)
-	assert.EqualValues(t, filtering.SafeSearchListID, res.Rules[0].FilterListID)
-}
-
 func TestDefault_Update(t *testing.T) {
 	conf := testConf
 	ss, err := safesearch.NewDefault(conf, "", testCacheSize, testCacheTTL)

internal/filtering/servicelist.go

@@ -234,16 +234,6 @@ var blockedServices = []blockedService{{
 		"||z.cn^",
 		"||zappos^",
 	},
-}, {
-	ID:      "battle_net",
-	Name:    "Battle.net",
-	IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 50 50\"><path d=\"M43.11 22.15s3.95.2 3.95-2.12c0-3.03-5.26-5.77-5.26-5.77s.83-1.74 1.34-2.72a37.3 37.3 0 0 0 2.09-5.65c.16-1.1-.09-1.44-.09-1.44-.35 2.34-4.17 9.09-4.47 9.32-3.72-1.75-8.83-2.23-8.83-2.23S26.84 1 22.13 1c-4.67 0-4.65 9.02-4.65 9.02s-1.32-2.56-2.97-2.56c-2.42 0-3.22 3.67-3.22 7.64a37.8 37.8 0 0 0-9.16 1.17c-.36.1-1.49.92-.97.82 1.04-.34 5.95-1.1 10.25-.72.24 3.77 2.44 8.68 2.44 8.68S9.13 31.9 9.13 36.78c0 1.29.56 3.64 3.95 3.64 2.84 0 6.03-1.7 6.63-2.06a6.33 6.33 0 0 0-.91 2.83c0 .54.31 2.06 2.5 2.06 2.82 0 5.96-2.16 5.96-2.16s2.96 4.93 5.5 7.2c.69.6 1.34.71 1.34.71s-2.52-2.43-5.84-8.68c3.08-1.9 6.3-6.4 6.3-6.4l3.3.01c4.6 0 11.11-.96 11.11-4.61 0-3.77-5.86-7.17-5.86-7.17Zm.52-2.26c0 1.33-1.27 1.3-1.27 1.3l-.97.08s-1.82-.97-2.93-1.41c0 0 1.72-2.65 2.12-3.4.3.18 3.05 1.9 3.05 3.43ZM24.43 6.3c2.15 0 5.23 5.1 5.23 5.1s-4.8-.44-8.76 1.89c.1-3.67 1.34-7 3.52-7Zm-8.56 4.13c.69 0 1.36.83 1.64 1.54 0 .47.24 3.2.24 3.2l-3.96-.16c0-3.57 1.4-4.58 2.08-4.58Zm-.4 24.8c-2.17 0-2.62-1.2-2.62-2.29 0-2.45 1.96-5.9 1.96-5.9s2.2 4.63 6.04 6.59a10.02 10.02 0 0 1-5.39 1.6Zm7.02 4.85c-1.52 0-1.7-.98-1.7-1.21 0-.7.55-1.54.55-1.54s2.55-1.73 2.71-1.91l1.89 3.52s-1.93 1.14-3.45 1.14Zm4.74-1.92c-.93-1.62-1.6-3.3-1.6-3.3s3.78.24 5.82-1.86a11.2 11.2 0 0 1-5.65 1.07c4.93-4.34 7.8-7.48 10.23-10.74a9.46 9.46 0 0 0-1.6-1.15c-1.46 1.76-7.16 7.86-12.45 10.88-6.69-3.64-8.09-14.38-8.23-16.6l3.65.34s-1.37 2.44-1.37 4.23c0 1.79.21 1.89.21 1.89s-.04-3.13 1.89-5.54c1.46 7.82 3 11.83 4.19 14.22.6-.25 1.74-.76 1.74-.76s-3.38-9.73-3.19-16.31a13.8 13.8 0 0 1 6.36-1.66c6.73 0 12.14 2.9 12.14 2.9l-2.12 2.95s-1.89-3.42-4.55-4.03c1.4 1.05 2.98 2.44 3.8 4.43a68.4 68.4 0 0 0-14.47-3.59c-.19.8-.17 1.94-.17 1.94s9.03 1.66 15.6 5.43c-.05 8.21-9 14.53-10.23 15.26Zm8.55-6.14s2.8-3.68 2.76-8.55c0 0 4.52 2.8 4.52 5.54 0 3.05-7.28 3-7.28 3Z\"/></svg>"),
-	Rules: []string{
-		"||battle.net^",
-		"||battlenet.com.cn^",
-		"||bnet.163.com^",
-		"||bnet.cn^",
-	},
 }, {
 	ID:      "bilibili",
 	Name:    "Bilibili",
@@ -1400,17 +1390,11 @@ var blockedServices = []blockedService{{
 		"||line-apps.com^",
 		"||line-cdn.net^",
 		"||line-scdn.net^",
-		"||line.biz^",
 		"||line.me^",
 		"||line.naver.jp^",
 		"||linecorp.com^",
-		"||linefriends.com.tw^",
-		"||linefriends.com^",
-		"||linegame.jp^",
-		"||linemobile.com^",
 		"||linemyshop.com^",
 		"||lineshoppingseller.com^",
-		"||linetv.tw^",
 	},
 }, {
 	ID:      "mail_ru",
@@ -1470,6 +1454,7 @@ var blockedServices = []blockedService{{
 		"||mastodon.social^",
 		"||mastodon.uno^",
 		"||mastodon.world^",
+		"||mastodon.xyz^",
 		"||mastodonapp.uk^",
 		"||mastodonners.nl^",
 		"||mastodont.cat^",
@@ -1485,7 +1470,7 @@ var blockedServices = []blockedService{{
 		"||mstdn.plus^",
 		"||mstdn.social^",
 		"||muenchen.social^",
-		"||nerdculture.de^",
+		"||newsie.social^",
 		"||noc.social^",
 		"||norden.social^",
 		"||nrw.social^",
@@ -1523,7 +1508,6 @@ var blockedServices = []blockedService{{
 		"||union.place^",
 		"||universeodon.com^",
 		"||urbanists.social^",
-		"||wien.rocks^",
 		"||wxw.moe^",
 	},
 }, {
@@ -1720,14 +1704,6 @@ var blockedServices = []blockedService{{
 		"||robloxcdn.com^",
 		"||robloxdev.cn^",
 	},
-}, {
-	ID:      "rockstar_games",
-	Name:    "Rockstar games",
-	IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 50 50\"><path d=\"M12 3c-4.96 0-9 4.04-9 9v26c0 4.96 4.04 9 9 9h26c4.96 0 9-4.04 9-9V12c0-4.96-4.04-9-9-9H12zm0 2h26c3.88 0 7 3.12 7 7v26c0 3.88-3.12 7-7 7H12c-3.88 0-7-3.12-7-7V12c0-3.88 3.12-7 7-7zm3.72 5a1 1 0 0 0-.97.79l-3.87 18a1 1 0 0 0 .98 1.21h4.27a1 1 0 0 0 .97-.79L18.47 23h2.07c.94 0 1.12.15 1.36.73.24.57.3 1.76.1 3.4-.08.68-.05 1.22.02 1.6v.03a1 1 0 0 0 .3.97l3.37 3.12-2.6 5.74a1 1 0 0 0 1.43 1.26l5.58-3.39 4.29 3.33a1 1 0 0 0 1.6-.98l-1.09-5.56 4.7-3.47a1 1 0 0 0-.6-1.8h-4.86l-.82-5.14a1 1 0 0 0-.98-.84 1 1 0 0 0-.88.51l-2.77 5a14.3 14.3 0 0 1 .06-2.83c.15-1.48.01-2.64-.18-3.45-.06-.28-.08-.25-.15-.45.3-.17.4-.13.77-.5.8-.8 1.6-2.18 1.75-4.26.17-2.26-.55-3.98-1.92-4.9C27.65 10.17 25.91 10 24 10h-8.28zm.81 2H24c1.75 0 3.13.25 3.9.77.76.52 1.18 1.27 1.05 3.1-.13 1.67-.69 2.51-1.17 3a2 2 0 0 1-.82.56 1 1 0 0 0-.6 1.44s.12.21.27.82c.14.6.26 1.53.13 2.79a14.24 14.24 0 0 0-.01 3.52h-2.76c-.01-.19-.04-.32 0-.62.22-1.78.25-3.21-.24-4.42A3.38 3.38 0 0 0 20.54 21h-2.87a1 1 0 0 0-.98.78L15.32 28H13.1l3.44-16zm2.76 1.03a1 1 0 0 0-.98.8l-.98 4.94a1 1 0 0 0 .98 1.2h4.47c.79 0 1.65-.12 2.44-.58a3.6 3.6 0 0 0 1.68-2.41 3.3 3.3 0 0 0-.72-2.92 3.35 3.35 0 0 0-2.47-1.03h-4.42zm.82 2h3.6c.41 0 .79.16 1 .4.22.22.36.52.23 1.15-.13.62-.36.88-.72 1.08a3 3 0 0 1-1.44.3h-3.25l.58-2.93zm11.7 10.99.49 3.11a1 1 0 0 0 .98.84h2.69l-2.76 2.05a1 1 0 0 0-.4 1l.7 3.56-2.73-2.12a1 1 0 0 0-1.13-.07l-3.4 2.07 1.56-3.44a1 1 0 0 0-.23-1.15L25.55 30H29a1 1 0 0 0 .88-.51l1.92-3.47z\"/></svg>"),
-	Rules: []string{
-		"||rockstargames.com^",
-		"||rsg.sc^",
-	},
 }, {
 	ID:      "shopee",
 	Name:    "Shopee",

internal/home/client.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering/safesearch"
-	"github.com/AdguardTeam/AdGuardHome/internal/whois"
 	"github.com/AdguardTeam/dnsproxy/proxy"
 	"github.com/AdguardTeam/golibs/stringutil"
 )
@@ -23,14 +22,12 @@ type Client struct {
 	safeSearchConf filtering.SafeSearchConfig
 	SafeSearch     filtering.SafeSearch
 
-	// BlockedServices is the configuration of blocked services of a client.
-	BlockedServices *filtering.BlockedServices
-
 	Name string
 
-	IDs       []string
-	Tags      []string
-	Upstreams []string
+	IDs             []string
+	Tags            []string
+	BlockedServices []string
+	Upstreams       []string
 
 	UseOwnSettings        bool
 	FilteringEnabled      bool
@@ -46,9 +43,9 @@ type Client struct {
 func (c *Client) ShallowClone() (sh *Client) {
 	clone := *c
 
-	clone.BlockedServices = c.BlockedServices.Clone()
 	clone.IDs = stringutil.CloneSlice(c.IDs)
 	clone.Tags = stringutil.CloneSlice(c.Tags)
+	clone.BlockedServices = stringutil.CloneSlice(c.BlockedServices)
 	clone.Upstreams = stringutil.CloneSlice(c.Upstreams)
 
 	return &clone
@@ -130,13 +127,14 @@ func (cs clientSource) MarshalText() (text []byte, err error) {
 // RuntimeClient is a client information about which has been obtained using the
 // source described in the Source field.
 type RuntimeClient struct {
-	// WHOIS is the filtered WHOIS data of a client.
-	WHOIS *whois.Info
-
-	// Host is the host name of a client.
-	Host string
-
-	// Source is the source from which the information about the client has
-	// been obtained.
-	Source clientSource
+	WHOISInfo *RuntimeClientWHOISInfo
+	Host      string
+	Source    clientSource
+}
+
+// RuntimeClientWHOISInfo is the filtered WHOIS data for a runtime client.
+type RuntimeClientWHOISInfo struct {
+	City    string `json:"city,omitempty"`
+	Country string `json:"country,omitempty"`
+	Orgname string `json:"orgname,omitempty"`
 }

internal/home/clients.go

@@ -11,11 +11,9 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
 	"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
-	"github.com/AdguardTeam/AdGuardHome/internal/dhcpsvc"
 	"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/querylog"
-	"github.com/AdguardTeam/AdGuardHome/internal/whois"
 	"github.com/AdguardTeam/dnsproxy/proxy"
 	"github.com/AdguardTeam/dnsproxy/upstream"
 	"github.com/AdguardTeam/golibs/errors"
@@ -25,23 +23,6 @@ import (
 	"golang.org/x/exp/slices"
 )
 
-// DHCP is an interface for accessing DHCP lease data the [clientsContainer]
-// needs.
-type DHCP interface {
-	// Leases returns all the DHCP leases.
-	Leases() (leases []*dhcpsvc.Lease)
-
-	// HostByIP returns the hostname of the DHCP client with the given IP
-	// address.  The address will be netip.Addr{} if there is no such client,
-	// due to an assumption that a DHCP client must always have an IP address.
-	HostByIP(ip netip.Addr) (host string)
-
-	// MACByIP returns the MAC address for the given IP address leased.  It
-	// returns nil if there is no such client, due to an assumption that a DHCP
-	// client must always have a MAC address.
-	MACByIP(ip netip.Addr) (mac net.HardwareAddr)
-}
-
 // clientsContainer is the storage of all runtime and persistent clients.
 type clientsContainer struct {
 	// TODO(a.garipov): Perhaps use a number of separate indices for different
@@ -96,7 +77,7 @@ func (clients *clientsContainer) Init(
 	etcHosts *aghnet.HostsContainer,
 	arpdb aghnet.ARPDB,
 	filteringConf *filtering.Config,
-) (err error) {
+) {
 	if clients.list != nil {
 		log.Fatal("clients.list != nil")
 	}
@@ -110,29 +91,23 @@ func (clients *clientsContainer) Init(
 	clients.dhcpServer = dhcpServer
 	clients.etcHosts = etcHosts
 	clients.arpdb = arpdb
-	err = clients.addFromConfig(objects, filteringConf)
-	if err != nil {
-		// Don't wrap the error, because it's informative enough as is.
-		return err
-	}
+	clients.addFromConfig(objects, filteringConf)
 
 	clients.safeSearchCacheSize = filteringConf.SafeSearchCacheSize
 	clients.safeSearchCacheTTL = time.Minute * time.Duration(filteringConf.CacheTime)
 
 	if clients.testing {
-		return nil
+		return
 	}
 
+	clients.updateFromDHCP(true)
 	if clients.dhcpServer != nil {
 		clients.dhcpServer.SetOnLeaseChanged(clients.onDHCPLeaseChanged)
-		clients.onDHCPLeaseChanged(dhcpd.LeaseChangedAdded)
 	}
 
 	if clients.etcHosts != nil {
 		go clients.handleHostsUpdates()
 	}
-
-	return nil
 }
 
 func (clients *clientsContainer) handleHostsUpdates() {
@@ -172,14 +147,12 @@ func (clients *clientsContainer) reloadARP() {
 type clientObject struct {
 	SafeSearchConf filtering.SafeSearchConfig `yaml:"safe_search"`
 
-	// BlockedServices is the configuration of blocked services of a client.
-	BlockedServices *filtering.BlockedServices `yaml:"blocked_services"`
-
 	Name string `yaml:"name"`
 
-	IDs       []string `yaml:"ids"`
-	Tags      []string `yaml:"tags"`
-	Upstreams []string `yaml:"upstreams"`
+	Tags            []string `yaml:"tags"`
+	IDs             []string `yaml:"ids"`
+	BlockedServices []string `yaml:"blocked_services"`
+	Upstreams       []string `yaml:"upstreams"`
 
 	UseGlobalSettings        bool `yaml:"use_global_settings"`
 	FilteringEnabled         bool `yaml:"filtering_enabled"`
@@ -193,10 +166,7 @@ type clientObject struct {
 
 // addFromConfig initializes the clients container with objects from the
 // configuration file.
-func (clients *clientsContainer) addFromConfig(
-	objects []*clientObject,
-	filteringConf *filtering.Config,
-) (err error) {
+func (clients *clientsContainer) addFromConfig(objects []*clientObject, filteringConf *filtering.Config) {
 	for _, o := range objects {
 		cli := &Client{
 			Name: o.Name,
@@ -217,7 +187,7 @@ func (clients *clientsContainer) addFromConfig(
 		if o.SafeSearchConf.Enabled {
 			o.SafeSearchConf.CustomResolver = safeSearchResolver{}
 
-			err = cli.setSafeSearch(
+			err := cli.setSafeSearch(
 				o.SafeSearchConf,
 				filteringConf.SafeSearchCacheSize,
 				time.Minute*time.Duration(filteringConf.CacheTime),
@@ -229,13 +199,14 @@ func (clients *clientsContainer) addFromConfig(
 			}
 		}
 
-		err = o.BlockedServices.Validate()
-		if err != nil {
-			return fmt.Errorf("clients: init client blocked services %q: %w", cli.Name, err)
+		for _, s := range o.BlockedServices {
+			if filtering.BlockedSvcKnown(s) {
+				cli.BlockedServices = append(cli.BlockedServices, s)
+			} else {
+				log.Info("clients: skipping unknown blocked service %q", s)
+			}
 		}
 
-		cli.BlockedServices = o.BlockedServices.Clone()
-
 		for _, t := range o.Tags {
 			if clients.allTags.Has(t) {
 				cli.Tags = append(cli.Tags, t)
@@ -246,13 +217,11 @@ func (clients *clientsContainer) addFromConfig(
 
 		slices.Sort(cli.Tags)
 
-		_, err = clients.Add(cli)
+		_, err := clients.Add(cli)
 		if err != nil {
 			log.Error("clients: adding clients %s: %s", cli.Name, err)
 		}
 	}
-
-	return nil
 }
 
 // forConfig returns all currently known persistent clients as objects for the
@@ -266,11 +235,10 @@ func (clients *clientsContainer) forConfig() (objs []*clientObject) {
 		o := &clientObject{
 			Name: cli.Name,
 
-			BlockedServices: cli.BlockedServices.Clone(),
-
-			IDs:       stringutil.CloneSlice(cli.IDs),
-			Tags:      stringutil.CloneSlice(cli.Tags),
-			Upstreams: stringutil.CloneSlice(cli.Upstreams),
+			Tags:            stringutil.CloneSlice(cli.Tags),
+			IDs:             stringutil.CloneSlice(cli.IDs),
+			BlockedServices: stringutil.CloneSlice(cli.BlockedServices),
+			Upstreams:       stringutil.CloneSlice(cli.Upstreams),
 
 			UseGlobalSettings:        !cli.UseOwnSettings,
 			FilteringEnabled:         cli.FilteringEnabled,
@@ -308,38 +276,15 @@ func (clients *clientsContainer) periodicUpdate() {
 	}
 }
 
-// onDHCPLeaseChanged is a callback for the DHCP server.  It updates the list of
-// runtime clients using the DHCP server's leases.
-//
-// TODO(e.burkov):  Remove when switched to dhcpsvc.
 func (clients *clientsContainer) onDHCPLeaseChanged(flags int) {
-	if clients.dhcpServer == nil || !config.Clients.Sources.DHCP {
-		return
+	switch flags {
+	case dhcpd.LeaseChangedAdded,
+		dhcpd.LeaseChangedAddedStatic,
+		dhcpd.LeaseChangedRemovedStatic:
+		clients.updateFromDHCP(true)
+	case dhcpd.LeaseChangedRemovedAll:
+		clients.updateFromDHCP(false)
 	}
-
-	clients.lock.Lock()
-	defer clients.lock.Unlock()
-
-	clients.rmHostsBySrc(ClientSourceDHCP)
-
-	if flags == dhcpd.LeaseChangedRemovedAll {
-		return
-	}
-
-	leases := clients.dhcpServer.Leases(dhcpd.LeasesAll)
-	n := 0
-	for _, l := range leases {
-		if l.Hostname == "" {
-			continue
-		}
-
-		ok := clients.addHostLocked(l.IP, l.Hostname, ClientSourceDHCP)
-		if ok {
-			n++
-		}
-	}
-
-	log.Debug("clients: added %d client aliases from dhcp", n)
 }
 
 // clientSource checks if client with this IP address already exists and returns
@@ -355,11 +300,23 @@ func (clients *clientsContainer) clientSource(ip netip.Addr) (src clientSource)
 	}
 
 	rc, ok := clients.ipToRC[ip]
-	if ok {
-		return rc.Source
+	if !ok {
+		return ClientSourceNone
 	}
 
-	return ClientSourceNone
+	return rc.Source
+}
+
+func toQueryLogWHOIS(wi *RuntimeClientWHOISInfo) (cw *querylog.ClientWHOIS) {
+	if wi == nil {
+		return &querylog.ClientWHOIS{}
+	}
+
+	return &querylog.ClientWHOIS{
+		City:    wi.City,
+		Country: wi.Country,
+		Orgname: wi.Orgname,
+	}
 }
 
 // findMultiple is a wrapper around Find to make it a valid client finder for
@@ -395,7 +352,7 @@ func (clients *clientsContainer) clientOrArtificial(
 	defer func() {
 		c.Disallowed, c.DisallowedRule = clients.dnsServer.IsBlockedClient(ip, id)
 		if c.WHOIS == nil {
-			c.WHOIS = &whois.Info{}
+			c.WHOIS = &querylog.ClientWHOIS{}
 		}
 	}()
 
@@ -412,7 +369,7 @@ func (clients *clientsContainer) clientOrArtificial(
 	if ok {
 		return &querylog.Client{
 			Name:  rc.Host,
-			WHOIS: rc.WHOIS,
+			WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
 		}, false
 	}
 
@@ -520,11 +477,11 @@ func (clients *clientsContainer) findLocked(id string) (c *Client, ok bool) {
 		}
 	}
 
-	if clients.dhcpServer != nil {
-		return clients.findDHCP(ip)
+	if clients.dhcpServer == nil {
+		return nil, false
 	}
 
-	return nil, false
+	return clients.findDHCP(ip)
 }
 
 // findDHCP searches for a client by its MAC, if the DHCP server is active and
@@ -744,34 +701,35 @@ func (clients *clientsContainer) Update(prev, c *Client) (err error) {
 }
 
 // setWHOISInfo sets the WHOIS information for a client.
-func (clients *clientsContainer) setWHOISInfo(ip netip.Addr, wi *whois.Info) {
+func (clients *clientsContainer) setWHOISInfo(ip netip.Addr, wi *RuntimeClientWHOISInfo) {
 	clients.lock.Lock()
 	defer clients.lock.Unlock()
 
 	_, ok := clients.findLocked(ip.String())
 	if ok {
 		log.Debug("clients: client for %s is already created, ignore whois info", ip)
+		return
+	}
+
+	rc, ok := clients.ipToRC[ip]
+	if ok {
+		rc.WHOISInfo = wi
+		log.Debug("clients: set whois info for runtime client %s: %+v", rc.Host, wi)
 
 		return
 	}
 
-	// TODO(e.burkov):  Consider storing WHOIS information separately and
-	// potentially get rid of [RuntimeClient].
-	rc, ok := clients.ipToRC[ip]
-	if !ok {
-		// Create a RuntimeClient implicitly so that we don't do this check
-		// again.
-		rc = &RuntimeClient{
-			Source: ClientSourceWHOIS,
-		}
-		clients.ipToRC[ip] = rc
-
-		log.Debug("clients: set whois info for runtime client with ip %s: %+v", ip, wi)
-	} else {
-		log.Debug("clients: set whois info for runtime client %s: %+v", rc.Host, wi)
+	// Create a RuntimeClient implicitly so that we don't do this check
+	// again.
+	rc = &RuntimeClient{
+		Source: ClientSourceWHOIS,
 	}
 
-	rc.WHOIS = wi
+	rc.WHOISInfo = wi
+
+	clients.ipToRC[ip] = rc
+
+	log.Debug("clients: set whois info for runtime client with ip %s: %+v", ip, wi)
 }
 
 // AddHost adds a new IP-hostname pairing.  The priorities of the sources are
@@ -795,19 +753,23 @@ func (clients *clientsContainer) addHostLocked(
 	src clientSource,
 ) (ok bool) {
 	rc, ok := clients.ipToRC[ip]
-	if !ok {
+	if ok {
+		if rc.Source > src {
+			return false
+		}
+
+		rc.Host = host
+		rc.Source = src
+	} else {
 		rc = &RuntimeClient{
-			WHOIS: &whois.Info{},
+			Host:      host,
+			Source:    src,
+			WHOISInfo: &RuntimeClientWHOISInfo{},
 		}
 
 		clients.ipToRC[ip] = rc
-	} else if src < rc.Source {
-		return false
 	}
 
-	rc.Host = host
-	rc.Source = src
-
 	log.Debug("clients: added %s -> %q [%d]", ip, host, len(clients.ipToRC))
 
 	return true
@@ -876,6 +838,38 @@ func (clients *clientsContainer) addFromSystemARP() {
 	log.Debug("clients: added %d client aliases from arp neighborhood", added)
 }
 
+// updateFromDHCP adds the clients that have a non-empty hostname from the DHCP
+// server.
+func (clients *clientsContainer) updateFromDHCP(add bool) {
+	if clients.dhcpServer == nil || !config.Clients.Sources.DHCP {
+		return
+	}
+
+	clients.lock.Lock()
+	defer clients.lock.Unlock()
+
+	clients.rmHostsBySrc(ClientSourceDHCP)
+
+	if !add {
+		return
+	}
+
+	leases := clients.dhcpServer.Leases(dhcpd.LeasesAll)
+	n := 0
+	for _, l := range leases {
+		if l.Hostname == "" {
+			continue
+		}
+
+		ok := clients.addHostLocked(l.IP, l.Hostname, ClientSourceDHCP)
+		if ok {
+			n++
+		}
+	}
+
+	log.Debug("clients: added %d client aliases from dhcp", n)
+}
+
 // close gracefully closes all the client-specific upstream configurations of
 // the persistent clients.
 func (clients *clientsContainer) close() (err error) {

internal/home/clients_test.go

@@ -9,26 +9,25 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
-	"github.com/AdguardTeam/AdGuardHome/internal/whois"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 // newClientsContainer is a helper that creates a new clients container for
 // tests.
-func newClientsContainer(t *testing.T) (c *clientsContainer) {
+func newClientsContainer() (c *clientsContainer) {
 	c = &clientsContainer{
 		testing: true,
 	}
 
-	err := c.Init(nil, nil, nil, nil, &filtering.Config{})
-	require.NoError(t, err)
+	c.Init(nil, nil, nil, nil, &filtering.Config{})
 
 	return c
 }
 
 func TestClients(t *testing.T) {
-	clients := newClientsContainer(t)
+	clients := newClientsContainer()
 
 	t.Run("add_success", func(t *testing.T) {
 		var (
@@ -199,8 +198,8 @@ func TestClients(t *testing.T) {
 }
 
 func TestClientsWHOIS(t *testing.T) {
-	clients := newClientsContainer(t)
-	whois := &whois.Info{
+	clients := newClientsContainer()
+	whois := &RuntimeClientWHOISInfo{
 		Country: "AU",
 		Orgname: "Example Org",
 	}
@@ -211,7 +210,7 @@ func TestClientsWHOIS(t *testing.T) {
 		rc := clients.ipToRC[ip]
 		require.NotNil(t, rc)
 
-		assert.Equal(t, rc.WHOIS, whois)
+		assert.Equal(t, rc.WHOISInfo, whois)
 	})
 
 	t.Run("existing_auto-client", func(t *testing.T) {
@@ -223,7 +222,7 @@ func TestClientsWHOIS(t *testing.T) {
 		rc := clients.ipToRC[ip]
 		require.NotNil(t, rc)
 
-		assert.Equal(t, rc.WHOIS, whois)
+		assert.Equal(t, rc.WHOISInfo, whois)
 	})
 
 	t.Run("can't_set_manually-added", func(t *testing.T) {
@@ -245,7 +244,7 @@ func TestClientsWHOIS(t *testing.T) {
 }
 
 func TestClientsAddExisting(t *testing.T) {
-	clients := newClientsContainer(t)
+	clients := newClientsContainer()
 
 	t.Run("simple", func(t *testing.T) {
 		ip := netip.MustParseAddr("1.1.1.1")
@@ -317,7 +316,7 @@ func TestClientsAddExisting(t *testing.T) {
 }
 
 func TestClientsCustomUpstream(t *testing.T) {
-	clients := newClientsContainer(t)
+	clients := newClientsContainer()
 
 	// Add client with upstreams.
 	ok, err := clients.Add(&Client{

internal/home/clientshttp.go

@@ -9,7 +9,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
-	"github.com/AdguardTeam/AdGuardHome/internal/whois"
 )
 
 // clientJSON is a common structure used by several handlers to deal with
@@ -29,8 +28,7 @@ type clientJSON struct {
 	// the allowlist.
 	DisallowedRule *string `json:"disallowed_rule,omitempty"`
 
-	// WHOIS is the filtered WHOIS data of a client.
-	WHOIS          *whois.Info                 `json:"whois_info,omitempty"`
+	WHOISInfo      *RuntimeClientWHOISInfo     `json:"whois_info,omitempty"`
 	SafeSearchConf *filtering.SafeSearchConfig `json:"safe_search"`
 
 	Name string `json:"name"`
@@ -53,7 +51,7 @@ type clientJSON struct {
 }
 
 type runtimeClientJSON struct {
-	WHOIS *whois.Info `json:"whois_info"`
+	WHOISInfo *RuntimeClientWHOISInfo `json:"whois_info"`
 
 	IP     netip.Addr   `json:"ip"`
 	Name   string       `json:"name"`
@@ -80,7 +78,7 @@ func (clients *clientsContainer) handleGetClients(w http.ResponseWriter, r *http
 
 	for ip, rc := range clients.ipToRC {
 		cj := runtimeClientJSON{
-			WHOIS: rc.WHOIS,
+			WHOISInfo: rc.WHOISInfo,
 
 			Name:   rc.Host,
 			Source: rc.Source,
@@ -123,14 +121,10 @@ func (clients *clientsContainer) jsonToClient(cj clientJSON, prev *Client) (c *C
 
 		Name: cj.Name,
 
-		BlockedServices: &filtering.BlockedServices{
-			Schedule: prev.BlockedServices.Schedule.Clone(),
-			IDs:      cj.BlockedServices,
-		},
-
-		IDs:       cj.IDs,
-		Tags:      cj.Tags,
-		Upstreams: cj.Upstreams,
+		IDs:             cj.IDs,
+		Tags:            cj.Tags,
+		BlockedServices: cj.BlockedServices,
+		Upstreams:       cj.Upstreams,
 
 		UseOwnSettings:        !cj.UseGlobalSettings,
 		FilteringEnabled:      cj.FilteringEnabled,
@@ -184,8 +178,7 @@ func clientToJSON(c *Client) (cj *clientJSON) {
 		SafeBrowsingEnabled: c.SafeBrowsingEnabled,
 
 		UseGlobalBlockedServices: !c.UseOwnBlockedServices,
-
-		BlockedServices: c.BlockedServices.IDs,
+		BlockedServices:          c.BlockedServices,
 
 		Upstreams: c.Upstreams,
 
@@ -351,16 +344,16 @@ func (clients *clientsContainer) findRuntime(ip netip.Addr, idStr string) (cj *c
 			IDs:            []string{idStr},
 			Disallowed:     &disallowed,
 			DisallowedRule: &rule,
-			WHOIS:          &whois.Info{},
+			WHOISInfo:      &RuntimeClientWHOISInfo{},
 		}
 
 		return cj
 	}
 
 	cj = &clientJSON{
-		Name:  rc.Host,
-		IDs:   []string{idStr},
-		WHOIS: rc.WHOIS,
+		Name:      rc.Host,
+		IDs:       []string{idStr},
+		WHOISInfo: rc.WHOISInfo,
 	}
 
 	disallowed, rule := clients.dnsServer.IsBlockedClient(ip, idStr)

internal/home/config.go

@@ -14,7 +14,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/querylog"
-	"github.com/AdguardTeam/AdGuardHome/internal/schedule"
 	"github.com/AdguardTeam/AdGuardHome/internal/stats"
 	"github.com/AdguardTeam/dnsproxy/fastip"
 	"github.com/AdguardTeam/golibs/errors"
@@ -317,11 +316,6 @@ var config = &configuration{
 				Yandex:     true,
 				YouTube:    true,
 			},
-
-			BlockedServices: &filtering.BlockedServices{
-				Schedule: schedule.EmptyWeekly(),
-				IDs:      []string{},
-			},
 		},
 		UpstreamTimeout: timeutil.Duration{Duration: dnsforward.DefaultTimeout},
 		UsePrivateRDNS:  true,

internal/home/dns.go

@@ -8,7 +8,6 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
-	"time"
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
@@ -18,7 +17,6 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
 	"github.com/AdguardTeam/AdGuardHome/internal/querylog"
 	"github.com/AdguardTeam/AdGuardHome/internal/stats"
-	"github.com/AdguardTeam/AdGuardHome/internal/whois"
 	"github.com/AdguardTeam/dnsproxy/proxy"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
@@ -27,7 +25,7 @@ import (
 	yaml "gopkg.in/yaml.v3"
 )
 
-// Default listening ports.
+// Default ports.
 const (
 	defaultPortDNS   = 53
 	defaultPortHTTP  = 80
@@ -171,70 +169,11 @@ func initDNSServer(
 		Context.rdns = NewRDNS(Context.dnsServer, &Context.clients, config.DNS.UsePrivateRDNS)
 	}
 
-	initWHOIS()
-
-	return nil
-}
-
-// initWHOIS initializes the WHOIS.
-//
-// TODO(s.chzhen):  Consider making configurable.
-func initWHOIS() {
-	const (
-		// defaultQueueSize is the size of queue of IPs for WHOIS processing.
-		defaultQueueSize = 255
-
-		// defaultTimeout is the timeout for WHOIS requests.
-		defaultTimeout = 5 * time.Second
-
-		// defaultCacheSize is the maximum size of the cache.  If it's zero,
-		// cache size is unlimited.
-		defaultCacheSize = 10_000
-
-		// defaultMaxConnReadSize is an upper limit in bytes for reading from
-		// net.Conn.
-		defaultMaxConnReadSize = 64 * 1024
-
-		// defaultMaxRedirects is the maximum redirects count.
-		defaultMaxRedirects = 5
-
-		// defaultMaxInfoLen is the maximum length of whois.Info fields.
-		defaultMaxInfoLen = 250
-
-		// defaultIPTTL is the Time to Live duration for cached IP addresses.
-		defaultIPTTL = 1 * time.Hour
-	)
-
-	Context.whoisCh = make(chan netip.Addr, defaultQueueSize)
-
-	var w whois.Interface
-
 	if config.Clients.Sources.WHOIS {
-		w = whois.New(&whois.Config{
-			DialContext:     customDialContext,
-			ServerAddr:      whois.DefaultServer,
-			Port:            whois.DefaultPort,
-			Timeout:         defaultTimeout,
-			CacheSize:       defaultCacheSize,
-			MaxConnReadSize: defaultMaxConnReadSize,
-			MaxRedirects:    defaultMaxRedirects,
-			MaxInfoLen:      defaultMaxInfoLen,
-			CacheTTL:        defaultIPTTL,
-		})
-	} else {
-		w = whois.Empty{}
+		Context.whois = initWHOIS(&Context.clients)
 	}
 
-	go func() {
-		defer log.OnPanic("whois")
-
-		for ip := range Context.whoisCh {
-			info, changed := w.Process(context.Background(), ip)
-			if info != nil && changed {
-				Context.clients.setWHOISInfo(ip, info)
-			}
-		}
-	}()
+	return nil
 }
 
 // parseSubnetSet parses a slice of subnets.  If the slice is empty, it returns
@@ -279,7 +218,9 @@ func onDNSRequest(pctx *proxy.DNSContext) {
 		Context.rdns.Begin(ip)
 	}
 
-	Context.whoisCh <- ip
+	if srcs.WHOIS && !netutil.IsSpecialPurposeAddr(ip) {
+		Context.whois.Begin(ip)
+	}
 }
 
 func ipsToTCPAddrs(ips []netip.Addr, port int) (tcpAddrs []*net.TCPAddr) {
@@ -449,7 +390,7 @@ func applyAdditionalFiltering(clientIP net.IP, clientID string, setts *filtering
 	// pref is a prefix for logging messages around the scope.
 	const pref = "applying filters"
 
-	Context.filters.ApplyBlockedServices(setts)
+	Context.filters.ApplyBlockedServices(setts, nil)
 
 	log.Debug("%s: looking for client with ip %s and clientid %q", pref, clientIP, clientID)
 
@@ -473,12 +414,12 @@ func applyAdditionalFiltering(clientIP net.IP, clientID string, setts *filtering
 
 	if c.UseOwnBlockedServices {
 		// TODO(e.burkov):  Get rid of this crutch.
-		setts.ServicesRules = nil
-		svcs := c.BlockedServices.IDs
-		if !c.BlockedServices.Schedule.Contains(time.Now()) {
-			Context.filters.ApplyBlockedServicesList(setts, svcs)
-			log.Debug("%s: services for client %q set: %s", pref, c.Name, svcs)
+		svcs := c.BlockedServices
+		if svcs == nil {
+			svcs = []string{}
 		}
+		Context.filters.ApplyBlockedServices(setts, svcs)
+		log.Debug("%s: services for client %q set: %s", pref, c.Name, svcs)
 	}
 
 	setts.ClientName = c.Name
@@ -522,7 +463,9 @@ func startDNSServer() error {
 			Context.rdns.Begin(ip)
 		}
 
-		Context.whoisCh <- ip
+		if srcs.WHOIS && !netutil.IsSpecialPurposeAddr(ip) {
+			Context.whois.Begin(ip)
+		}
 	}
 
 	return nil

internal/home/dns_internal_test.go

@@ -1,176 +0,0 @@
-package home
-
-import (
-	"net"
-	"testing"
-
-	"github.com/AdguardTeam/AdGuardHome/internal/filtering"
-	"github.com/AdguardTeam/AdGuardHome/internal/schedule"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestApplyAdditionalFiltering(t *testing.T) {
-	var err error
-
-	Context.filters, err = filtering.New(&filtering.Config{
-		BlockedServices: &filtering.BlockedServices{
-			Schedule: schedule.EmptyWeekly(),
-		},
-	}, nil)
-	require.NoError(t, err)
-
-	Context.clients.idIndex = map[string]*Client{
-		"default": {
-			UseOwnSettings:      false,
-			safeSearchConf:      filtering.SafeSearchConfig{Enabled: false},
-			FilteringEnabled:    false,
-			SafeBrowsingEnabled: false,
-			ParentalEnabled:     false,
-		},
-		"custom_filtering": {
-			UseOwnSettings:      true,
-			safeSearchConf:      filtering.SafeSearchConfig{Enabled: true},
-			FilteringEnabled:    true,
-			SafeBrowsingEnabled: true,
-			ParentalEnabled:     true,
-		},
-		"partial_custom_filtering": {
-			UseOwnSettings:      true,
-			safeSearchConf:      filtering.SafeSearchConfig{Enabled: true},
-			FilteringEnabled:    true,
-			SafeBrowsingEnabled: false,
-			ParentalEnabled:     false,
-		},
-	}
-
-	testCases := []struct {
-		name                string
-		id                  string
-		FilteringEnabled    assert.BoolAssertionFunc
-		SafeSearchEnabled   assert.BoolAssertionFunc
-		SafeBrowsingEnabled assert.BoolAssertionFunc
-		ParentalEnabled     assert.BoolAssertionFunc
-	}{{
-		name:                "global_settings",
-		id:                  "default",
-		FilteringEnabled:    assert.False,
-		SafeSearchEnabled:   assert.False,
-		SafeBrowsingEnabled: assert.False,
-		ParentalEnabled:     assert.False,
-	}, {
-		name:                "custom_settings",
-		id:                  "custom_filtering",
-		FilteringEnabled:    assert.True,
-		SafeSearchEnabled:   assert.True,
-		SafeBrowsingEnabled: assert.True,
-		ParentalEnabled:     assert.True,
-	}, {
-		name:                "partial",
-		id:                  "partial_custom_filtering",
-		FilteringEnabled:    assert.True,
-		SafeSearchEnabled:   assert.True,
-		SafeBrowsingEnabled: assert.False,
-		ParentalEnabled:     assert.False,
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			setts := &filtering.Settings{}
-
-			applyAdditionalFiltering(net.IP{1, 2, 3, 4}, tc.id, setts)
-			tc.FilteringEnabled(t, setts.FilteringEnabled)
-			tc.SafeSearchEnabled(t, setts.SafeSearchEnabled)
-			tc.SafeBrowsingEnabled(t, setts.SafeBrowsingEnabled)
-			tc.ParentalEnabled(t, setts.ParentalEnabled)
-		})
-	}
-}
-
-func TestApplyAdditionalFiltering_blockedServices(t *testing.T) {
-	filtering.InitModule()
-
-	var (
-		globalBlockedServices  = []string{"ok"}
-		clientBlockedServices  = []string{"ok", "mail_ru", "vk"}
-		invalidBlockedServices = []string{"invalid"}
-
-		err error
-	)
-
-	Context.filters, err = filtering.New(&filtering.Config{
-		BlockedServices: &filtering.BlockedServices{
-			Schedule: schedule.EmptyWeekly(),
-			IDs:      globalBlockedServices,
-		},
-	}, nil)
-	require.NoError(t, err)
-
-	Context.clients.idIndex = map[string]*Client{
-		"default": {
-			UseOwnBlockedServices: false,
-		},
-		"no_services": {
-			BlockedServices: &filtering.BlockedServices{
-				Schedule: schedule.EmptyWeekly(),
-			},
-			UseOwnBlockedServices: true,
-		},
-		"services": {
-			BlockedServices: &filtering.BlockedServices{
-				Schedule: schedule.EmptyWeekly(),
-				IDs:      clientBlockedServices,
-			},
-			UseOwnBlockedServices: true,
-		},
-		"invalid_services": {
-			BlockedServices: &filtering.BlockedServices{
-				Schedule: schedule.EmptyWeekly(),
-				IDs:      invalidBlockedServices,
-			},
-			UseOwnBlockedServices: true,
-		},
-		"allow_all": {
-			BlockedServices: &filtering.BlockedServices{
-				Schedule: schedule.FullWeekly(),
-				IDs:      clientBlockedServices,
-			},
-			UseOwnBlockedServices: true,
-		},
-	}
-
-	testCases := []struct {
-		name    string
-		id      string
-		wantLen int
-	}{{
-		name:    "global_settings",
-		id:      "default",
-		wantLen: len(globalBlockedServices),
-	}, {
-		name:    "custom_settings",
-		id:      "no_services",
-		wantLen: 0,
-	}, {
-		name:    "custom_settings_block",
-		id:      "services",
-		wantLen: len(clientBlockedServices),
-	}, {
-		name:    "custom_settings_invalid",
-		id:      "invalid_services",
-		wantLen: 0,
-	}, {
-		name:    "custom_settings_inactive_schedule",
-		id:      "allow_all",
-		wantLen: 0,
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			setts := &filtering.Settings{}
-
-			applyAdditionalFiltering(net.IP{1, 2, 3, 4}, tc.id, setts)
-			require.Len(t, setts.ServicesRules, tc.wantLen)
-		})
-	}
-}

internal/home/home.go

@@ -57,6 +57,7 @@ type homeContext struct {
 	queryLog   querylog.QueryLog    // query log module
 	dnsServer  *dnsforward.Server   // DNS module
 	rdns       *RDNS                // rDNS module
+	whois      *WHOIS               // WHOIS module
 	dhcpServer dhcpd.Interface      // DHCP module
 	auth       *Auth                // HTTP authentication module
 	filters    *filtering.DNSFilter // DNS filtering module
@@ -83,9 +84,6 @@ type homeContext struct {
 	client           *http.Client
 	appSignalChannel chan os.Signal // Channel for receiving OS signals by the console app
 
-	// whoisCh is the channel for receiving IPs for WHOIS processing.
-	whoisCh chan netip.Addr
-
 	// tlsCipherIDs are the ID of the cipher suites that AdGuard Home must use.
 	tlsCipherIDs []uint16
 
@@ -355,17 +353,13 @@ func initContextClients() (err error) {
 		arpdb = aghnet.NewARPDB()
 	}
 
-	err = Context.clients.Init(
+	Context.clients.Init(
 		config.Clients.Persistent,
 		Context.dhcpServer,
 		Context.etcHosts,
 		arpdb,
 		config.DNS.DnsfilterConf,
 	)
-	if err != nil {
-		// Don't wrap the error, because it's informative enough as is.
-		return err
-	}
 
 	return nil
 }
@@ -386,19 +380,6 @@ func setupBindOpts(opts options) (err error) {
 		config.BindHost = opts.bindHost
 	}
 
-	// Rewrite deprecated options.
-	bindAddr := opts.bindAddr
-	if bindAddr.IsValid() {
-		config.BindHost = bindAddr.Addr()
-		config.BindPort = int(bindAddr.Port())
-
-		err = checkPorts()
-		if err != nil {
-			// Don't wrap the error, because it's informative enough as is.
-			return err
-		}
-	}
-
 	return nil
 }
 

internal/home/options.go

@@ -35,18 +35,11 @@ type options struct {
 	serviceControlAction string
 
 	// bindHost is the address on which to serve the HTTP UI.
-	//
-	// Deprecated: Use bindAddr.
 	bindHost netip.Addr
 
 	// bindPort is the port on which to serve the HTTP UI.
-	//
-	// Deprecated: Use bindAddr.
 	bindPort int
 
-	// bindAddr is the address to serve the web UI on.
-	bindAddr netip.AddrPort
-
 	// checkConfig is true if the current invocation is only required to check
 	// the configuration file and exit.
 	checkConfig bool
@@ -154,10 +147,9 @@ var cmdLineOpts = []cmdLineOpt{{
 
 		return o.bindHost.String(), true
 	},
-	description: "Deprecated. Host address to bind HTTP server on. Use --web-addr. " +
-		"The short -h will work as --help in the future.",
-	longName:  "host",
-	shortName: "h",
+	description: "Host address to bind HTTP server on.",
+	longName:    "host",
+	shortName:   "h",
 }, {
 	updateWithValue: func(o options, v string) (options, error) {
 		var err error
@@ -182,23 +174,9 @@ var cmdLineOpts = []cmdLineOpt{{
 
 		return strconv.Itoa(o.bindPort), true
 	},
-	description: "Deprecated. Port to serve HTTP pages on. Use --web-addr.",
+	description: "Port to serve HTTP pages on.",
 	longName:    "port",
 	shortName:   "p",
-}, {
-	updateWithValue: func(o options, v string) (oo options, err error) {
-		o.bindAddr, err = netip.ParseAddrPort(v)
-
-		return o, err
-	},
-	updateNoValue: nil,
-	effect:        nil,
-	serialize: func(o options) (val string, ok bool) {
-		return o.bindAddr.String(), o.bindAddr.IsValid()
-	},
-	description: "Address to serve the web UI on, in the host:port format.",
-	longName:    "web-addr",
-	shortName:   "",
 }, {
 	updateWithValue: func(o options, v string) (options, error) {
 		o.serviceControlAction = v

internal/home/options_test.go

@@ -82,23 +82,6 @@ func TestParseBindPort(t *testing.T) {
 	testParseErr(t, "port too high", "-p", "18446744073709551617") // 2^64 + 1
 }
 
-func TestParseBindAddr(t *testing.T) {
-	wantAddrPort := netip.MustParseAddrPort("1.2.3.4:8089")
-
-	assert.Zero(t, testParseOK(t).bindAddr, "empty is not web-addr")
-
-	assert.Equal(t, wantAddrPort, testParseOK(t, "--web-addr", "1.2.3.4:8089").bindAddr)
-	assert.Equal(t, netip.MustParseAddrPort("1.2.3.4:0"), testParseOK(t, "--web-addr", "1.2.3.4:0").bindAddr)
-	testParseParamMissing(t, "-web-addr")
-
-	testParseErr(t, "not an int", "--web-addr", "1.2.3.4:x")
-	testParseErr(t, "hex not supported", "--web-addr", "1.2.3.4:0x100")
-	testParseErr(t, "port negative", "--web-addr", "1.2.3.4:-1")
-	testParseErr(t, "port too high", "--web-addr", "1.2.3.4:65536")
-	testParseErr(t, "port too high", "--web-addr", "1.2.3.4:4294967297")           // 2^32 + 1
-	testParseErr(t, "port too high", "--web-addr", "1.2.3.4:18446744073709551617") // 2^64 + 1
-}
-
 func TestParseLogfile(t *testing.T) {
 	assert.Equal(t, "", testParseOK(t).logFile, "empty is no log file")
 	assert.Equal(t, "path", testParseOK(t, "-l", "path").logFile, "-l is log file")
@@ -179,10 +162,6 @@ func TestOptsToArgs(t *testing.T) {
 		name: "bind_port",
 		args: []string{"-p", "666"},
 		opts: options{bindPort: 666},
-	}, {
-		name: "web-addr",
-		args: []string{"--web-addr", "1.2.3.4:8080"},
-		opts: options{bindAddr: netip.MustParseAddrPort("1.2.3.4:8080")},
 	}, {
 		name: "log_file",
 		args: []string{"-l", "path"},

internal/home/rdns_test.go

@@ -228,7 +228,12 @@ func TestRDNS_WorkerLoop(t *testing.T) {
 	for _, tc := range testCases {
 		w.Reset()
 
-		cc := newClientsContainer(t)
+		cc := &clientsContainer{
+			list:    map[string]*Client{},
+			idIndex: map[string]*Client{},
+			ipToRC:  map[netip.Addr]*RuntimeClient{},
+			allTags: stringutil.NewSet(),
+		}
 		ch := make(chan netip.Addr)
 		rdns := &RDNS{
 			exchanger: &rDNSExchanger{

internal/home/upgrade.go

@@ -22,7 +22,7 @@ import (
 )
 
 // currentSchemaVersion is the current schema version.
-const currentSchemaVersion = 22
+const currentSchemaVersion = 20
 
 // These aliases are provided for convenience.
 type (
@@ -94,8 +94,6 @@ func upgradeConfigSchema(oldVersion int, diskConf yobj) (err error) {
 		upgradeSchema17to18,
 		upgradeSchema18to19,
 		upgradeSchema19to20,
-		upgradeSchema20to21,
-		upgradeSchema21to22,
 	}
 
 	n := 0
@@ -1130,132 +1128,6 @@ func upgradeSchema19to20(diskConf yobj) (err error) {
 	return nil
 }
 
-// upgradeSchema20to21 performs the following changes:
-//
-//	# BEFORE:
-//	'dns':
-//	  'blocked_services':
-//	  - 'svc_name'
-//
-//	# AFTER:
-//	'dns':
-//	  'blocked_services':
-//	    'ids':
-//	    - 'svc_name'
-//	    'schedule':
-//	      'time_zone': 'Local'
-func upgradeSchema20to21(diskConf yobj) (err error) {
-	log.Printf("Upgrade yaml: 20 to 21")
-	diskConf["schema_version"] = 21
-
-	const field = "blocked_services"
-
-	dnsVal, ok := diskConf["dns"]
-	if !ok {
-		return nil
-	}
-
-	dns, ok := dnsVal.(yobj)
-	if !ok {
-		return fmt.Errorf("unexpected type of dns: %T", dnsVal)
-	}
-
-	blockedVal, ok := dns[field]
-	if !ok {
-		return nil
-	}
-
-	services, ok := blockedVal.(yarr)
-	if !ok {
-		return fmt.Errorf("unexpected type of blocked: %T", blockedVal)
-	}
-
-	dns[field] = yobj{
-		"ids": services,
-		"schedule": yobj{
-			"time_zone": "Local",
-		},
-	}
-
-	return nil
-}
-
-// upgradeSchema21to22 performs the following changes:
-//
-//	# BEFORE:
-//	'persistent':
-//	  - 'name': 'client_name'
-//	    'blocked_services':
-//	    - 'svc_name'
-//
-//	# AFTER:
-//	'persistent':
-//	  - 'name': 'client_name'
-//	    'blocked_services':
-//	      'ids':
-//	      - 'svc_name'
-//	      'schedule':
-//	        'time_zone': 'Local'
-func upgradeSchema21to22(diskConf yobj) (err error) {
-	log.Println("Upgrade yaml: 21 to 22")
-	diskConf["schema_version"] = 22
-
-	const field = "blocked_services"
-
-	clientsVal, ok := diskConf["clients"]
-	if !ok {
-		return nil
-	}
-
-	clients, ok := clientsVal.(yobj)
-	if !ok {
-		return fmt.Errorf("unexpected type of clients: %T", clientsVal)
-	}
-
-	persistentVal, ok := clients["persistent"]
-	if !ok {
-		return nil
-	}
-
-	persistent, ok := persistentVal.([]any)
-	if !ok {
-		return fmt.Errorf("unexpected type of persistent clients: %T", persistentVal)
-	}
-
-	for i, val := range persistent {
-		var c yobj
-		c, ok = val.(yobj)
-		if !ok {
-			return fmt.Errorf("persistent client at index %d: unexpected type %T", i, val)
-		}
-
-		var blockedVal any
-		blockedVal, ok = c[field]
-		if !ok {
-			continue
-		}
-
-		var services yarr
-		services, ok = blockedVal.(yarr)
-		if !ok {
-			return fmt.Errorf(
-				"persistent client at index %d: unexpected type of blocked services: %T",
-				i,
-				blockedVal,
-			)
-		}
-
-		c[field] = yobj{
-			"ids": services,
-			"schedule": yobj{
-				"time_zone": "Local",
-			},
-		}
-	}
-
-	return nil
-}
-
 // TODO(a.garipov): Replace with log.Output when we port it to our logging
 // package.
 func funcName() string {

internal/home/upgrade_test.go

@@ -1140,116 +1140,3 @@ func TestUpgradeSchema19to20(t *testing.T) {
 		assert.Equal(t, 24*time.Hour, ivlVal.Duration)
 	})
 }
-
-func TestUpgradeSchema20to21(t *testing.T) {
-	const newSchemaVer = 21
-
-	testCases := []struct {
-		in   yobj
-		want yobj
-		name string
-	}{{
-		name: "nothing",
-		in:   yobj{},
-		want: yobj{
-			"schema_version": newSchemaVer,
-		},
-	}, {
-		name: "no_clients",
-		in: yobj{
-			"dns": yobj{
-				"blocked_services": yarr{"ok"},
-			},
-		},
-		want: yobj{
-			"dns": yobj{
-				"blocked_services": yobj{
-					"ids": yarr{"ok"},
-					"schedule": yobj{
-						"time_zone": "Local",
-					},
-				},
-			},
-			"schema_version": newSchemaVer,
-		},
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := upgradeSchema20to21(tc.in)
-			require.NoError(t, err)
-
-			assert.Equal(t, tc.want, tc.in)
-		})
-	}
-}
-
-func TestUpgradeSchema21to22(t *testing.T) {
-	const newSchemaVer = 22
-
-	testCases := []struct {
-		in   yobj
-		want yobj
-		name string
-	}{{
-		in: yobj{
-			"clients": yobj{},
-		},
-		want: yobj{
-			"clients":        yobj{},
-			"schema_version": newSchemaVer,
-		},
-		name: "nothing",
-	}, {
-		in: yobj{
-			"clients": yobj{
-				"persistent": []any{yobj{"name": "localhost", "blocked_services": yarr{}}},
-			},
-		},
-		want: yobj{
-			"clients": yobj{
-				"persistent": []any{yobj{
-					"name": "localhost",
-					"blocked_services": yobj{
-						"ids": yarr{},
-						"schedule": yobj{
-							"time_zone": "Local",
-						},
-					},
-				}},
-			},
-			"schema_version": newSchemaVer,
-		},
-		name: "no_services",
-	}, {
-		in: yobj{
-			"clients": yobj{
-				"persistent": []any{yobj{"name": "localhost", "blocked_services": yarr{"ok"}}},
-			},
-		},
-		want: yobj{
-			"clients": yobj{
-				"persistent": []any{yobj{
-					"name": "localhost",
-					"blocked_services": yobj{
-						"ids": yarr{"ok"},
-						"schedule": yobj{
-							"time_zone": "Local",
-						},
-					},
-				}},
-			},
-			"schema_version": newSchemaVer,
-		},
-		name: "services",
-	}}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			err := upgradeSchema21to22(tc.in)
-			require.NoError(t, err)
-
-			assert.Equal(t, tc.want, tc.in)
-		})
-	}
-}

internal/home/whois.go

@@ -0,0 +1,259 @@
+package home
+
+import (
+	"context"
+	"encoding/binary"
+	"fmt"
+	"io"
+	"net"
+	"net/netip"
+	"strings"
+	"time"
+
+	"github.com/AdguardTeam/AdGuardHome/internal/aghio"
+	"github.com/AdguardTeam/golibs/cache"
+	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/log"
+	"github.com/AdguardTeam/golibs/stringutil"
+)
+
+const (
+	defaultServer  = "whois.arin.net"
+	defaultPort    = "43"
+	maxValueLength = 250
+	whoisTTL       = 1 * 60 * 60 // 1 hour
+)
+
+// WHOIS - module context
+type WHOIS struct {
+	clients *clientsContainer
+	ipChan  chan netip.Addr
+
+	// dialContext specifies the dial function for creating unencrypted TCP
+	// connections.
+	dialContext func(ctx context.Context, network, addr string) (conn net.Conn, err error)
+
+	// Contains IP addresses of clients
+	// An active IP address is resolved once again after it expires.
+	// If IP address couldn't be resolved, it stays here for some time to prevent further attempts to resolve the same IP.
+	ipAddrs cache.Cache
+
+	// TODO(a.garipov): Rewrite to use time.Duration.  Like, seriously, why?
+	timeoutMsec uint
+}
+
+// initWHOIS creates the WHOIS module context.
+func initWHOIS(clients *clientsContainer) *WHOIS {
+	w := WHOIS{
+		timeoutMsec: 5000,
+		clients:     clients,
+		ipAddrs: cache.New(cache.Config{
+			EnableLRU: true,
+			MaxCount:  10000,
+		}),
+		dialContext: customDialContext,
+		ipChan:      make(chan netip.Addr, 255),
+	}
+
+	go w.workerLoop()
+
+	return &w
+}
+
+// If the value is too large - cut it and append "..."
+func trimValue(s string) string {
+	if len(s) <= maxValueLength {
+		return s
+	}
+	return s[:maxValueLength-3] + "..."
+}
+
+// isWHOISComment returns true if the string is empty or is a WHOIS comment.
+func isWHOISComment(s string) (ok bool) {
+	return len(s) == 0 || s[0] == '#' || s[0] == '%'
+}
+
+// strmap is an alias for convenience.
+type strmap = map[string]string
+
+// whoisParse parses a subset of plain-text data from the WHOIS response into
+// a string map.
+func whoisParse(data string) (m strmap) {
+	m = strmap{}
+
+	var orgname string
+	lines := strings.Split(data, "\n")
+	for _, l := range lines {
+		if isWHOISComment(l) {
+			continue
+		}
+
+		kv := strings.SplitN(l, ":", 2)
+		if len(kv) != 2 {
+			continue
+		}
+
+		k := strings.ToLower(strings.TrimSpace(kv[0]))
+		v := strings.TrimSpace(kv[1])
+		if v == "" {
+			continue
+		}
+
+		switch k {
+		case "orgname", "org-name":
+			k = "orgname"
+			v = trimValue(v)
+			orgname = v
+		case "city", "country":
+			v = trimValue(v)
+		case "descr", "netname":
+			k = "orgname"
+			v = stringutil.Coalesce(orgname, v)
+			orgname = v
+		case "whois":
+			k = "whois"
+		case "referralserver":
+			k = "whois"
+			v = strings.TrimPrefix(v, "whois://")
+		default:
+			continue
+		}
+
+		m[k] = v
+	}
+
+	return m
+}
+
+// MaxConnReadSize is an upper limit in bytes for reading from net.Conn.
+const MaxConnReadSize = 64 * 1024
+
+// Send request to a server and receive the response
+func (w *WHOIS) query(ctx context.Context, target, serverAddr string) (data string, err error) {
+	addr, _, _ := net.SplitHostPort(serverAddr)
+	if addr == "whois.arin.net" {
+		target = "n + " + target
+	}
+
+	conn, err := w.dialContext(ctx, "tcp", serverAddr)
+	if err != nil {
+		return "", err
+	}
+	defer func() { err = errors.WithDeferred(err, conn.Close()) }()
+
+	r, err := aghio.LimitReader(conn, MaxConnReadSize)
+	if err != nil {
+		return "", err
+	}
+
+	_ = conn.SetReadDeadline(time.Now().Add(time.Duration(w.timeoutMsec) * time.Millisecond))
+	_, err = conn.Write([]byte(target + "\r\n"))
+	if err != nil {
+		return "", err
+	}
+
+	// This use of ReadAll is now safe, because we limited the conn Reader.
+	var whoisData []byte
+	whoisData, err = io.ReadAll(r)
+	if err != nil {
+		return "", err
+	}
+
+	return string(whoisData), nil
+}
+
+// Query WHOIS servers (handle redirects)
+func (w *WHOIS) queryAll(ctx context.Context, target string) (string, error) {
+	server := net.JoinHostPort(defaultServer, defaultPort)
+	const maxRedirects = 5
+	for i := 0; i != maxRedirects; i++ {
+		resp, err := w.query(ctx, target, server)
+		if err != nil {
+			return "", err
+		}
+		log.Debug("whois: received response (%d bytes) from %s  IP:%s", len(resp), server, target)
+
+		m := whoisParse(resp)
+		redir, ok := m["whois"]
+		if !ok {
+			return resp, nil
+		}
+		redir = strings.ToLower(redir)
+
+		_, _, err = net.SplitHostPort(redir)
+		if err != nil {
+			server = net.JoinHostPort(redir, defaultPort)
+		} else {
+			server = redir
+		}
+
+		log.Debug("whois: redirected to %s  IP:%s", redir, target)
+	}
+	return "", fmt.Errorf("whois: redirect loop")
+}
+
+// Request WHOIS information
+func (w *WHOIS) process(ctx context.Context, ip netip.Addr) (wi *RuntimeClientWHOISInfo) {
+	resp, err := w.queryAll(ctx, ip.String())
+	if err != nil {
+		log.Debug("whois: error: %s  IP:%s", err, ip)
+
+		return nil
+	}
+
+	log.Debug("whois: IP:%s  response: %d bytes", ip, len(resp))
+
+	m := whoisParse(resp)
+
+	wi = &RuntimeClientWHOISInfo{
+		City:    m["city"],
+		Country: m["country"],
+		Orgname: m["orgname"],
+	}
+
+	// Don't return an empty struct so that the frontend doesn't get
+	// confused.
+	if *wi == (RuntimeClientWHOISInfo{}) {
+		return nil
+	}
+
+	return wi
+}
+
+// Begin - begin requesting WHOIS info
+func (w *WHOIS) Begin(ip netip.Addr) {
+	ipBytes := ip.AsSlice()
+	now := uint64(time.Now().Unix())
+	expire := w.ipAddrs.Get(ipBytes)
+	if len(expire) != 0 {
+		exp := binary.BigEndian.Uint64(expire)
+		if exp > now {
+			return
+		}
+	}
+
+	expire = make([]byte, 8)
+	binary.BigEndian.PutUint64(expire, now+whoisTTL)
+	_ = w.ipAddrs.Set(ipBytes, expire)
+
+	log.Debug("whois: adding %s", ip)
+
+	select {
+	case w.ipChan <- ip:
+	default:
+		log.Debug("whois: queue is full")
+	}
+}
+
+// workerLoop processes the IP addresses it got from the channel and associates
+// the retrieving WHOIS info with a client.
+func (w *WHOIS) workerLoop() {
+	for ip := range w.ipChan {
+		info := w.process(context.Background(), ip)
+		if info == nil {
+			continue
+		}
+
+		w.clients.setWHOISInfo(ip, info)
+	}
+}

internal/home/whois_test.go

@@ -0,0 +1,152 @@
+package home
+
+import (
+	"context"
+	"io"
+	"net"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// fakeConn is a mock implementation of net.Conn to simplify testing.
+//
+// TODO(e.burkov): Search for other places in code where it may be used. Move
+// into aghtest then.
+type fakeConn struct {
+	// Conn is embedded here simply to make *fakeConn a net.Conn without
+	// actually implementing all methods.
+	net.Conn
+	data []byte
+}
+
+// Write implements net.Conn interface for *fakeConn.  It always returns 0 and a
+// nil error without mutating the slice.
+func (c *fakeConn) Write(_ []byte) (n int, err error) {
+	return 0, nil
+}
+
+// Read implements net.Conn interface for *fakeConn.  It puts the content of
+// c.data field into b up to the b's capacity.
+func (c *fakeConn) Read(b []byte) (n int, err error) {
+	return copy(b, c.data), io.EOF
+}
+
+// Close implements net.Conn interface for *fakeConn.  It always returns nil.
+func (c *fakeConn) Close() (err error) {
+	return nil
+}
+
+// SetReadDeadline implements net.Conn interface for *fakeConn.  It always
+// returns nil.
+func (c *fakeConn) SetReadDeadline(_ time.Time) (err error) {
+	return nil
+}
+
+// fakeDial is a mock implementation of customDialContext to simplify testing.
+func (c *fakeConn) fakeDial(ctx context.Context, network, addr string) (conn net.Conn, err error) {
+	return c, nil
+}
+
+func TestWHOIS(t *testing.T) {
+	const (
+		nl   = "\n"
+		data = `OrgName:        FakeOrg LLC` + nl +
+			`City:           Nonreal` + nl +
+			`Country:        Imagiland` + nl
+	)
+
+	fc := &fakeConn{
+		data: []byte(data),
+	}
+
+	w := WHOIS{
+		timeoutMsec: 5000,
+		dialContext: fc.fakeDial,
+	}
+	resp, err := w.queryAll(context.Background(), "1.2.3.4")
+	assert.NoError(t, err)
+
+	m := whoisParse(resp)
+	require.NotEmpty(t, m)
+
+	assert.Equal(t, "FakeOrg LLC", m["orgname"])
+	assert.Equal(t, "Imagiland", m["country"])
+	assert.Equal(t, "Nonreal", m["city"])
+}
+
+func TestWHOISParse(t *testing.T) {
+	const (
+		city    = "Nonreal"
+		country = "Imagiland"
+		orgname = "FakeOrgLLC"
+		whois   = "whois.example.net"
+	)
+
+	testCases := []struct {
+		want strmap
+		name string
+		in   string
+	}{{
+		want: strmap{},
+		name: "empty",
+		in:   ``,
+	}, {
+		want: strmap{},
+		name: "comments",
+		in:   "%\n#",
+	}, {
+		want: strmap{},
+		name: "no_colon",
+		in:   "city",
+	}, {
+		want: strmap{},
+		name: "no_value",
+		in:   "city:",
+	}, {
+		want: strmap{"city": city},
+		name: "city",
+		in:   `city: ` + city,
+	}, {
+		want: strmap{"country": country},
+		name: "country",
+		in:   `country: ` + country,
+	}, {
+		want: strmap{"orgname": orgname},
+		name: "orgname",
+		in:   `orgname: ` + orgname,
+	}, {
+		want: strmap{"orgname": orgname},
+		name: "orgname_hyphen",
+		in:   `org-name: ` + orgname,
+	}, {
+		want: strmap{"orgname": orgname},
+		name: "orgname_descr",
+		in:   `descr: ` + orgname,
+	}, {
+		want: strmap{"orgname": orgname},
+		name: "orgname_netname",
+		in:   `netname: ` + orgname,
+	}, {
+		want: strmap{"whois": whois},
+		name: "whois",
+		in:   `whois: ` + whois,
+	}, {
+		want: strmap{"whois": whois},
+		name: "referralserver",
+		in:   `referralserver: whois://` + whois,
+	}, {
+		want: strmap{},
+		name: "other",
+		in:   `other: value`,
+	}}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			got := whoisParse(tc.in)
+			assert.Equal(t, tc.want, got)
+		})
+	}
+}