Pull request: all: client id support
Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9eAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65fAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
This commit is contained in:
Ainar Garipov
@@ -4,6 +4,11 @@
|
||||
|
||||
## v0.105: API changes
|
||||
|
||||
### New `"dnscrypt"` `"client_proto"` value in `GET /querylog` response
|
||||
|
||||
* The field `"client_proto"` can now have the value `"dnscrypt"` when the
|
||||
request was sent over a DNSCrypt connection.
|
||||
|
||||
### New `"reason"` in `GET /filtering/check_host` and `GET /querylog`
|
||||
|
||||
* The new `RewriteRule` reason is added to `GET /filtering/check_host` and
|
||||
|
||||
@@ -794,11 +794,17 @@
|
||||
'tags':
|
||||
- 'clients'
|
||||
'operationId': 'clientsFind'
|
||||
'summary': 'Get information about selected clients by their IP address'
|
||||
'summary': >
|
||||
Get information about clients by their IP addresses or client IDs.
|
||||
'parameters':
|
||||
- 'name': 'ip0'
|
||||
'in': 'query'
|
||||
'description': 'Filter by IP address'
|
||||
'description': >
|
||||
Filter by IP address or client IDs. Parameters with names `ip1`,
|
||||
`ip2`, and so on are also accepted and interpreted as "ip0 OR ip1 OR
|
||||
ip2".
|
||||
|
||||
TODO(a.garipov): Replace with a better query API.
|
||||
'schema':
|
||||
'type': 'string'
|
||||
'responses':
|
||||
@@ -1109,6 +1115,13 @@
|
||||
'name': 'host'
|
||||
'schema':
|
||||
'type': 'string'
|
||||
- 'description': >
|
||||
Client ID.
|
||||
'example': 'client-1'
|
||||
'in': 'query'
|
||||
'name': 'client_id'
|
||||
'schema':
|
||||
'type': 'string'
|
||||
'responses':
|
||||
'200':
|
||||
'description': 'DNS over HTTPS plist file.'
|
||||
@@ -1136,6 +1149,13 @@
|
||||
'name': 'host'
|
||||
'schema':
|
||||
'type': 'string'
|
||||
- 'description': >
|
||||
Client ID.
|
||||
'example': 'client-1'
|
||||
'in': 'query'
|
||||
'name': 'client_id'
|
||||
'schema':
|
||||
'type': 'string'
|
||||
'responses':
|
||||
'200':
|
||||
'description': 'DNS over TLS plist file'
|
||||
@@ -1781,13 +1801,21 @@
|
||||
'answer_dnssec':
|
||||
'type': 'boolean'
|
||||
'client':
|
||||
'type': 'string'
|
||||
'description': >
|
||||
The client's IP address.
|
||||
'example': '192.168.0.1'
|
||||
'type': 'string'
|
||||
'client_id':
|
||||
'description': >
|
||||
The client ID, if provided in DOH, DOQ, or DOT.
|
||||
'example': 'cli123'
|
||||
'type': 'string'
|
||||
'client_proto':
|
||||
'enum':
|
||||
- 'dot'
|
||||
- 'doh'
|
||||
- 'doq'
|
||||
- 'dnscrypt'
|
||||
- ''
|
||||
'elapsedMs':
|
||||
'type': 'string'
|
||||
@@ -2094,7 +2122,7 @@
|
||||
'type': 'string'
|
||||
'Client':
|
||||
'type': 'object'
|
||||
'description': 'Client information'
|
||||
'description': 'Client information.'
|
||||
'properties':
|
||||
'name':
|
||||
'type': 'string'
|
||||
@@ -2102,7 +2130,7 @@
|
||||
'example': 'localhost'
|
||||
'ids':
|
||||
'type': 'array'
|
||||
'description': 'IP, CIDR or MAC address'
|
||||
'description': 'IP, CIDR, MAC, or client ID.'
|
||||
'items':
|
||||
'type': 'string'
|
||||
'use_global_settings':
|
||||
@@ -2157,9 +2185,38 @@
|
||||
'type': 'string'
|
||||
'ClientsFindResponse':
|
||||
'type': 'array'
|
||||
'description': 'Response to clients find operation'
|
||||
'description': 'Client search results.'
|
||||
'items':
|
||||
'$ref': '#/components/schemas/ClientsFindEntry'
|
||||
'example':
|
||||
- 'cli42':
|
||||
'name': 'Client 42'
|
||||
'ids': ['cli42']
|
||||
'use_global_settings': true
|
||||
'filtering_enabled': true
|
||||
'parental_enabled': true
|
||||
'safebrowsing_enabled': true
|
||||
'safesearch_enabled': true
|
||||
'use_global_blocked_services': true
|
||||
'blocked_services': null
|
||||
'upstreams': null
|
||||
'whois_info': null
|
||||
'disallowed': false
|
||||
'disallowed_rule': ''
|
||||
- '1.2.3.4':
|
||||
'name': 'Client 1-2-3-4'
|
||||
'ids': ['1.2.3.4']
|
||||
'use_global_settings': true
|
||||
'filtering_enabled': true
|
||||
'parental_enabled': true
|
||||
'safebrowsing_enabled': true
|
||||
'safesearch_enabled': true
|
||||
'use_global_blocked_services': true
|
||||
'blocked_services': null
|
||||
'upstreams': null
|
||||
'whois_info': null
|
||||
'disallowed': false
|
||||
'disallowed_rule': ''
|
||||
'AccessListResponse':
|
||||
'$ref': '#/components/schemas/AccessList'
|
||||
'AccessSetRequest':
|
||||
@@ -2187,10 +2244,9 @@
|
||||
'type': 'object'
|
||||
'additionalProperties':
|
||||
'$ref': '#/components/schemas/ClientFindSubEntry'
|
||||
'example':
|
||||
'1.2.3.4': 'test'
|
||||
'ClientFindSubEntry':
|
||||
'type': 'object'
|
||||
'description': 'Client information.'
|
||||
'properties':
|
||||
'name':
|
||||
'type': 'string'
|
||||
@@ -2198,7 +2254,7 @@
|
||||
'example': 'localhost'
|
||||
'ids':
|
||||
'type': 'array'
|
||||
'description': 'IP, CIDR or MAC address'
|
||||
'description': 'IP, CIDR, MAC, or client ID.'
|
||||
'items':
|
||||
'type': 'string'
|
||||
'use_global_settings':
|
||||
|
||||
Reference in New Issue
Block a user