Pull request: 3972-hostlists-services

Updates #3972.

Squashed commit of the following:

commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 8a935d4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 27 14:42:38 2022 +0300

    Merge branch 'master' into 3972-hostlists-services

commit 239550f84228e7c7a6f4ae6b1cadcc47e01f54d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 27 14:41:42 2022 +0300

    filtering: upd service list

commit b8bf3a6a4b1333059b886be95a1419612aebac39
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 27 13:41:09 2022 +0300

    client: remove todo

commit caa504b482befb804db2a1ca0b6d4834aa4da49a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 27 12:54:45 2022 +0300

    fix build

commit 511797c305d9eef84a20553dab795414e00da51a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 27 12:40:33 2022 +0300

    client: add titles with service names to the clients table

commit 79ed3157a85b489a0b13381cff867a8c73ba60e9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 27 12:36:59 2022 +0300

    client: fix empty icons

commit ab69b95784de87665d5a1a3683f28e3b3df1c210
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 27 11:55:48 2022 +0300

    client: use all blocked services

commit 9a4a87665c8463224d8e93f1e162988107f6c7ca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Oct 25 19:25:20 2022 +0300

    all: fix json response

commit 86eb4493ce305cd5991176bd4cd8f7f5afdea330
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Oct 25 19:09:44 2022 +0300

    all: use hostslists registry for blocked svcs

openapi/CHANGELOG.md

@@ -6,6 +6,19 @@
 
 
 
+## v0.107.17: API Changes
+
+### `GET /control/blocked_services/services` is deprecated
+
+Use `GET /control/blocked_services/all`.
+
+### `GET /control/blocked_services/all`
+
+* The new `GET /control/blocked_services/all` HTTP API allows inspecting all
+  available services and their data, such as SVG icons and human-readable names.
+
+
+
 ## v0.107.15: `POST` Requests Without Bodies
 
 As an additional CSRF protection measure, AdGuard Home now ensures that requests

openapi/openapi.yaml

@@ -862,6 +862,9 @@
       - 'clients'
   '/blocked_services/services':
     'get':
+      'deprecated': true
+      'description': >
+        Deprecated: Use `GET /blocked_services/all` instead.
       'tags':
       - 'blocked_services'
       'operationId': 'blockedServicesAvailableServices'
@@ -873,6 +876,19 @@
             'application/json':
               'schema':
                 '$ref': '#/components/schemas/BlockedServicesArray'
+  '/blocked_services/all':
+    'get':
+      'tags':
+      - 'blocked_services'
+      'operationId': 'blockedServicesAll'
+      'summary': 'Get available services to use for blocking'
+      'responses':
+        '200':
+          'description': 'OK.'
+          'content':
+            'application/json':
+              'schema':
+                '$ref': '#/components/schemas/BlockedServicesAll'
   '/blocked_services/list':
     'get':
       'tags':
@@ -2539,6 +2555,42 @@
       'type': 'array'
       'items':
         'type': 'string'
+    'BlockedServicesAll':
+      'properties':
+        'blocked_services':
+          'items':
+            '$ref': '#/components/schemas/BlockedService'
+          'type': 'array'
+      'required':
+      - 'blocked_services'
+      'type': 'object'
+    'BlockedService':
+      'properties':
+        'icon_svg':
+          'description': >
+            The SVG icon as a Base64-encoded string to make it easier to embed
+            it into a data URL.
+          'type': 'string'
+        'id':
+          'description': >
+            The ID of this service.
+          'type': 'string'
+        'name':
+          'description': >
+            The human-readable name of this service.
+          'type': 'string'
+        'rules':
+          'description': >
+            The array of the filtering rules.
+          'items':
+            'type': 'string'
+          'type': 'array'
+      'required':
+      - 'icon_svg'
+      - 'id'
+      - 'name'
+      - 'rules'
+      'type': 'object'
     'CheckConfigRequestBeta':
       'type': 'object'
       'description': 'Configuration to be checked'