docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
return err | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // readProbeLine reads a line that includes the specified position
<mask> // this method is supposed to be used when we use binary search in the Seek method
<mask> // in the case of consecutive reads, use readNext (it uses a better buffer)
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove if err != nil {
return err
}
</s> add </s> remove if (position - bufferSize) > 0 {
</s> add if position > bufferSize { </s> remove if (position - maxEntrySize) > 0 {
</s> add if position > maxEntrySize { </s> remove value string // search criteria value
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/qlogfile.go |
if position > maxEntrySize { | <mask> // First of all, we should read a buffer that will include the query log line
<mask> // In order to do this, we'll define the boundaries
<mask> seekPosition := int64(0)
<mask> relativePos := position // position relative to the buffer we're going to read
<mask> if (position - maxEntrySize) > 0 {
<mask> seekPosition = position - maxEntrySize
<mask> relativePos = maxEntrySize
<mask> }
<mask>
<mask> // Seek to this position
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove if (position - bufferSize) > 0 {
</s> add if position > bufferSize { </s> remove return nil
</s> add return err </s> remove value string // search criteria value
</s> add </s> remove if err != nil {
return err
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/qlogfile.go |
ClientID string | <mask> OrigAnswer *dns.Msg // The response from an upstream server (optional)
<mask> Result *dnsfilter.Result // Filtering result (optional)
<mask> Elapsed time.Duration // Time spent for processing the request
<mask> ClientIP net.IP
<mask> Upstream string // Upstream server URL
<mask> ClientProto ClientProto
<mask> }
<mask>
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove Client net.IP
</s> add </s> remove srv *Server
proxyCtx *proxy.DNSContext
setts *dnsfilter.RequestFilteringSettings // filtering settings for this client
startTime time.Time
result *dnsfilter.Result
origResp *dns.Msg // response received from upstream servers. Set when response is modified by filtering
origQuestion dns.Question // question received from client. Set when Rewrites are used.
err error // error returned from the module
protectionEnabled bool // filtering is enabled, dnsfilter object is ready
responseFromUpstream bool // response is received from upstream servers
origReqDNSSEC bool // DNSSEC flag in the original request from user
</s> add srv *Server
proxyCtx *proxy.DNSContext
// setts are the filtering settings for the client.
setts *dnsfilter.RequestFilteringSettings
startTime time.Time
result *dnsfilter.Result
// origResp is the response received from upstream. It is set when the
// response is modified by filters.
origResp *dns.Msg
// err is the error returned from a processing function.
err error
// clientID is the clientID from DOH, DOQ, or DOT, if provided.
clientID string
// origQuestion is the question received from the client. It is set
// when the request is modified by rewrites.
origQuestion dns.Question
// protectionEnabled shows if the filtering is enabled, and if the
// server's DNS filter is ready.
protectionEnabled bool
// responseFromUpstream shows if the response is received from the
// upstream servers.
responseFromUpstream bool
// origReqDNSSEC shows if the DNSSEC flag in the original request from
// the client is set.
origReqDNSSEC bool </s> remove // Entry - data to add
</s> add // Entry is a statistics data entry. </s> remove ClientProtoDOH ClientProto = "doh"
ClientProtoDOQ ClientProto = "doq"
ClientProtoDOT ClientProto = "dot"
ClientProtoPlain ClientProto = ""
</s> add ClientProtoDOH ClientProto = "doh"
ClientProtoDOQ ClientProto = "doq"
ClientProtoDOT ClientProto = "dot"
ClientProtoDNSCrypt ClientProto = "dnscrypt"
ClientProtoPlain ClientProto = "" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/querylog.go |
"errors" | <mask> import (
<mask> "bytes"
<mask> "encoding/json"
<mask> "os"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove "net"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/querylogfile.go |
<mask> func (l *queryLog) rotate() error {
<mask> from := l.logFile
<mask> to := l.logFile + ".1"
<mask>
<mask> if _, err := os.Stat(from); os.IsNotExist(err) {
<mask> // do nothing, file doesn't exist
<mask> return nil
<mask> }
<mask>
<mask> err := os.Rename(from, to)
<mask> if err != nil {
<mask> log.Error("querylog: failed to rename file: %s", err)
<mask> return err
<mask> }
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove err := os.Remove(l.logFile + ".1")
if err != nil && !os.IsNotExist(err) {
log.Error("file remove: %s: %s", l.logFile+".1", err)
</s> add oldLogFile := l.logFile + ".1"
err := os.Remove(oldLogFile)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Error("removing old log file %q: %s", oldLogFile, err) </s> remove if !os.IsNotExist(err) {
</s> add if !errors.Is(err, os.ErrNotExist) { </s> remove ok, err := clients.Add(*c)
</s> add ok, err := clients.Add(c) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/querylogfile.go | |
if errors.Is(err, os.ErrNotExist) {
return nil
}
| <mask> err := os.Rename(from, to)
<mask> if err != nil {
<mask> log.Error("querylog: failed to rename file: %s", err)
<mask>
<mask> return err
<mask> }
<mask>
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove if _, err := os.Stat(from); os.IsNotExist(err) {
// do nothing, file doesn't exist
return nil
}
</s> add </s> remove err := os.Remove(l.logFile + ".1")
if err != nil && !os.IsNotExist(err) {
log.Error("file remove: %s: %s", l.logFile+".1", err)
</s> add oldLogFile := l.logFile + ".1"
err := os.Remove(oldLogFile)
if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Error("removing old log file %q: %s", oldLogFile, err) </s> remove if err != nil && !os.IsNotExist(err) {
log.Error("file remove: %s: %s", l.logFile, err)
</s> add if err != nil && !errors.Is(err, os.ErrNotExist) {
log.Error("removing log file %q: %s", l.logFile, err) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/querylogfile.go |
// ctDomainOrClient is for searching by the domain name, the client's IP
// address, or the clinet's ID.
ctDomainOrClient criteriaType = iota
// ctFilteringStatus is for searching by the filtering status.
//
// See (*searchCriteria).ctFilteringStatusCase for details.
ctFilteringStatus | <mask>
<mask> type criteriaType int
<mask>
<mask> const (
<mask> ctDomainOrClient criteriaType = iota // domain name or client IP address
<mask> ctFilteringStatus // filtering status
<mask> )
<mask>
<mask> const (
<mask> filteringStatusAll = "all"
<mask> filteringStatusFiltered = "filtered" // all kinds of filtering
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove const (
clientsUpdatePeriod = 10 * time.Minute
)
</s> add const clientsUpdatePeriod = 10 * time.Minute </s> remove // Priority: etc/hosts > DHCP > ARP > rDNS > WHOIS
ClientSourceWHOIS clientSource = iota // from WHOIS
ClientSourceRDNS // from rDNS
ClientSourceDHCP // from DHCP
ClientSourceARP // from 'arp -a'
ClientSourceHostsFile // from /etc/hosts
</s> add ClientSourceWHOIS clientSource = iota
ClientSourceRDNS
ClientSourceDHCP
ClientSourceARP
ClientSourceHostsFile </s> remove value string // search criteria value
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/searchcriteria.go |
value string // search criteria value | <mask> // we use each of them to match the query
<mask> type searchCriteria struct {
<mask> criteriaType criteriaType // type of the criteria
<mask> strict bool // should we strictly match (equality) or not (indexOf)
<mask> }
<mask>
<mask> // quickMatch - quickly checks if the log entry matches this search criteria
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove value string // search criteria value
</s> add </s> remove if (position - maxEntrySize) > 0 {
</s> add if position > maxEntrySize { </s> remove return nil
</s> add return err </s> remove ctDomainOrClient criteriaType = iota // domain name or client IP address
ctFilteringStatus // filtering status
</s> add // ctDomainOrClient is for searching by the domain name, the client's IP
// address, or the clinet's ID.
ctDomainOrClient criteriaType = iota
// ctFilteringStatus is for searching by the filtering status.
//
// See (*searchCriteria).ctFilteringStatusCase for details.
ctFilteringStatus </s> remove if (position - bufferSize) > 0 {
</s> add if position > bufferSize { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/searchcriteria.go |
<mask> // we use each of them to match the query
<mask> type searchCriteria struct {
<mask> criteriaType criteriaType // type of the criteria
<mask> strict bool // should we strictly match (equality) or not (indexOf)
<mask> value string // search criteria value
<mask> }
<mask>
<mask> // quickMatch - quickly checks if the log entry matches this search criteria
<mask> // the reason is to do it as quickly as possible without de-serializing the entry
<mask> func (c *searchCriteria) quickMatch(line string) bool {
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove if (position - maxEntrySize) > 0 {
</s> add if position > maxEntrySize { </s> remove return nil
</s> add return err </s> remove ctDomainOrClient criteriaType = iota // domain name or client IP address
ctFilteringStatus // filtering status
</s> add // ctDomainOrClient is for searching by the domain name, the client's IP
// address, or the clinet's ID.
ctDomainOrClient criteriaType = iota
// ctFilteringStatus is for searching by the filtering status.
//
// See (*searchCriteria).ctFilteringStatusCase for details.
ctFilteringStatus </s> remove type modProcessFunc func(ctx *dnsContext) int
</s> add type modProcessFunc func(ctx *dnsContext) (rc resultCode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/searchcriteria.go | |
c.quickMatchJSONValue(line, "IP") ||
c.quickMatchJSONValue(line, "ID") | <mask>
<mask> switch c.criteriaType {
<mask> case ctDomainOrClient:
<mask> return c.quickMatchJSONValue(line, "QH") ||
<mask> c.quickMatchJSONValue(line, "IP")
<mask> default:
<mask> return true
<mask> }
<mask> }
<mask>
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove switch d.Proto {
</s> add switch pctx.Proto { </s> remove case resultFinish:
</s> add case resultCodeFinish: </s> remove case resultDone:
</s> add case resultCodeSuccess: </s> remove // Check if Client object's fields are correct
func (clients *clientsContainer) check(c *Client) error {
if len(c.Name) == 0 {
return fmt.Errorf("invalid Name")
}
if len(c.IDs) == 0 {
return fmt.Errorf("id required")
</s> add // check validates the client.
func (clients *clientsContainer) check(c *Client) (err error) {
switch {
case c == nil:
return agherr.Error("client is nil")
case c.Name == "":
return agherr.Error("invalid name")
case len(c.IDs) == 0:
return agherr.Error("id required")
default:
// Go on. </s> remove name = fmt.Sprintf("%s DoH", d.ServerName)
d.ServerURL = fmt.Sprintf("https://%s/dns-query", d.ServerName)
</s> add dspName = fmt.Sprintf("%s DoH", d.ServerName)
u := &url.URL{
Scheme: "https",
Host: d.ServerName,
Path: "/dns-query",
}
if d.clientID != "" {
u.Path = path.Join(u.Path, d.clientID)
}
d.ServerURL = u.String() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/searchcriteria.go |
clientID := strings.ToLower(entry.ClientID) | <mask> }
<mask>
<mask> func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
<mask> qhost := strings.ToLower(entry.QHost)
<mask> searchVal := strings.ToLower(c.value)
<mask> if c.strict && (qhost == searchVal || clientID == searchVal) {
<mask> return true
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove if c.strict && qhost == searchVal {
</s> add if c.strict && (qhost == searchVal || clientID == searchVal) { </s> remove if !c.strict && strings.Contains(qhost, searchVal) {
</s> add if !c.strict && (strings.Contains(qhost, searchVal) || strings.Contains(clientID, searchVal)) { </s> remove client := s.getClientIP(e.Client)
</s> add clientID := e.Client
if ip := net.ParseIP(clientID); ip != nil {
ip = s.getClientIP(ip)
clientID = ip.String()
} </s> remove func (c *ipsetCtx) process(ctx *dnsContext) int {
</s> add func (c *ipsetCtx) process(ctx *dnsContext) (rc resultCode) { </s> remove len(e.Domain) == 0 ||
!(len(e.Client) == 4 || len(e.Client) == 16) {
</s> add e.Domain == "" ||
e.Client == "" { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/searchcriteria.go |
if c.strict && (qhost == searchVal || clientID == searchVal) { | <mask>
<mask> func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
<mask> qhost := strings.ToLower(entry.QHost)
<mask> searchVal := strings.ToLower(c.value)
<mask> if c.strict && qhost == searchVal {
<mask> return true
<mask> }
<mask>
<mask> if !c.strict && strings.Contains(qhost, searchVal) {
<mask> return true
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove if !c.strict && strings.Contains(qhost, searchVal) {
</s> add if !c.strict && (strings.Contains(qhost, searchVal) || strings.Contains(clientID, searchVal)) { </s> remove msg := d.Req
</s> add msg := pctx.Req </s> remove for i := 0; i != len(a); i++ {
</s> add for i := range a { </s> remove _, ok := clients.findByIP(ip)
</s> add _, ok = clients.findLocked(id) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/searchcriteria.go |
if !c.strict && (strings.Contains(qhost, searchVal) || strings.Contains(clientID, searchVal)) { | <mask> if c.strict && qhost == searchVal {
<mask> return true
<mask> }
<mask>
<mask> if !c.strict && strings.Contains(qhost, searchVal) {
<mask> return true
<mask> }
<mask>
<mask> ipStr := entry.IP.String()
<mask> if c.strict && ipStr == c.value {
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove if c.strict && qhost == searchVal {
</s> add if c.strict && (qhost == searchVal || clientID == searchVal) { </s> remove msg := d.Req
</s> add msg := pctx.Req </s> remove return *c, true
</s> add return c, true </s> remove return resultFinish
</s> add return resultCodeFinish | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/querylog/searchcriteria.go |
// Entry is a statistics data entry. | <mask> RParental
<mask> rLast
<mask> )
<mask>
<mask> // Entry - data to add
<mask> type Entry struct {
<mask> Domain string
<mask> Client net.IP
<mask> Result Result
<mask> Time uint32 // processing time (msec)
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove Client net.IP
</s> add </s> remove clients *clientsContainer
ipChan chan net.IP
timeoutMsec uint
</s> add clients *clientsContainer
ipChan chan net.IP </s> remove // Client information
</s> add // Client contains information about persistent clients. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/stats.go |
// Clients is the client's primary ID.
//
// TODO(a.garipov): Make this a {net.IP, string} enum?
Client string
| <mask> // Entry is a statistics data entry.
<mask> type Entry struct {
<mask> Domain string
<mask> Result Result
<mask> Time uint32 // processing time (msec)
<mask> }
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove // Entry - data to add
</s> add // Entry is a statistics data entry. </s> remove Client net.IP
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/stats.go |
<mask>
<mask> // Entry - data to add
<mask> type Entry struct {
<mask> Domain string
<mask> Client net.IP
<mask> Result Result
<mask> Time uint32 // processing time (msec)
<mask> }
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove // Entry - data to add
</s> add // Entry is a statistics data entry. </s> remove clients *clientsContainer
ipChan chan net.IP
timeoutMsec uint
</s> add clients *clientsContainer
ipChan chan net.IP </s> remove // Client information
</s> add // Client contains information about persistent clients. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/stats.go | |
e.Client = "127.0.0.1" | <mask>
<mask> e := Entry{}
<mask>
<mask> e.Domain = "domain"
<mask> e.Client = net.IP{127, 0, 0, 1}
<mask> e.Result = RFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> e.Domain = "domain"
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove e.Client = net.IP{127, 0, 0, 1}
</s> add e.Client = "127.0.0.1" </s> remove e.Client = net.IP{127, 0, 0, 1}
e.Client[2] = byte((i & 0xff00) >> 8)
e.Client[3] = byte(i & 0xff)
</s> add ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String() </s> remove switch addr := d.Addr.(type) {
case *net.UDPAddr:
e.Client = addr.IP
case *net.TCPAddr:
e.Client = addr.IP
</s> add if clientID := ctx.clientID; clientID != "" {
e.Client = clientID
} else if ip := IPFromAddr(pctx.Addr); ip != nil {
e.Client = ip.String() </s> remove e.Domain = strings.ToLower(d.Req.Question[0].Name)
</s> add e.Domain = strings.ToLower(pctx.Req.Question[0].Name) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/stats_test.go |
e.Client = "127.0.0.1" | <mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> e.Domain = "domain"
<mask> e.Client = net.IP{127, 0, 0, 1}
<mask> e.Result = RNotFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> d, ok := s.getData()
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove e.Client = net.IP{127, 0, 0, 1}
</s> add e.Client = "127.0.0.1" </s> remove e.Client = net.IP{127, 0, 0, 1}
e.Client[2] = byte((i & 0xff00) >> 8)
e.Client[3] = byte(i & 0xff)
</s> add ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String() </s> remove type testDHCP struct {
}
</s> add type testDHCP struct{} </s> remove switch addr := d.Addr.(type) {
case *net.UDPAddr:
e.Client = addr.IP
case *net.TCPAddr:
e.Client = addr.IP
</s> add if clientID := ctx.clientID; clientID != "" {
e.Client = clientID
} else if ip := IPFromAddr(pctx.Addr); ip != nil {
e.Client = ip.String() </s> remove len(e.Domain) == 0 ||
!(len(e.Client) == 4 || len(e.Client) == 16) {
</s> add e.Domain == "" ||
e.Client == "" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/stats_test.go |
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String() | <mask> atomic.AddInt32(&hour, 1)
<mask> }
<mask> for i := 0; i != n; i++ {
<mask> e.Domain = fmt.Sprintf("domain%d", i)
<mask> e.Client = net.IP{127, 0, 0, 1}
<mask> e.Client[2] = byte((i & 0xff00) >> 8)
<mask> e.Client[3] = byte(i & 0xff)
<mask> e.Result = RNotFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask> }
<mask> }
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove e.Client = net.IP{127, 0, 0, 1}
</s> add e.Client = "127.0.0.1" </s> remove e.Client = net.IP{127, 0, 0, 1}
</s> add e.Client = "127.0.0.1" </s> remove for i := 0; i != len(a); i++ {
</s> add for i := range a { </s> remove type testDHCP struct {
}
</s> add type testDHCP struct{} </s> remove for i := 0; ; i++ {
ipStr := q.Get(fmt.Sprintf("ip%d", i))
ip := net.ParseIP(ipStr)
if ip == nil {
</s> add for i := 0; i < len(q); i++ {
idStr := q.Get(fmt.Sprintf("ip%d", i))
if idStr == "" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/stats_test.go |
func convertMapToSlice(m map[string]uint64, max int) []countPair { | <mask> log.Debug("Stats: deleted unit %d", id)
<mask> return true
<mask> }
<mask>
<mask> func convertMapToArray(m map[string]uint64, max int) []countPair {
<mask> a := []countPair{}
<mask> for k, v := range m {
<mask> pair := countPair{}
<mask> pair.Name = k
<mask> pair.Count = v
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove if v.Source == source {
</s> add if v.Source == src { </s> remove // Remove all entries that match the specified source
func (clients *clientsContainer) rmHosts(source clientSource) {
</s> add // rmHostsBySrc removes all entries that match the specified source.
func (clients *clientsContainer) rmHostsBySrc(src clientSource) { </s> remove func convertArrayToMap(a []countPair) map[string]uint64 {
</s> add func convertSliceToMap(a []countPair) map[string]uint64 { </s> remove func convertTopArray(a []countPair) []map[string]uint64 {
</s> add func convertTopSlice(a []countPair) []map[string]uint64 { </s> remove for _, id := range old.IDs {
</s> add for _, id := range prev.IDs { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
func convertSliceToMap(a []countPair) map[string]uint64 { | <mask> }
<mask> return a[:max]
<mask> }
<mask>
<mask> func convertArrayToMap(a []countPair) map[string]uint64 {
<mask> m := map[string]uint64{}
<mask> for _, it := range a {
<mask> m[it.Name] = it.Count
<mask> }
<mask> return m
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove func convertTopArray(a []countPair) []map[string]uint64 {
</s> add func convertTopSlice(a []countPair) []map[string]uint64 { </s> remove a := convertMapToArray(m, int(maxCount))
</s> add a := convertMapToSlice(m, int(maxCount)) </s> remove a2 := convertMapToArray(m, max)
return convertTopArray(a2)
</s> add a2 := convertMapToSlice(m, max)
return convertTopSlice(a2) </s> remove func convertMapToArray(m map[string]uint64, max int) []countPair {
</s> add func convertMapToSlice(m map[string]uint64, max int) []countPair { </s> remove for _, id := range old.IDs {
</s> add for _, id := range prev.IDs { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
udb.Domains = convertMapToSlice(u.domains, maxDomains)
udb.BlockedDomains = convertMapToSlice(u.blockedDomains, maxDomains)
udb.Clients = convertMapToSlice(u.clients, maxClients) | <mask> if u.nTotal != 0 {
<mask> udb.TimeAvg = uint32(u.timeSum / u.nTotal)
<mask> }
<mask>
<mask> udb.Domains = convertMapToArray(u.domains, maxDomains)
<mask> udb.BlockedDomains = convertMapToArray(u.blockedDomains, maxDomains)
<mask> udb.Clients = convertMapToArray(u.clients, maxClients)
<mask>
<mask> return &udb
<mask> }
<mask>
<mask> func deserialize(u *unit, udb *unitDB) {
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove u.domains = convertArrayToMap(udb.Domains)
u.blockedDomains = convertArrayToMap(udb.BlockedDomains)
u.clients = convertArrayToMap(udb.Clients)
</s> add u.domains = convertSliceToMap(udb.Domains)
u.blockedDomains = convertSliceToMap(udb.BlockedDomains)
u.clients = convertSliceToMap(udb.Clients) </s> remove func convertTopArray(a []countPair) []map[string]uint64 {
</s> add func convertTopSlice(a []countPair) []map[string]uint64 { </s> remove a2 := convertMapToArray(m, max)
return convertTopArray(a2)
</s> add a2 := convertMapToSlice(m, max)
return convertTopSlice(a2) </s> remove
</s> add hostname := tlsConf.ServerName </s> remove func getDNSEncryption() dnsEncryption {
dnsEncryption := dnsEncryption{}
</s> add func getDNSEncryption() (de dnsEncryption) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
u.domains = convertSliceToMap(udb.Domains)
u.blockedDomains = convertSliceToMap(udb.BlockedDomains)
u.clients = convertSliceToMap(udb.Clients) | <mask> for i := 1; i < n; i++ {
<mask> u.nResult[i] = udb.NResult[i]
<mask> }
<mask>
<mask> u.domains = convertArrayToMap(udb.Domains)
<mask> u.blockedDomains = convertArrayToMap(udb.BlockedDomains)
<mask> u.clients = convertArrayToMap(udb.Clients)
<mask> u.timeSum = uint64(udb.TimeAvg) * u.nTotal
<mask> }
<mask>
<mask> func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool {
<mask> log.Tracef("Flushing unit %d", id)
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove for i := 0; i != len(a); i++ {
</s> add for i := range a { </s> remove for i := 0; ; i++ {
ipStr := q.Get(fmt.Sprintf("ip%d", i))
ip := net.ParseIP(ipStr)
if ip == nil {
</s> add for i := 0; i < len(q); i++ {
idStr := q.Get(fmt.Sprintf("ip%d", i))
if idStr == "" { </s> remove // Return TRUE if arrays are equal
func arraysEqual(a, b []string) bool {
</s> add // equalStringSlices returns true if the slices are equal.
func equalStringSlices(a, b []string) (ok bool) { </s> remove s.unitLock.Unlock()
</s> add </s> remove e.Client = net.IP{127, 0, 0, 1}
e.Client[2] = byte((i & 0xff00) >> 8)
e.Client[3] = byte(i & 0xff)
</s> add ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
func convertTopSlice(a []countPair) []map[string]uint64 { | <mask>
<mask> return &udb
<mask> }
<mask>
<mask> func convertTopArray(a []countPair) []map[string]uint64 {
<mask> m := []map[string]uint64{}
<mask> for _, it := range a {
<mask> ent := map[string]uint64{}
<mask> ent[it.Name] = it.Count
<mask> m = append(m, ent)
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove func convertArrayToMap(a []countPair) map[string]uint64 {
</s> add func convertSliceToMap(a []countPair) map[string]uint64 { </s> remove a := convertMapToArray(m, int(maxCount))
</s> add a := convertMapToSlice(m, int(maxCount)) </s> remove func convertMapToArray(m map[string]uint64, max int) []countPair {
</s> add func convertMapToSlice(m map[string]uint64, max int) []countPair { </s> remove a2 := convertMapToArray(m, max)
return convertTopArray(a2)
</s> add a2 := convertMapToSlice(m, max)
return convertTopSlice(a2) </s> remove for _, id := range old.IDs {
</s> add for _, id := range prev.IDs { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
e.Domain == "" ||
e.Client == "" { | <mask>
<mask> func (s *statsCtx) Update(e Entry) {
<mask> if e.Result == 0 ||
<mask> e.Result >= rLast ||
<mask> len(e.Domain) == 0 ||
<mask> !(len(e.Client) == 4 || len(e.Client) == 16) {
<mask> return
<mask> }
<mask> client := s.getClientIP(e.Client)
<mask>
<mask> s.unitLock.Lock()
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove client := s.getClientIP(e.Client)
</s> add clientID := e.Client
if ip := net.ParseIP(clientID); ip != nil {
ip = s.getClientIP(ip)
clientID = ip.String()
} </s> remove return resultDone
</s> add return resultCodeSuccess </s> remove func (c *ipsetCtx) process(ctx *dnsContext) int {
</s> add func (c *ipsetCtx) process(ctx *dnsContext) (rc resultCode) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
clientID := e.Client
if ip := net.ParseIP(clientID); ip != nil {
ip = s.getClientIP(ip)
clientID = ip.String()
} | <mask> len(e.Domain) == 0 ||
<mask> !(len(e.Client) == 4 || len(e.Client) == 16) {
<mask> return
<mask> }
<mask> client := s.getClientIP(e.Client)
<mask>
<mask> s.unitLock.Lock()
<mask> u := s.unit
<mask>
<mask> u.nResult[e.Result]++
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove len(e.Domain) == 0 ||
!(len(e.Client) == 4 || len(e.Client) == 16) {
</s> add e.Domain == "" ||
e.Client == "" { </s> remove return resultDone
</s> add return resultCodeSuccess | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
defer s.unitLock.Unlock()
| <mask> }
<mask>
<mask> s.unitLock.Lock()
<mask> u := s.unit
<mask>
<mask> u.nResult[e.Result]++
<mask>
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove client := s.getClientIP(e.Client)
</s> add clientID := e.Client
if ip := net.ParseIP(clientID); ip != nil {
ip = s.getClientIP(ip)
clientID = ip.String()
} </s> remove len(e.Domain) == 0 ||
!(len(e.Client) == 4 || len(e.Client) == 16) {
</s> add e.Domain == "" ||
e.Client == "" { </s> remove name = fmt.Sprintf("%s DoH", d.ServerName)
d.ServerURL = fmt.Sprintf("https://%s/dns-query", d.ServerName)
</s> add dspName = fmt.Sprintf("%s DoH", d.ServerName)
u := &url.URL{
Scheme: "https",
Host: d.ServerName,
Path: "/dns-query",
}
if d.clientID != "" {
u.Path = path.Join(u.Path, d.clientID)
}
d.ServerURL = u.String() </s> remove ok := clients.addHost(ip, name, ClientSourceHostsFile)
</s> add ok := clients.addHostLocked(ip, name, ClientSourceHostsFile) </s> remove a := convertMapToArray(m, int(maxCount))
</s> add a := convertMapToSlice(m, int(maxCount)) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
u.clients[clientID]++ | <mask> } else {
<mask> u.blockedDomains[e.Domain]++
<mask> }
<mask>
<mask> u.clients[client.String()]++
<mask> u.timeSum += uint64(e.Time)
<mask> u.nTotal++
<mask> s.unitLock.Unlock()
<mask> }
<mask>
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove s.unitLock.Unlock()
</s> add </s> remove Source: source,
</s> add Source: src, </s> remove cj = clientToJSON(&c)
</s> add cj = clientToJSON(c) </s> remove ch.Source = source
</s> add ch.Source = src | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
<mask>
<mask> u.clients[client.String()]++
<mask> u.timeSum += uint64(e.Time)
<mask> u.nTotal++
<mask> s.unitLock.Unlock()
<mask> }
<mask>
<mask> func (s *statsCtx) loadUnits(limit uint32) ([]*unitDB, uint32) {
<mask> tx := s.beginTxn(false)
<mask> if tx == nil {
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove u.clients[client.String()]++
</s> add u.clients[clientID]++ </s> remove len(e.Domain) == 0 ||
!(len(e.Client) == 4 || len(e.Client) == 16) {
</s> add e.Domain == "" ||
e.Client == "" { </s> remove func (s *Server) updateStats(d *proxy.DNSContext, elapsed time.Duration, res dnsfilter.Result) {
</s> add func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) { </s> remove u.domains = convertArrayToMap(udb.Domains)
u.blockedDomains = convertArrayToMap(udb.BlockedDomains)
u.clients = convertArrayToMap(udb.Clients)
</s> add u.domains = convertSliceToMap(udb.Domains)
u.blockedDomains = convertSliceToMap(udb.BlockedDomains)
u.clients = convertSliceToMap(udb.Clients) </s> remove return resultDone
</s> add return resultCodeSuccess | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go | |
a2 := convertMapToSlice(m, max)
return convertTopSlice(a2) | <mask> for _, it := range pairsGetter(u) {
<mask> m[it.Name] += it.Count
<mask> }
<mask> }
<mask> a2 := convertMapToArray(m, max)
<mask> return convertTopArray(a2)
<mask> }
<mask>
<mask> dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
<mask> if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
<mask> log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit)
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove a := convertMapToArray(m, int(maxCount))
</s> add a := convertMapToSlice(m, int(maxCount)) </s> remove func convertArrayToMap(a []countPair) map[string]uint64 {
</s> add func convertSliceToMap(a []countPair) map[string]uint64 { </s> remove func convertTopArray(a []countPair) []map[string]uint64 {
</s> add func convertTopSlice(a []countPair) []map[string]uint64 { </s> remove clients.idIndex[id] = old
</s> add clients.idIndex[id] = prev </s> remove for i := 0; i != len(a); i++ {
</s> add for i := range a { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
a := convertMapToSlice(m, int(maxCount)) | <mask> for _, it := range u.Clients {
<mask> m[it.Name] += it.Count
<mask> }
<mask> }
<mask> a := convertMapToArray(m, int(maxCount))
<mask> d := []net.IP{}
<mask> for _, it := range a {
<mask> d = append(d, net.ParseIP(it.Name))
<mask> }
<mask> return d
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove func convertArrayToMap(a []countPair) map[string]uint64 {
</s> add func convertSliceToMap(a []countPair) map[string]uint64 { </s> remove a2 := convertMapToArray(m, max)
return convertTopArray(a2)
</s> add a2 := convertMapToSlice(m, max)
return convertTopSlice(a2) </s> remove func convertTopArray(a []countPair) []map[string]uint64 {
</s> add func convertTopSlice(a []countPair) []map[string]uint64 { </s> remove for _, id := range old.IDs {
</s> add for _, id := range prev.IDs { </s> remove ok := clients.addHost(ip, name, ClientSourceHostsFile)
</s> add ok := clients.addHostLocked(ip, name, ClientSourceHostsFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | internal/stats/unit.go |
'summary': >
Get information about clients by their IP addresses or client IDs. | <mask> 'get':
<mask> 'tags':
<mask> - 'clients'
<mask> 'operationId': 'clientsFind'
<mask> 'summary': 'Get information about selected clients by their IP address'
<mask> 'parameters':
<mask> - 'name': 'ip0'
<mask> 'in': 'query'
<mask> 'description': 'Filter by IP address'
<mask> 'schema':
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'description': 'Filter by IP address'
</s> add '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. </s> remove 'type': 'string'
</s> add 'description': >
The client's IP address. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
'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. | <mask> 'summary': 'Get information about selected clients by their IP address'
<mask> 'parameters':
<mask> - 'name': 'ip0'
<mask> 'in': 'query'
<mask> 'description': 'Filter by IP address'
<mask> 'schema':
<mask> 'type': 'string'
<mask> 'responses':
<mask> '200':
<mask> 'description': 'OK.'
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'summary': 'Get information about selected clients by their IP address'
</s> add 'summary': >
Get information about clients by their IP addresses or client IDs. </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
- 'description': >
Client ID.
'example': 'client-1'
'in': 'query'
'name': 'client_id'
'schema':
'type': 'string' | <mask> 'name': 'host'
<mask> 'schema':
<mask> 'type': 'string'
<mask> 'responses':
<mask> '200':
<mask> 'description': 'DNS over HTTPS plist file.'
<mask> '500':
<mask> 'content':
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'description': 'Client information'
</s> add 'description': 'Client information.' </s> remove 'description': 'Filter by IP address'
</s> add '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. </s> remove 'description': 'Response to clients find operation'
</s> add 'description': 'Client search results.' | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
- 'description': >
Client ID.
'example': 'client-1'
'in': 'query'
'name': 'client_id'
'schema':
'type': 'string' | <mask> 'schema':
<mask> 'type': 'string'
<mask> 'responses':
<mask> '200':
<mask> 'description': 'DNS over TLS plist file'
<mask> '500':
<mask> 'content':
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'description': 'Filter by IP address'
</s> add '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. </s> remove 'description': 'Client information'
</s> add 'description': 'Client information.' </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
'description': >
The client's IP address. | <mask> address.
<mask> 'answer_dnssec':
<mask> 'type': 'boolean'
<mask> 'client':
<mask> 'type': 'string'
<mask> 'example': '192.168.0.1'
<mask> 'client_proto':
<mask> 'enum':
<mask> - 'dot'
<mask> - 'doh'
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
'type': 'string'
'client_id':
'description': >
The client ID, if provided in DOH, DOQ, or DOT.
'example': 'cli123'
'type': 'string' | <mask> 'description': >
<mask> The client's IP address.
<mask> 'example': '192.168.0.1'
<mask> 'client_proto':
<mask> 'enum':
<mask> - 'dot'
<mask> - 'doh'
<mask> - 'doq'
<mask> - 'dnscrypt'
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'type': 'string'
</s> add 'description': >
The client's IP address. </s> remove 'summary': 'Get information about selected clients by their IP address'
</s> add 'summary': >
Get information about clients by their IP addresses or client IDs. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
- 'dnscrypt' | <mask> - 'dot'
<mask> - 'doh'
<mask> - 'doq'
<mask> - ''
<mask> 'elapsedMs':
<mask> 'type': 'string'
<mask> 'example': '54.023928'
<mask> 'question':
<mask> '$ref': '#/components/schemas/DnsQuestion'
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'type': 'string'
</s> add 'description': >
The client's IP address. </s> remove 'example':
'1.2.3.4': 'test'
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
'description': 'Client information.' | <mask> 'name':
<mask> 'type': 'string'
<mask> 'Client':
<mask> 'type': 'object'
<mask> 'description': 'Client information'
<mask> 'properties':
<mask> 'name':
<mask> 'type': 'string'
<mask> 'description': 'Name'
<mask> 'example': 'localhost'
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'example':
'1.2.3.4': 'test'
</s> add </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
'description': 'IP, CIDR, MAC, or client ID.' | <mask> 'description': 'Name'
<mask> 'example': 'localhost'
<mask> 'ids':
<mask> 'type': 'array'
<mask> 'description': 'IP, CIDR or MAC address'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'use_global_settings':
<mask> 'type': 'boolean'
<mask> 'filtering_enabled':
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' </s> remove 'description': 'Client information'
</s> add 'description': 'Client information.' </s> remove 'description': 'Response to clients find operation'
</s> add 'description': 'Client search results.' </s> remove 'type': 'string'
</s> add 'description': >
The client's IP address. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
'description': 'Client search results.' | <mask> 'name':
<mask> 'type': 'string'
<mask> 'ClientsFindResponse':
<mask> 'type': 'array'
<mask> 'description': 'Response to clients find operation'
<mask> 'items':
<mask> '$ref': '#/components/schemas/ClientsFindEntry'
<mask> 'AccessListResponse':
<mask> '$ref': '#/components/schemas/AccessList'
<mask> 'AccessSetRequest':
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'example':
'1.2.3.4': 'test'
</s> add </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' </s> remove 'description': 'Client information'
</s> add 'description': 'Client information.' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
<mask> 'ClientsFindEntry':
<mask> 'type': 'object'
<mask> 'additionalProperties':
<mask> '$ref': '#/components/schemas/ClientFindSubEntry'
<mask> 'example':
<mask> '1.2.3.4': 'test'
<mask> 'ClientFindSubEntry':
<mask> 'type': 'object'
<mask> 'properties':
<mask> 'name':
<mask> 'type': 'string'
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'description': 'Client information'
</s> add 'description': 'Client information.' </s> remove 'description': 'Response to clients find operation'
</s> add 'description': 'Client search results.' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml | |
'description': 'Client information.' | <mask> 'ClientFindSubEntry':
<mask> 'type': 'object'
<mask> 'properties':
<mask> 'name':
<mask> 'type': 'string'
<mask> 'description': 'Name'
<mask> 'example': 'localhost'
<mask> 'ids':
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 </s> remove 'description': 'Client information'
</s> add 'description': 'Client information.' </s> remove 'example':
'1.2.3.4': 'test'
</s> add </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' </s> remove 'description': 'IP, CIDR or MAC address'
</s> add 'description': 'IP, CIDR, MAC, or client ID.' | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
'description': 'IP, CIDR, MAC, or client ID.' | <mask> 'description': 'Name'
<mask> 'example': 'localhost'
<mask> 'ids':
<mask> 'type': 'array'
<mask> 'description': 'IP, CIDR or MAC address'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'use_global_settings':
<mask> 'type': 'boolean'
<mask> 'filtering_enabled':
</s> 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: 9104f161 3e9edd9e
Author: 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: 199fdc05 c215b820
Author: 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: 607e241f abf8f65f
Author: 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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fc9ddcf9416141f513b81dc815bb5199911b32f3 | openapi/openapi.yaml |
import {
CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME,
} from '../helpers/constants'; | <mask> import i18next from 'i18next';
<mask> import axios from 'axios';
<mask>
<mask> import { splitByNewLine, sortClients } from '../helpers/helpers';
<mask> import { CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES } from '../helpers/constants';
<mask> import { areEqualVersions } from '../helpers/version';
<mask> import { getTlsStatus } from './encryption';
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addNoticeToast, addSuccessToast } from './toasts';
<mask>
</s> Check interface before showing alert </s> remove if (v4.static_ip.static === STATUS_RESPONSE.ERROR) {
</s> add if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.ERROR) { </s> remove if (v4.other_server.found === STATUS_RESPONSE.YES
|| v6.other_server.found === STATUS_RESPONSE.YES) {
</s> add if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.YES)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.YES)) { </s> remove const { check, interface_name } = getState().dhcp;
</s> add const { check, interface_name, interfaces } = getState().dhcp;
const selectedInterface = getState().form[FORM_NAME.DHCP_INTERFACES].values.interface_name; </s> remove } else if (v4.static_ip.static === STATUS_RESPONSE.NO
</s> add } else if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.NO </s> remove if (v4.other_server.found === STATUS_RESPONSE.ERROR
|| v6.other_server.found === STATUS_RESPONSE.ERROR) {
</s> add const hasV4Interface = !!interfaces[selectedInterface]?.ipv4_addresses;
const hasV6Interface = !!interfaces[selectedInterface]?.ipv6_addresses;
if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.ERROR)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.ERROR)) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcc34ca80bedd34f2dd170bebe15dd2d06174f5d | client/src/actions/index.js |
const { check, interface_name, interfaces } = getState().dhcp;
const selectedInterface = getState().form[FORM_NAME.DHCP_INTERFACES].values.interface_name; | <mask> dispatch(findActiveDhcpRequest());
<mask> try {
<mask> const activeDhcp = await apiClient.findActiveDhcp(name);
<mask> dispatch(findActiveDhcpSuccess(activeDhcp));
<mask> const { check, interface_name } = getState().dhcp;
<mask> const v4 = check?.v4 ?? { static_ip: {}, other_server: {} };
<mask> const v6 = check?.v6 ?? { other_server: {} };
<mask>
<mask> let isError = false;
<mask>
</s> Check interface before showing alert </s> remove if (v4.other_server.found === STATUS_RESPONSE.ERROR
|| v6.other_server.found === STATUS_RESPONSE.ERROR) {
</s> add const hasV4Interface = !!interfaces[selectedInterface]?.ipv4_addresses;
const hasV6Interface = !!interfaces[selectedInterface]?.ipv6_addresses;
if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.ERROR)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.ERROR)) { </s> remove if (v4.other_server.found === STATUS_RESPONSE.YES
|| v6.other_server.found === STATUS_RESPONSE.YES) {
</s> add if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.YES)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.YES)) { </s> remove } else if (v4.static_ip.static === STATUS_RESPONSE.NO
</s> add } else if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.NO </s> remove if (v4.static_ip.static === STATUS_RESPONSE.ERROR) {
</s> add if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.ERROR) { </s> remove import { CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES } from '../helpers/constants';
</s> add import {
CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME,
} from '../helpers/constants'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcc34ca80bedd34f2dd170bebe15dd2d06174f5d | client/src/actions/index.js |
const hasV4Interface = !!interfaces[selectedInterface]?.ipv4_addresses;
const hasV6Interface = !!interfaces[selectedInterface]?.ipv6_addresses;
if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.ERROR)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.ERROR)) { | <mask> const v6 = check?.v6 ?? { other_server: {} };
<mask>
<mask> let isError = false;
<mask>
<mask> if (v4.other_server.found === STATUS_RESPONSE.ERROR
<mask> || v6.other_server.found === STATUS_RESPONSE.ERROR) {
<mask> isError = true;
<mask> dispatch(addErrorToast({ error: 'dhcp_error' }));
<mask> if (v4.other_server.error) {
<mask> dispatch(addErrorToast({ error: v4.other_server.error }));
<mask> }
</s> Check interface before showing alert </s> remove const { check, interface_name } = getState().dhcp;
</s> add const { check, interface_name, interfaces } = getState().dhcp;
const selectedInterface = getState().form[FORM_NAME.DHCP_INTERFACES].values.interface_name; </s> remove if (v4.static_ip.static === STATUS_RESPONSE.ERROR) {
</s> add if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.ERROR) { </s> remove if (v4.other_server.found === STATUS_RESPONSE.YES
|| v6.other_server.found === STATUS_RESPONSE.YES) {
</s> add if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.YES)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.YES)) { </s> remove } else if (v4.static_ip.static === STATUS_RESPONSE.NO
</s> add } else if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.NO </s> remove import { CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES } from '../helpers/constants';
</s> add import {
CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME,
} from '../helpers/constants'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcc34ca80bedd34f2dd170bebe15dd2d06174f5d | client/src/actions/index.js |
if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.ERROR) { | <mask> dispatch(addErrorToast({ error: v6.other_server.error }));
<mask> }
<mask> }
<mask>
<mask> if (v4.static_ip.static === STATUS_RESPONSE.ERROR) {
<mask> isError = true;
<mask> dispatch(addErrorToast({ error: 'dhcp_static_ip_error' }));
<mask> }
<mask>
<mask> if (isError) {
</s> Check interface before showing alert </s> remove if (v4.other_server.found === STATUS_RESPONSE.ERROR
|| v6.other_server.found === STATUS_RESPONSE.ERROR) {
</s> add const hasV4Interface = !!interfaces[selectedInterface]?.ipv4_addresses;
const hasV6Interface = !!interfaces[selectedInterface]?.ipv6_addresses;
if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.ERROR)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.ERROR)) { </s> remove if (v4.other_server.found === STATUS_RESPONSE.YES
|| v6.other_server.found === STATUS_RESPONSE.YES) {
</s> add if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.YES)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.YES)) { </s> remove } else if (v4.static_ip.static === STATUS_RESPONSE.NO
</s> add } else if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.NO </s> remove const { check, interface_name } = getState().dhcp;
</s> add const { check, interface_name, interfaces } = getState().dhcp;
const selectedInterface = getState().form[FORM_NAME.DHCP_INTERFACES].values.interface_name; </s> remove import { CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES } from '../helpers/constants';
</s> add import {
CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME,
} from '../helpers/constants'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcc34ca80bedd34f2dd170bebe15dd2d06174f5d | client/src/actions/index.js |
if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.YES)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.YES)) { | <mask> if (isError) {
<mask> return;
<mask> }
<mask>
<mask> if (v4.other_server.found === STATUS_RESPONSE.YES
<mask> || v6.other_server.found === STATUS_RESPONSE.YES) {
<mask> dispatch(addErrorToast({ error: 'dhcp_found' }));
<mask> } else if (v4.static_ip.static === STATUS_RESPONSE.NO
<mask> && v4.static_ip.ip
<mask> && interface_name) {
<mask> const warning = i18next.t('dhcp_dynamic_ip_found', {
</s> Check interface before showing alert </s> remove } else if (v4.static_ip.static === STATUS_RESPONSE.NO
</s> add } else if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.NO </s> remove if (v4.static_ip.static === STATUS_RESPONSE.ERROR) {
</s> add if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.ERROR) { </s> remove if (v4.other_server.found === STATUS_RESPONSE.ERROR
|| v6.other_server.found === STATUS_RESPONSE.ERROR) {
</s> add const hasV4Interface = !!interfaces[selectedInterface]?.ipv4_addresses;
const hasV6Interface = !!interfaces[selectedInterface]?.ipv6_addresses;
if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.ERROR)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.ERROR)) { </s> remove const { check, interface_name } = getState().dhcp;
</s> add const { check, interface_name, interfaces } = getState().dhcp;
const selectedInterface = getState().form[FORM_NAME.DHCP_INTERFACES].values.interface_name; </s> remove import { CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES } from '../helpers/constants';
</s> add import {
CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME,
} from '../helpers/constants'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcc34ca80bedd34f2dd170bebe15dd2d06174f5d | client/src/actions/index.js |
} else if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.NO | <mask>
<mask> if (v4.other_server.found === STATUS_RESPONSE.YES
<mask> || v6.other_server.found === STATUS_RESPONSE.YES) {
<mask> dispatch(addErrorToast({ error: 'dhcp_found' }));
<mask> } else if (v4.static_ip.static === STATUS_RESPONSE.NO
<mask> && v4.static_ip.ip
<mask> && interface_name) {
<mask> const warning = i18next.t('dhcp_dynamic_ip_found', {
<mask> interfaceName: interface_name,
<mask> ipAddress: v4.static_ip.ip,
</s> Check interface before showing alert </s> remove if (v4.other_server.found === STATUS_RESPONSE.YES
|| v6.other_server.found === STATUS_RESPONSE.YES) {
</s> add if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.YES)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.YES)) { </s> remove if (v4.other_server.found === STATUS_RESPONSE.ERROR
|| v6.other_server.found === STATUS_RESPONSE.ERROR) {
</s> add const hasV4Interface = !!interfaces[selectedInterface]?.ipv4_addresses;
const hasV6Interface = !!interfaces[selectedInterface]?.ipv6_addresses;
if ((hasV4Interface && v4.other_server.found === STATUS_RESPONSE.ERROR)
|| (hasV6Interface && v6.other_server.found === STATUS_RESPONSE.ERROR)) { </s> remove if (v4.static_ip.static === STATUS_RESPONSE.ERROR) {
</s> add if (hasV4Interface && v4.static_ip.static === STATUS_RESPONSE.ERROR) { </s> remove const { check, interface_name } = getState().dhcp;
</s> add const { check, interface_name, interfaces } = getState().dhcp;
const selectedInterface = getState().form[FORM_NAME.DHCP_INTERFACES].values.interface_name; </s> remove import { CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES } from '../helpers/constants';
</s> add import {
CHECK_TIMEOUT, STATUS_RESPONSE, SETTINGS_NAMES, FORM_NAME,
} from '../helpers/constants'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcc34ca80bedd34f2dd170bebe15dd2d06174f5d | client/src/actions/index.js |
-
name: log
description: 'AdGuard Home query log' | <mask> name: global
<mask> description: 'AdGuard Home server general settings and controls'
<mask> -
<mask> name: stats
<mask> description: 'AdGuard Home statistics'
<mask> -
<mask> name: i18n
</s> Finished reworking openapi, added DHCP methods there </s> remove rule:
type: string
</s> add </s> remove - stats
</s> add - log </s> remove /filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
examples:
# TODO: move to definitions
application/json:
enabled: false
filters:
enabled: true
id: 1
lastUpdated: "2018-10-30T12:18:57.223101822+03:00"
name: "AdGuard Simplified Domain Names filter"
rulesCount: 24896
url: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
rules:
- '@@||yandex.ru^|'
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
# API TO-DO LIST
# TODO: Use JSON where it is possible
# TODO: Use lower_case for all objects' properties
# TODO: Move to definitions what's missing from there
# --------------------------------------------------
# General settings and controls
# --------------------------------------------------
| <mask> description: 'Built-in DHCP server controls'
<mask> paths:
<mask> /status:
<mask> get:
<mask> tags:
<mask> - global
</s> Finished reworking openapi, added DHCP methods there </s> remove summary: "Checks if there's an active DHCP server on the network"
</s> add summary: "Searches for an active DHCP server on the network" </s> remove /dhcp/check_active_dhcp:
post:
</s> add /dhcp/find_active_dhcp:
get: </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
# --------------------------------------------------
# Query log methods
# --------------------------------------------------
| <mask> 8.8.4.4: OK
<mask> "192.168.1.104:53535": "Couldn't communicate with DNS server"
<mask>
<mask> /querylog:
<mask> get:
<mask> tags:
<mask> - log
</s> Finished reworking openapi, added DHCP methods there </s> remove - stats
</s> add - log </s> remove - stats
</s> add - log </s> remove - stats
</s> add - log </s> remove /filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
examples:
# TODO: move to definitions
application/json:
enabled: false
filters:
enabled: true
id: 1
lastUpdated: "2018-10-30T12:18:57.223101822+03:00"
name: "AdGuard Simplified Domain Names filter"
rulesCount: 24896
url: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
rules:
- '@@||yandex.ru^|'
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
- log | <mask>
<mask> /querylog:
<mask> get:
<mask> tags:
<mask> - stats
<mask> operationId: queryLog
<mask> summary: 'Get DNS server query log'
<mask> parameters:
<mask> - in: query
<mask> name: download
</s> Finished reworking openapi, added DHCP methods there </s> remove - stats
</s> add - log </s> remove - stats
</s> add - log | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
- log | <mask> $ref: '#/definitions/QueryLog'
<mask> /querylog_enable:
<mask> post:
<mask> tags:
<mask> - stats
<mask> operationId: querylogEnable
<mask> summary: 'Enable querylog'
<mask> responses:
<mask> 200:
<mask> description: OK
</s> Finished reworking openapi, added DHCP methods there </s> remove - stats
</s> add - log </s> remove /dhcp/check_active_dhcp:
post:
</s> add /dhcp/find_active_dhcp:
get: </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
- log | <mask> description: OK
<mask> /querylog_disable:
<mask> post:
<mask> tags:
<mask> - stats
<mask> operationId: querylogDisable
<mask> summary: 'Disable filtering'
<mask> responses:
<mask> 200:
<mask> description: OK
</s> Finished reworking openapi, added DHCP methods there </s> remove - stats
</s> add - log </s> remove /dhcp/check_active_dhcp:
post:
</s> add /dhcp/find_active_dhcp:
get: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
# --------------------------------------------------
# General statistics methods
# --------------------------------------------------
| <mask> responses:
<mask> 200:
<mask> description: OK
<mask>
<mask> /stats_top:
<mask> get:
<mask> tags:
<mask> - stats
<mask> operationId: statusTop
<mask> summary: 'Get DNS server top client, domain and blocked statistics'
</s> Finished reworking openapi, added DHCP methods there </s> remove - stats
</s> add - log </s> remove - stats
</s> add - log </s> remove - stats
</s> add - log </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
# --------------------------------------------------
# DHCP server methods
# --------------------------------------------------
| <mask> description: OK
<mask>
<mask> /dhcp/status:
<mask> get:
<mask> tags:
<mask> - dhcp
<mask> operationId: dhcpStatus
</s> Finished reworking openapi, added DHCP methods there </s> remove /dhcp/check_active_dhcp:
post:
</s> add /dhcp/find_active_dhcp:
get: </s> remove summary: "Checks if there's an active DHCP server on the network"
</s> add summary: "Searches for an active DHCP server on the network" </s> remove - stats
</s> add - log </s> remove - stats
</s> add - log | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
/dhcp/find_active_dhcp:
get: | <mask> $ref: "#/definitions/DhcpConfig"
<mask> responses:
<mask> 200:
<mask> description: OK
<mask> /dhcp/check_active_dhcp:
<mask> post:
<mask> tags:
<mask> - dhcp
<mask> operationId: checkActiveDhcp
<mask> summary: "Checks if there's an active DHCP server on the network"
<mask> responses:
</s> Finished reworking openapi, added DHCP methods there </s> remove summary: "Checks if there's an active DHCP server on the network"
</s> add summary: "Searches for an active DHCP server on the network" </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" </s> remove - stats
</s> add - log | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
summary: "Searches for an active DHCP server on the network" | <mask> post:
<mask> tags:
<mask> - dhcp
<mask> operationId: checkActiveDhcp
<mask> summary: "Checks if there's an active DHCP server on the network"
<mask> responses:
<mask> 200:
<mask> description: OK
<mask> examples:
<mask> application/json:
</s> Finished reworking openapi, added DHCP methods there </s> remove /dhcp/check_active_dhcp:
post:
</s> add /dhcp/find_active_dhcp:
get: </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" </s> remove - stats
</s> add - log | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" | <mask> summary: "Checks if there's an active DHCP server on the network"
<mask> responses:
<mask> 200:
<mask> description: OK
<mask> examples:
<mask> application/json:
<mask> found: true
<mask> gatewayIp: 192.168.1.1
<mask>
<mask> /filtering/enable:
<mask> post:
<mask> tags:
<mask> - filtering
</s> Finished reworking openapi, added DHCP methods there </s> remove summary: "Checks if there's an active DHCP server on the network"
</s> add summary: "Searches for an active DHCP server on the network" </s> remove /dhcp/check_active_dhcp:
post:
</s> add /dhcp/find_active_dhcp:
get: </s> remove /filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
examples:
# TODO: move to definitions
application/json:
enabled: false
filters:
enabled: true
id: 1
lastUpdated: "2018-10-30T12:18:57.223101822+03:00"
name: "AdGuard Simplified Domain Names filter"
rulesCount: 24896
url: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
rules:
- '@@||yandex.ru^|'
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
<mask> description: 'If any value is set, ignore cache and force re-download of all filters'
<mask> responses:
<mask> 200:
<mask> description: OK with how many filters were actually updated
<mask> /filtering/status:
<mask> get:
<mask> tags:
<mask> - filtering
<mask> operationId: filteringStatus
<mask> summary: 'Get status of rules-based filter'
<mask> responses:
<mask> 200:
<mask> description: OK
<mask> examples:
<mask> # TODO: move to definitions
<mask> application/json:
<mask> enabled: false
<mask> filters:
<mask> enabled: true
<mask> id: 1
<mask> lastUpdated: "2018-10-30T12:18:57.223101822+03:00"
<mask> name: "AdGuard Simplified Domain Names filter"
<mask> rulesCount: 24896
<mask> url: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
<mask> rules:
<mask> - '@@||yandex.ru^|'
<mask> /filtering/set_rules:
<mask> put:
<mask> tags:
<mask> - filtering
<mask> operationId: filteringSetRules
</s> Finished reworking openapi, added DHCP methods there </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml | |
# --------------------------------------------------
# Safebrowsing methods
# --------------------------------------------------
| <mask> responses:
<mask> 200:
<mask> description: OK
<mask>
<mask> /safebrowsing/enable:
<mask> post:
<mask> tags:
<mask> - safebrowsing
</s> Finished reworking openapi, added DHCP methods there </s> remove - stats
</s> add - log </s> remove - stats
</s> add - log </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" </s> remove /dhcp/check_active_dhcp:
post:
</s> add /dhcp/find_active_dhcp:
get: </s> remove /filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
examples:
# TODO: move to definitions
application/json:
enabled: false
filters:
enabled: true
id: 1
lastUpdated: "2018-10-30T12:18:57.223101822+03:00"
name: "AdGuard Simplified Domain Names filter"
rulesCount: 24896
url: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
rules:
- '@@||yandex.ru^|'
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
# --------------------------------------------------
# Parental control methods
# --------------------------------------------------
| <mask> examples:
<mask> application/json:
<mask> enabled: false
<mask>
<mask> /parental/enable:
<mask> post:
<mask> tags:
<mask> - parental
<mask> operationId: parentalEnable
<mask> summary: 'Enable parental filtering'
</s> Finished reworking openapi, added DHCP methods there </s> remove /filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
examples:
# TODO: move to definitions
application/json:
enabled: false
filters:
enabled: true
id: 1
lastUpdated: "2018-10-30T12:18:57.223101822+03:00"
name: "AdGuard Simplified Domain Names filter"
rulesCount: 24896
url: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
rules:
- '@@||yandex.ru^|'
</s> add </s> remove - stats
</s> add - log </s> remove - stats
</s> add - log | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
# --------------------------------------------------
# Safe search methods
# --------------------------------------------------
| <mask> application/json:
<mask> enabled: true
<mask> sensitivity: 13
<mask>
<mask> /safesearch/enable:
<mask> post:
<mask> tags:
<mask> - safesearch
<mask> operationId: safesearchEnable
</s> Finished reworking openapi, added DHCP methods there </s> remove /filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
examples:
# TODO: move to definitions
application/json:
enabled: false
filters:
enabled: true
id: 1
lastUpdated: "2018-10-30T12:18:57.223101822+03:00"
name: "AdGuard Simplified Domain Names filter"
rulesCount: 24896
url: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
rules:
- '@@||yandex.ru^|'
</s> add </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" </s> remove - stats
</s> add - log | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
# --------------------------------------------------
# I18N methods
# --------------------------------------------------
| <mask> examples:
<mask> application/json:
<mask> enabled: false
<mask>
<mask> /i18n/change_language:
<mask> post:
<mask> tags:
<mask> - i18n
<mask> operationId: changeLanguage
</s> Finished reworking openapi, added DHCP methods there </s> remove /filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
examples:
# TODO: move to definitions
application/json:
enabled: false
filters:
enabled: true
id: 1
lastUpdated: "2018-10-30T12:18:57.223101822+03:00"
name: "AdGuard Simplified Domain Names filter"
rulesCount: 24896
url: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
rules:
- '@@||yandex.ru^|'
</s> add </s> remove summary: "Checks if there's an active DHCP server on the network"
</s> add summary: "Searches for an active DHCP server on the network" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
<mask> text/plain:
<mask> en
<mask>
<mask> definitions:
<mask> rule:
<mask> type: string
<mask> ServerStatus:
<mask> type: "object"
<mask> description: "AdGuard Home server status and configuration"
<mask> required:
<mask> - "dns_address"
</s> Finished reworking openapi, added DHCP methods there </s> remove /filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
examples:
# TODO: move to definitions
application/json:
enabled: false
filters:
enabled: true
id: 1
lastUpdated: "2018-10-30T12:18:57.223101822+03:00"
name: "AdGuard Simplified Domain Names filter"
rulesCount: 24896
url: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt"
rules:
- '@@||yandex.ru^|'
</s> add </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml | |
DhcpSearchResult:
type: "object"
description: "Information about a DHCP server discovered in the current network"
required:
- "found"
properties:
found:
type: "boolean"
gateway_ip:
type: "string"
example: "192.168.1.1" | <mask> leases:
<mask> type: "array"
<mask> items:
<mask> $ref: "#/definitions/DhcpLease"
<mask> DnsAnswer:
<mask> type: "object"
<mask> description: "DNS answer section"
<mask> properties:
</s> Finished reworking openapi, added DHCP methods there </s> remove rule:
type: string
</s> add </s> remove - stats
</s> add - log </s> remove examples:
application/json:
found: true
gatewayIp: 192.168.1.1
</s> add schema:
$ref: "#/definitions/DhcpSearchResult"
# --------------------------------------------------
# Filtering status methods
# --------------------------------------------------
/filtering/status:
get:
tags:
- filtering
operationId: filteringStatus
summary: 'Get status of rules-based filter'
responses:
200:
description: OK
schema:
$ref: "#/definitions/FilteringStatus" </s> remove /dhcp/check_active_dhcp:
post:
</s> add /dhcp/find_active_dhcp:
get: | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fcf7b2185ee18db2fa66b2d624ba68ae634d13d3 | openapi/openapi.yaml |
github.com/likexian/whois-go v0.0.0-20190627090909-384b3df3fc49 | <mask> github.com/joomcode/errorx v0.8.0
<mask> github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
<mask> github.com/kardianos/service v0.0.0-20181115005516-4c239ee84e7b
<mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414
<mask> github.com/miekg/dns v1.1.8
<mask> github.com/sparrc/go-ping v0.0.0-20181106165434-ef3ab45e41b0
<mask> github.com/stretchr/testify v1.4.0
<mask> go.etcd.io/bbolt v1.3.3
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove // Priority: etc/hosts > DHCP > ARP > rDNS
ClientSourceRDNS clientSource = 0 // from rDNS
ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS > WHOIS
ClientSourceWHOIS clientSource = iota // from WHOIS
ClientSourceRDNS // from rDNS
ClientSourceDHCP // from DHCP
ClientSourceARP // from 'arp -a'
ClientSourceHostsFile // from /etc/hosts </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | go.mod |
github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod h1:QdfYv6y6qPA9pbBA2qXtoT8BMKha6UyNbxWGWl/9Jfk=
github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod h1:KKqSnk/VVSW8kEyO2vVCXoanzEutKdlBAPohmGXkxCk=
github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod h1:3kvONayqCaj+UgrRZGpgfXzHdMYCAO0KAt4/8n0L57Y=
github.com/likexian/gokit v0.0.0-20190604165112-68b8a4ba758c h1:KByA4IxKqqYwpqzk/P+w1DBpkPbvy3DArTP/U3LSxTQ=
github.com/likexian/gokit v0.0.0-20190604165112-68b8a4ba758c/go.mod h1:kn+nTv3tqh6yhor9BC4Lfiu58SmH8NmQ2PmEl+uM6nU=
github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod h1:Typ1BfnATYtZ/+/shXfFYLrovhFyuKvzwrdOnIDHlmg=
github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod h1:U4O1vIJvIKwbMZKUJ62lppfdvkCdVd2nfMimHK81eec=
github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod h1:3BWwtmKP9cXWwYCr5bkoVDEfLywacOv0s06OBEDpyt8=
github.com/likexian/whois-go v0.0.0-20190627090909-384b3df3fc49 h1:xGa+flE6p2UnMgxIS8bm7Q9JSt47HRuYVtwneDVnfLk=
github.com/likexian/whois-go v0.0.0-20190627090909-384b3df3fc49/go.mod h1:oR3bJMzrOb55cqTAn14DEzYFLDpSPTXJ3ORe7go9Hc8= | <mask> github.com/kardianos/service v0.0.0-20181115005516-4c239ee84e7b/go.mod h1:10UU/bEkzh2iEN6aYzbevY7J6p03KO5siTxQWXMEerg=
<mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414 h1:6wnYc2S/lVM7BvR32BM74ph7bPgqMztWopMYKgVyEho=
<mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414/go.mod h1:0AqAH3ZogsCrvrtUpvc6EtVKbc3w6xwZhkvGLuqyi3o=
<mask> github.com/markbates/oncer v0.0.0-20181014194634-05fccaae8fc4 h1:Mlji5gkcpzkqTROyE4ZxZ8hN7osunMb2RuGVrbvMvCc=
<mask> github.com/markbates/oncer v0.0.0-20181014194634-05fccaae8fc4/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
<mask> github.com/miekg/dns v1.1.8 h1:1QYRAKU3lN5cRfLCkPU08hwvLJFhvjP6MqNMmQz6ZVI=
<mask> github.com/miekg/dns v1.1.8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | go.sum |
WhoisInfo [][]string // [[key,value], ...] | <mask> FilteringEnabled bool
<mask> SafeSearchEnabled bool
<mask> SafeBrowsingEnabled bool
<mask> ParentalEnabled bool
<mask>
<mask> UseOwnBlockedServices bool // false: use global settings
<mask> BlockedServices []string
<mask> }
<mask>
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove func (clients *clientsContainer) Exists(ip string) bool {
</s> add func (clients *clientsContainer) Exists(ip string, source clientSource) bool { </s> remove import "testing"
</s> add import (
"testing"
"github.com/stretchr/testify/assert"
) </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
WhoisInfo map[string]interface{} `json:"whois_info"`
| <mask> SafeSearchEnabled bool `json:"safebrowsing_enabled"`
<mask> SafeBrowsingEnabled bool `json:"safesearch_enabled"`
<mask>
<mask> UseGlobalBlockedServices bool `json:"use_global_blocked_services"`
<mask> BlockedServices []string `json:"blocked_services"`
<mask> }
<mask>
<mask> type clientSource uint
<mask>
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove func (clients *clientsContainer) Exists(ip string) bool {
</s> add func (clients *clientsContainer) Exists(ip string, source clientSource) bool { </s> remove import "testing"
</s> add import (
"testing"
"github.com/stretchr/testify/assert"
) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
// Client sources | <mask> }
<mask>
<mask> type clientSource uint
<mask>
<mask> const (
<mask> // Priority: etc/hosts > DHCP > ARP > rDNS > WHOIS
<mask> ClientSourceWHOIS clientSource = iota // from WHOIS
<mask> ClientSourceRDNS // from rDNS
<mask> ClientSourceDHCP // from DHCP
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove // Priority: etc/hosts > DHCP > ARP > rDNS
ClientSourceRDNS clientSource = 0 // from rDNS
ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS > WHOIS
ClientSourceWHOIS clientSource = iota // from WHOIS
ClientSourceRDNS // from rDNS
ClientSourceDHCP // from DHCP
ClientSourceARP // from 'arp -a'
ClientSourceHostsFile // from /etc/hosts </s> remove Host string
Source clientSource
</s> add Host string
Source clientSource
WhoisInfo [][]string // [[key,value], ...] </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
// Priority: etc/hosts > DHCP > ARP > rDNS > WHOIS
ClientSourceWHOIS clientSource = iota // from WHOIS
ClientSourceRDNS // from rDNS
ClientSourceDHCP // from DHCP
ClientSourceARP // from 'arp -a'
ClientSourceHostsFile // from /etc/hosts | <mask>
<mask> type clientSource uint
<mask>
<mask> const (
<mask> // Priority: etc/hosts > DHCP > ARP > rDNS
<mask> ClientSourceRDNS clientSource = 0 // from rDNS
<mask> ClientSourceDHCP clientSource = 1 // from DHCP
<mask> ClientSourceARP clientSource = 2 // from 'arp -a'
<mask> ClientSourceHostsFile clientSource = 3 // from /etc/hosts
<mask> )
<mask>
<mask> // ClientHost information
<mask> type ClientHost struct {
<mask> Host string
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove Host string
Source clientSource
</s> add Host string
Source clientSource
WhoisInfo [][]string // [[key,value], ...] </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
Host string
Source clientSource
WhoisInfo [][]string // [[key,value], ...] | <mask> )
<mask>
<mask> // ClientHost information
<mask> type ClientHost struct {
<mask> Host string
<mask> Source clientSource
<mask> }
<mask>
<mask> type clientsContainer struct {
<mask> list map[string]*Client
<mask> ipIndex map[string]*Client
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client </s> remove // Priority: etc/hosts > DHCP > ARP > rDNS
ClientSourceRDNS clientSource = 0 // from rDNS
ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS > WHOIS
ClientSourceWHOIS clientSource = iota // from WHOIS
ClientSourceRDNS // from rDNS
ClientSourceDHCP // from DHCP
ClientSourceARP // from 'arp -a'
ClientSourceHostsFile // from /etc/hosts | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client | <mask> Source clientSource
<mask> }
<mask>
<mask> type clientsContainer struct {
<mask> list map[string]*Client
<mask> ipIndex map[string]*Client
<mask> ipHost map[string]ClientHost // IP -> Hostname
<mask> lock sync.Mutex
<mask> }
<mask>
<mask> // Init initializes clients container
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove Host string
Source clientSource
</s> add Host string
Source clientSource
WhoisInfo [][]string // [[key,value], ...] </s> remove // Priority: etc/hosts > DHCP > ARP > rDNS
ClientSourceRDNS clientSource = 0 // from rDNS
ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS > WHOIS
ClientSourceWHOIS clientSource = iota // from WHOIS
ClientSourceRDNS // from rDNS
ClientSourceDHCP // from DHCP
ClientSourceARP // from 'arp -a'
ClientSourceHostsFile // from /etc/hosts </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
func (clients *clientsContainer) Exists(ip string, source clientSource) bool { | <mask> return clients.list
<mask> }
<mask>
<mask> // Exists checks if client with this IP already exists
<mask> func (clients *clientsContainer) Exists(ip string) bool {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
<mask>
<mask> _, ok := clients.ipIndex[ip]
<mask> if ok {
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client </s> remove if !clients.Exists("1.1.1.1") {
t.Fatalf("clientAddHost")
}
</s> add assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true | <mask> if ok {
<mask> return true
<mask> }
<mask>
<mask> _, ok = clients.ipHost[ip]
<mask> return ok
<mask> }
<mask>
<mask> // Find searches for a client by IP
<mask> func (clients *clientsContainer) Find(ip string) (Client, bool) {
<mask> clients.lock.Lock()
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove func (clients *clientsContainer) Exists(ip string) bool {
</s> add func (clients *clientsContainer) Exists(ip string, source clientSource) bool { </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { </s> remove Host: host,
Source: source,
</s> add Host: host,
Source: source,
WhoisInfo: c.WhoisInfo, </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
Host: host,
Source: source,
WhoisInfo: c.WhoisInfo, | <mask> return false, nil
<mask> }
<mask>
<mask> clients.ipHost[ip] = ClientHost{
<mask> Host: host,
<mask> Source: source,
<mask> }
<mask> log.Tracef("'%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
<mask> return true, nil
<mask> }
<mask>
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client </s> remove if clients.Exists("1.2.3.4") {
t.Fatalf("Exists")
}
if !clients.Exists("1.1.1.1") {
t.Fatalf("Exists #1")
}
if !clients.Exists("2.2.2.2") {
t.Fatalf("Exists #2")
}
</s> add assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
WhoisInfo map[string]interface{} `json:"whois_info"` | <mask> IP string `json:"ip"`
<mask> Name string `json:"name"`
<mask> Source string `json:"source"`
<mask> }
<mask>
<mask> type clientListJSON struct {
<mask> Clients []clientJSON `json:"clients"`
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove Host string
Source clientSource
</s> add Host string
Source clientSource
WhoisInfo [][]string // [[key,value], ...] </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client </s> remove // Priority: etc/hosts > DHCP > ARP > rDNS
ClientSourceRDNS clientSource = 0 // from rDNS
ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS > WHOIS
ClientSourceWHOIS clientSource = iota // from WHOIS
ClientSourceRDNS // from rDNS
ClientSourceDHCP // from DHCP
ClientSourceARP // from 'arp -a'
ClientSourceHostsFile // from /etc/hosts </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
cj.WhoisInfo = make(map[string]interface{})
for _, wi := range c.WhoisInfo {
cj.WhoisInfo[wi[0]] = wi[1]
}
| <mask> }
<mask> }
<mask>
<mask> data.Clients = append(data.Clients, cj)
<mask> }
<mask> for ip, ch := range config.clients.ipHost {
<mask> cj := clientHostJSON{
<mask> IP: ip,
<mask> Name: ch.Host,
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove Host: host,
Source: source,
</s> add Host: host,
Source: source,
WhoisInfo: c.WhoisInfo, </s> remove if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
</s> add if r := config.dnsctx.rdns.resolve("1.1.1.1"); r != "one.one.one.one" { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
case ClientSourceWHOIS:
cj.Source = "WHOIS" | <mask> case ClientSourceARP:
<mask> cj.Source = "ARP"
<mask> }
<mask>
<mask> cj.WhoisInfo = make(map[string]interface{})
<mask> for _, wi := range ch.WhoisInfo {
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true </s> remove if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
</s> add if r := config.dnsctx.rdns.resolve("1.1.1.1"); r != "one.one.one.one" { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
cj.WhoisInfo = make(map[string]interface{})
for _, wi := range ch.WhoisInfo {
cj.WhoisInfo[wi[0]] = wi[1]
}
| <mask> case ClientSourceWHOIS:
<mask> cj.Source = "WHOIS"
<mask> }
<mask> data.AutoClients = append(data.AutoClients, cj)
<mask> }
<mask> config.clients.lock.Unlock()
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> e := json.NewEncoder(w).Encode(data)
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del")
}
</s> add assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) </s> remove if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
</s> add if r := config.dnsctx.rdns.resolve("1.1.1.1"); r != "one.one.one.one" { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients.go |
import (
"testing"
"github.com/stretchr/testify/assert"
) | <mask> package home
<mask>
<mask> import "testing"
<mask>
<mask> func TestClients(t *testing.T) {
<mask> var c Client
<mask> var e error
<mask> var b bool
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
</s> add if r := config.dnsctx.rdns.resolve("1.1.1.1"); r != "one.one.one.one" { </s> remove func (clients *clientsContainer) Exists(ip string) bool {
</s> add func (clients *clientsContainer) Exists(ip string, source clientSource) bool { </s> remove if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del")
}
</s> add assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients_test.go |
assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile)) | <mask> t.Fatalf("Add - ip in use")
<mask> }
<mask>
<mask> // get
<mask> if clients.Exists("1.2.3.4") {
<mask> t.Fatalf("Exists")
<mask> }
<mask> if !clients.Exists("1.1.1.1") {
<mask> t.Fatalf("Exists #1")
<mask> }
<mask> if !clients.Exists("2.2.2.2") {
<mask> t.Fatalf("Exists #2")
<mask> }
<mask>
<mask> // failed update - no such name
<mask> c.IP = "1.2.3.0"
<mask> c.Name = "client3"
<mask> if clients.Update("client3", c) == nil {
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove if clients.Exists("1.1.1.1") || !clients.Exists("1.1.1.2") {
t.Fatalf("Exists - get after update")
}
</s> add assert.True(t, !(clients.Exists("1.1.1.1", ClientSourceHostsFile) || !clients.Exists("1.1.1.2", ClientSourceHostsFile))) </s> remove if !clients.Exists("1.1.1.1") {
t.Fatalf("clientAddHost")
}
</s> add assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del")
}
</s> add assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients_test.go |
assert.True(t, !(clients.Exists("1.1.1.1", ClientSourceHostsFile) || !clients.Exists("1.1.1.2", ClientSourceHostsFile))) | <mask> t.Fatalf("Update")
<mask> }
<mask>
<mask> // get after update
<mask> if clients.Exists("1.1.1.1") || !clients.Exists("1.1.1.2") {
<mask> t.Fatalf("Exists - get after update")
<mask> }
<mask>
<mask> // failed remove - no such name
<mask> if clients.Del("client3") {
<mask> t.Fatalf("Del - no such name")
<mask> }
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove if clients.Exists("1.2.3.4") {
t.Fatalf("Exists")
}
if !clients.Exists("1.1.1.1") {
t.Fatalf("Exists #1")
}
if !clients.Exists("2.2.2.2") {
t.Fatalf("Exists #2")
}
</s> add assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile)) </s> remove if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del")
}
</s> add assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) </s> remove if !clients.Exists("1.1.1.1") {
t.Fatalf("clientAddHost")
}
</s> add assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients_test.go |
assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) | <mask> t.Fatalf("Del - no such name")
<mask> }
<mask>
<mask> // remove
<mask> if !clients.Del("client1") || clients.Exists("1.1.1.2") {
<mask> t.Fatalf("Del")
<mask> }
<mask>
<mask> // add host client
<mask> b, e = clients.AddHost("1.1.1.1", "host", ClientSourceARP)
<mask> if !b || e != nil {
<mask> t.Fatalf("clientAddHost")
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove if clients.Exists("1.1.1.1") || !clients.Exists("1.1.1.2") {
t.Fatalf("Exists - get after update")
}
</s> add assert.True(t, !(clients.Exists("1.1.1.1", ClientSourceHostsFile) || !clients.Exists("1.1.1.2", ClientSourceHostsFile))) </s> remove if clients.Exists("1.2.3.4") {
t.Fatalf("Exists")
}
if !clients.Exists("1.1.1.1") {
t.Fatalf("Exists #1")
}
if !clients.Exists("2.2.2.2") {
t.Fatalf("Exists #2")
}
</s> add assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile)) </s> remove if !clients.Exists("1.1.1.1") {
t.Fatalf("clientAddHost")
}
</s> add assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { </s> remove if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
</s> add if r := config.dnsctx.rdns.resolve("1.1.1.1"); r != "one.one.one.one" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients_test.go |
assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile)) | <mask> t.Fatalf("clientAddHost - overwrite with new data (higher priority)")
<mask> }
<mask>
<mask> // get
<mask> if !clients.Exists("1.1.1.1") {
<mask> t.Fatalf("clientAddHost")
<mask> }
<mask> }
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove if clients.Exists("1.2.3.4") {
t.Fatalf("Exists")
}
if !clients.Exists("1.1.1.1") {
t.Fatalf("Exists #1")
}
if !clients.Exists("2.2.2.2") {
t.Fatalf("Exists #2")
}
</s> add assert.True(t, !clients.Exists("1.2.3.4", ClientSourceHostsFile))
assert.True(t, clients.Exists("1.1.1.1", ClientSourceHostsFile))
assert.True(t, clients.Exists("2.2.2.2", ClientSourceHostsFile)) </s> remove if clients.Exists("1.1.1.1") || !clients.Exists("1.1.1.2") {
t.Fatalf("Exists - get after update")
}
</s> add assert.True(t, !(clients.Exists("1.1.1.1", ClientSourceHostsFile) || !clients.Exists("1.1.1.2", ClientSourceHostsFile))) </s> remove if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del")
}
</s> add assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true </s> remove func (clients *clientsContainer) Exists(ip string) bool {
</s> add func (clients *clientsContainer) Exists(ip string, source clientSource) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/clients_test.go |
whois *Whois | <mask> rdnsIP map[string]bool
<mask> rdnsLock sync.Mutex // synchronize access to rdnsIP
<mask> upstream upstream.Upstream // Upstream object for our own DNS server
<mask> }
<mask>
<mask> // initDNSServer creates an instance of the dnsforward.Server
<mask> // Please note that we must do it even if we don't start it
<mask> // so that we had access to the query log and the stats
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove if config.clients.Exists(ip) {
</s> add if config.clients.Exists(ip, ClientSourceRDNS) { </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client </s> remove // Priority: etc/hosts > DHCP > ARP > rDNS
ClientSourceRDNS clientSource = 0 // from rDNS
ClientSourceDHCP clientSource = 1 // from DHCP
ClientSourceARP clientSource = 2 // from 'arp -a'
ClientSourceHostsFile clientSource = 3 // from /etc/hosts
</s> add // Priority: etc/hosts > DHCP > ARP > rDNS > WHOIS
ClientSourceWHOIS clientSource = iota // from WHOIS
ClientSourceRDNS // from rDNS
ClientSourceDHCP // from DHCP
ClientSourceARP // from 'arp -a'
ClientSourceHostsFile // from /etc/hosts | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/dns.go |
config.dnsctx.whois = initWhois(&config.clients) | <mask> config.auth = InitAuth(sessFilename, config.Users)
<mask> config.Users = nil
<mask>
<mask> initRDNS()
<mask> initFiltering()
<mask> }
<mask>
<mask> func isRunning() bool {
<mask> return config.dnsServer != nil && config.dnsServer.IsRunning()
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove Host: host,
Source: source,
</s> add Host: host,
Source: source,
WhoisInfo: c.WhoisInfo, </s> remove if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del")
}
</s> add assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) </s> remove if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
</s> add if r := config.dnsctx.rdns.resolve("1.1.1.1"); r != "one.one.one.one" { </s> remove func (clients *clientsContainer) Exists(ip string) bool {
</s> add func (clients *clientsContainer) Exists(ip string, source clientSource) bool { </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/dns.go |
if isPublicIP(ipAddr) {
config.dnsctx.whois.Begin(ip)
} | <mask> ipAddr := net.ParseIP(ip)
<mask> if !ipAddr.IsLoopback() {
<mask> beginAsyncRDNS(ip)
<mask> }
<mask> }
<mask>
<mask> func generateServerConfig() (dnsforward.ServerConfig, error) {
<mask> filters := []dnsfilter.Filter{}
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
</s> add if r := config.dnsctx.rdns.resolve("1.1.1.1"); r != "one.one.one.one" { </s> remove func (clients *clientsContainer) Exists(ip string) bool {
</s> add func (clients *clientsContainer) Exists(ip string, source clientSource) bool { </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/dns.go |
if r := config.dnsctx.rdns.resolve("1.1.1.1"); r != "one.one.one.one" { | <mask>
<mask> func TestResolveRDNS(t *testing.T) {
<mask> config.DNS.BindHost = "1.1.1.1"
<mask> initDNSServer(".")
<mask> if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
<mask> t.Errorf("resolveRDNS(): %s", r)
<mask> }
<mask> }
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del")
}
</s> add assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/dns_test.go |
if config.clients.Exists(ip, ClientSourceRDNS) { | <mask> }
<mask>
<mask> // Add IP address to the rDNS queue
<mask> func beginAsyncRDNS(ip string) {
<mask> if config.clients.Exists(ip) {
<mask> return
<mask> }
<mask>
<mask> // add IP to rdnsIP, if not exists
<mask> config.dnsctx.rdnsLock.Lock()
</s> + whois: add WHOIS information for a client
+ return WHOIS info in GET /clients response </s> remove _, ok = clients.ipHost[ip]
return ok
</s> add ch, ok := clients.ipHost[ip]
if !ok {
return false
}
if source > ch.Source {
return false // we're going to overwrite this client's info with a stronger source
}
return true </s> remove func (clients *clientsContainer) Exists(ip string) bool {
</s> add func (clients *clientsContainer) Exists(ip string, source clientSource) bool { </s> remove list map[string]*Client
ipIndex map[string]*Client
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client </s> remove if !clients.Del("client1") || clients.Exists("1.1.1.2") {
t.Fatalf("Del")
}
</s> add assert.True(t, !(!clients.Del("client1") || clients.Exists("1.1.1.2", ClientSourceHostsFile))) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd592b4dc89fb42cebca95cf645180edc225c287 | home/rdns.go |
// []dhcpd.Lease -> JSON
func convertLeases(inputLeases []dhcpd.Lease, includeExpires bool) []map[string]string { | <mask> )
<mask>
<mask> var dhcpServer = dhcpd.Server{}
<mask>
<mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> rawLeases := dhcpServer.Leases()
<mask> leases := []map[string]string{}
<mask> for i := range rawLeases {
<mask> lease := map[string]string{
<mask> "mac": rawLeases[i].HWAddr.String(),
<mask> "ip": rawLeases[i].IP.String(),
</s> * control: refactor: move DHCP lease -> json convertor to a separate function </s> remove for i := range rawLeases {
</s> add for _, l := range inputLeases { </s> remove "mac": rawLeases[i].HWAddr.String(),
"ip": rawLeases[i].IP.String(),
"hostname": rawLeases[i].Hostname,
"expires": rawLeases[i].Expiry.Format(time.RFC3339),
</s> add "mac": l.HWAddr.String(),
"ip": l.IP.String(),
"hostname": l.Hostname,
}
if includeExpires {
lease["expires"] = l.Expiry.Format(time.RFC3339) </s> remove leases = append(leases, lease)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd593f5282cb0e72c606b1ffc202d0cc72c07246 | dhcp.go |
for _, l := range inputLeases { | <mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> rawLeases := dhcpServer.Leases()
<mask> leases := []map[string]string{}
<mask> for i := range rawLeases {
<mask> lease := map[string]string{
<mask> "mac": rawLeases[i].HWAddr.String(),
<mask> "ip": rawLeases[i].IP.String(),
<mask> "hostname": rawLeases[i].Hostname,
<mask> "expires": rawLeases[i].Expiry.Format(time.RFC3339),
</s> * control: refactor: move DHCP lease -> json convertor to a separate function </s> remove func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
rawLeases := dhcpServer.Leases()
</s> add // []dhcpd.Lease -> JSON
func convertLeases(inputLeases []dhcpd.Lease, includeExpires bool) []map[string]string { </s> remove "mac": rawLeases[i].HWAddr.String(),
"ip": rawLeases[i].IP.String(),
"hostname": rawLeases[i].Hostname,
"expires": rawLeases[i].Expiry.Format(time.RFC3339),
</s> add "mac": l.HWAddr.String(),
"ip": l.IP.String(),
"hostname": l.Hostname,
}
if includeExpires {
lease["expires"] = l.Expiry.Format(time.RFC3339) </s> remove leases = append(leases, lease)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd593f5282cb0e72c606b1ffc202d0cc72c07246 | dhcp.go |
"mac": l.HWAddr.String(),
"ip": l.IP.String(),
"hostname": l.Hostname,
}
if includeExpires {
lease["expires"] = l.Expiry.Format(time.RFC3339) | <mask> rawLeases := dhcpServer.Leases()
<mask> leases := []map[string]string{}
<mask> for i := range rawLeases {
<mask> lease := map[string]string{
<mask> "mac": rawLeases[i].HWAddr.String(),
<mask> "ip": rawLeases[i].IP.String(),
<mask> "hostname": rawLeases[i].Hostname,
<mask> "expires": rawLeases[i].Expiry.Format(time.RFC3339),
<mask> }
<mask> leases = append(leases, lease)
<mask>
<mask> }
<mask> status := map[string]interface{}{
</s> * control: refactor: move DHCP lease -> json convertor to a separate function </s> remove leases = append(leases, lease)
</s> add </s> remove for i := range rawLeases {
</s> add for _, l := range inputLeases { </s> remove func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
rawLeases := dhcpServer.Leases()
</s> add // []dhcpd.Lease -> JSON
func convertLeases(inputLeases []dhcpd.Lease, includeExpires bool) []map[string]string { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd593f5282cb0e72c606b1ffc202d0cc72c07246 | dhcp.go |
<mask> "ip": rawLeases[i].IP.String(),
<mask> "hostname": rawLeases[i].Hostname,
<mask> "expires": rawLeases[i].Expiry.Format(time.RFC3339),
<mask> }
<mask> leases = append(leases, lease)
<mask>
<mask> }
<mask> status := map[string]interface{}{
<mask> "config": config.DHCP,
<mask> "leases": leases,
</s> * control: refactor: move DHCP lease -> json convertor to a separate function </s> remove "mac": rawLeases[i].HWAddr.String(),
"ip": rawLeases[i].IP.String(),
"hostname": rawLeases[i].Hostname,
"expires": rawLeases[i].Expiry.Format(time.RFC3339),
</s> add "mac": l.HWAddr.String(),
"ip": l.IP.String(),
"hostname": l.Hostname,
}
if includeExpires {
lease["expires"] = l.Expiry.Format(time.RFC3339) </s> remove func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
rawLeases := dhcpServer.Leases()
</s> add // []dhcpd.Lease -> JSON
func convertLeases(inputLeases []dhcpd.Lease, includeExpires bool) []map[string]string { </s> remove for i := range rawLeases {
</s> add for _, l := range inputLeases { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd593f5282cb0e72c606b1ffc202d0cc72c07246 | dhcp.go | |
leases = append(leases, lease) | <mask> lease["expires"] = l.Expiry.Format(time.RFC3339)
<mask> }
<mask>
<mask> }
<mask> return leases
<mask> }
<mask>
<mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
</s> * control: refactor: move DHCP lease -> json convertor to a separate function </s> remove "mac": rawLeases[i].HWAddr.String(),
"ip": rawLeases[i].IP.String(),
"hostname": rawLeases[i].Hostname,
"expires": rawLeases[i].Expiry.Format(time.RFC3339),
</s> add "mac": l.HWAddr.String(),
"ip": l.IP.String(),
"hostname": l.Hostname,
}
if includeExpires {
lease["expires"] = l.Expiry.Format(time.RFC3339) </s> remove func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
rawLeases := dhcpServer.Leases()
</s> add // []dhcpd.Lease -> JSON
func convertLeases(inputLeases []dhcpd.Lease, includeExpires bool) []map[string]string { </s> remove for i := range rawLeases {
</s> add for _, l := range inputLeases { </s> remove leases = append(leases, lease)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd593f5282cb0e72c606b1ffc202d0cc72c07246 | dhcp.go |
return leases
}
func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
leases := convertLeases(dhcpServer.Leases(), true) | <mask> leases = append(leases, lease)
<mask> }
<mask> status := map[string]interface{}{
<mask> "config": config.DHCP,
<mask> "leases": leases,
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
</s> * control: refactor: move DHCP lease -> json convertor to a separate function </s> remove leases = append(leases, lease)
</s> add </s> remove "mac": rawLeases[i].HWAddr.String(),
"ip": rawLeases[i].IP.String(),
"hostname": rawLeases[i].Hostname,
"expires": rawLeases[i].Expiry.Format(time.RFC3339),
</s> add "mac": l.HWAddr.String(),
"ip": l.IP.String(),
"hostname": l.Hostname,
}
if includeExpires {
lease["expires"] = l.Expiry.Format(time.RFC3339) </s> remove func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
log.Tracef("%s %v", r.Method, r.URL)
rawLeases := dhcpServer.Leases()
</s> add // []dhcpd.Lease -> JSON
func convertLeases(inputLeases []dhcpd.Lease, includeExpires bool) []map[string]string { </s> remove for i := range rawLeases {
</s> add for _, l := range inputLeases { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd593f5282cb0e72c606b1ffc202d0cc72c07246 | dhcp.go |
github.com/AdguardTeam/dnsproxy v0.33.6 | <mask>
<mask> go 1.14
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.33.5
<mask> github.com/AdguardTeam/golibs v0.4.4
<mask> github.com/AdguardTeam/urlfilter v0.13.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.0.1
<mask> github.com/fsnotify/fsnotify v1.4.9
</s> Pull request: 2225 daily freeze fix
Merge in DNS/adguard-home from 2225-fix-freezes to master
Updates #2225.
Squashed commit of the following:
commit 02a472120e9b4a0bc13129adb85eed5d9fd810a2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Dec 17 14:10:20 2020 +0300
all: go mod tidy
commit 6cfc23b780cf5da58719620ea5cd1fd3980c631e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Dec 17 14:06:28 2020 +0300
all: upd dnsproxy dependency </s> remove github.com/AdguardTeam/dnsproxy v0.33.5 h1:YTfY16lFgFqBzC3pdKalQSaeb7hjm4VvGqdksO0AoVI=
github.com/AdguardTeam/dnsproxy v0.33.5/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs=
</s> add github.com/AdguardTeam/dnsproxy v0.33.6 h1:qoYQbyiVqqFL/O6EvIVnxnDC5vBCFoWz40vlYdfZ+lI=
github.com/AdguardTeam/dnsproxy v0.33.6/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs= </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9
</s> add golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/fd7b061dd6583ff41607d21821854e09f089a218 | go.mod |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.