daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: all: use "ClientID" consistently

Browse Source 
Closes #4242.
Updates #4244.

Squashed commit of the following:

commit 3a2296a7a70006cf6777e54ce1e2fc3559aec5be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 9 21:23:43 2022 +0300

    client: imp more

commit 3aacc8696ac694ff459fd33ba7beeeabd2569a55
Merge: b28a120f 2a5b5f19
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 9 21:21:59 2022 +0300

    Merge branch 'master' into 4244-imp-i18n

commit b28a120fe9aa68507b173717059b7b259097d6a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 9 14:49:49 2022 +0300

    client: imp texts more

commit c1fa6ca336f2d5bdcc67836f348be4843a0a8f79
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Feb 8 21:12:15 2022 +0300

    all: use "ClientID" consistently
This commit is contained in:
Ainar Garipov
2022-02-10 15:42:59 +03:00
parent 2a5b5f1927
commit f53f48cc33
21 changed files with 142 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openapi/CHANGELOG.md
View File

@@ -69,9 +69,9 @@
* The type of `"interval"` field is now `number` instead of `integer`.
### Client IDs in Access Settings
### ClientIDs in Access Settings
* The `POST /control/access/set` HTTP API now accepts client IDs in
* The `POST /control/access/set` HTTP API now accepts ClientIDs in
`"allowed_clients"` and `"disallowed_clients"` fields.
### The new field `"unicode_name"` in `DNSQuestion`

18
openapi/openapi.yaml
View File

@@ -822,12 +822,12 @@
- 'clients'
'operationId': 'clientsFind'
'summary': >
Get information about clients by their IP addresses or client IDs.
Get information about clients by their IP addresses or ClientIDs.
'parameters':
- 'name': 'ip0'
'in': 'query'
'description': >
Filter by IP address or client IDs. Parameters with names `ip1`,
Filter by IP address or ClientIDs. Parameters with names `ip1`,
`ip2`, and so on are also accepted and interpreted as "ip0 OR ip1 OR
ip2".
@@ -1150,7 +1150,7 @@
'schema':
'type': 'string'
- 'description': >
Client ID.
ClientID.
'example': 'client-1'
'in': 'query'
'name': 'client_id'
@@ -1185,7 +1185,7 @@
'schema':
'type': 'string'
- 'description': >
Client ID.
ClientID.
'example': 'client-1'
'in': 'query'
'name': 'client_id'
@@ -1890,7 +1890,7 @@
'type': 'string'
'client_id':
'description': >
The client ID, if provided in DoH, DoQ, or DoT.
The ClientID, if provided in DoH, DoQ, or DoT.
'example': 'cli123'
'type': 'string'
'client_info':
@@ -2276,7 +2276,7 @@
'example': 'localhost'
'ids':
'type': 'array'
'description': 'IP, CIDR, MAC, or client ID.'
'description': 'IP, CIDR, MAC, or ClientID.'
'items':
'type': 'string'
'use_global_settings':
@@ -2381,13 +2381,13 @@
'properties':
'allowed_clients':
'description': >
The allowlist of clients: IP addresses, CIDRs, or client IDs.
The allowlist of clients: IP addresses, CIDRs, or ClientIDs.
'items':
'type': 'string'
'type': 'array'
'disallowed_clients':
'description': >
The blocklist of clients: IP addresses, CIDRs, or client IDs.
The blocklist of clients: IP addresses, CIDRs, or ClientIDs.
'items':
'type': 'string'
'type': 'array'
@@ -2411,7 +2411,7 @@
'example': 'localhost'
'ids':
'type': 'array'
'description': 'IP, CIDR, MAC, or client ID.'
'description': 'IP, CIDR, MAC, or ClientID.'
'items':
'type': 'string'
'use_global_settings':