code_before
stringlengths 16
1.81M
| edits
stringlengths 4
328k
| next_edit
stringlengths 0
76.5k
| code_after
stringlengths 3
49.9M
| label_window
sequencelengths 4
1.81k
| instruction
stringlengths 20
51.9k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|---|---|---|
}
// nolint(gocyclo) - we need to check each JSON field separately
func (s *Server) handleSetConfig(w http.ResponseWriter, r *http.Request) {
req := dnsConfigJSON{}
js, err := jsonutil.DecodeObject(&req, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
return
}
if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
| </s> remove // nolint(gocyclo) - we need to check each JSON field separately
</s> add </s> remove return nil
</s> add return false
}
func (req *dnsConfig) checkBootstrap() (string, error) {
if req.Bootstraps == nil {
return "", nil
}
for _, boot := range *req.Bootstraps {
if boot == "" {
return boot, fmt.Errorf("invalid bootstrap server address: empty")
}
if _, err := upstream.NewResolver(boot, 0); err != nil {
return boot, fmt.Errorf("invalid bootstrap server address: %w", err)
}
}
return "", nil
}
func (req *dnsConfig) checkCacheTTL() bool {
if req.CacheMinTTL == nil && req.CacheMaxTTL == nil {
return true
}
var min, max uint32
if req.CacheMinTTL != nil {
min = *req.CacheMinTTL
}
if req.CacheMaxTTL == nil {
max = *req.CacheMaxTTL
}
return min <= max </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { </s> remove js, err := json.Marshal(resp)
if err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Marshal: %s", err)
</s> add func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
resp := s.getDNSConfig()
w.Header().Set("Content-Type", "application/json")
enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err) </s> remove _, err := upstream.NewResolver(addr, 0)
if err != nil {
return fmt.Errorf("invalid bootstrap server address: %w", err)
</s> add for _, valid := range []string{
"",
"fastest_addr",
"parallel",
} {
if *req.UpstreamMode == valid {
return true
} | req := dnsConfig{}
dec := json.NewDecoder(r.Body)
if err := dec.Decode(&req); err != nil {
httpError(r, w, http.StatusBadRequest, "json Encode: %s", err) | }
// nolint(gocyclo) - we need to check each JSON field separately
func (s *Server) handleSetConfig(w http.ResponseWriter, r *http.Request) {
req := dnsConfig{}
dec := json.NewDecoder(r.Body)
if err := dec.Decode(&req); err != nil {
httpError(r, w, http.StatusBadRequest, "json Encode: %s", err)
req := dnsConfig{}
dec := json.NewDecoder(r.Body)
if err := dec.Decode(&req); err != nil {
httpError(r, w, http.StatusBadRequest, "json Encode: %s", err)
req := dnsConfig{}
dec := json.NewDecoder(r.Body)
if err := dec.Decode(&req); err != nil {
httpError(r, w, http.StatusBadRequest, "json Encode: %s", err)
req := dnsConfig{}
dec := json.NewDecoder(r.Body)
if err := dec.Decode(&req); err != nil {
httpError(r, w, http.StatusBadRequest, "json Encode: %s", err)
return
}
if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
return
}
if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
httpError(r, w, http.StatusBadRequest, "wrong upstreams specification: %s", err)
return
}
}
| </s> remove req := dnsConfigJSON{}
js, err := jsonutil.DecodeObject(&req, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
</s> add req := dnsConfig{}
dec := json.NewDecoder(r.Body)
if err := dec.Decode(&req); err != nil {
httpError(r, w, http.StatusBadRequest, "json Encode: %s", err) </s> remove if js.Exists("bootstrap_dns") {
for _, boot := range req.Bootstraps {
if err := checkBootstrap(boot); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", boot, err)
return
}
}
</s> add if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { </s> remove // nolint(gocyclo) - we need to check each JSON field separately
</s> add </s> remove js, err := json.Marshal(resp)
if err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Marshal: %s", err)
</s> add func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
resp := s.getDNSConfig()
w.Header().Set("Content-Type", "application/json")
enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err) | if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { | httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
return
}
if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil {
if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil {
if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil {
httpError(r, w, http.StatusBadRequest, "wrong upstreams specification: %s", err)
return
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
return
}
}
if js.Exists("bootstrap_dns") {
for _, boot := range req.Bootstraps {
if err := checkBootstrap(boot); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", boot, err)
return
}
}
}
if js.Exists("blocking_mode") && !checkBlockingMode(req) {
httpError(r, w, http.StatusBadRequest, "blocking_mode: incorrect value")
return
| </s> remove if js.Exists("blocking_mode") && !checkBlockingMode(req) {
</s> add if !req.checkBlockingMode() { </s> remove if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
</s> add if !req.checkUpstreamsMode() { </s> remove if req.CacheMinTTL > req.CacheMaxTTL {
</s> add if !req.checkCacheTTL() { </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { | if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return | return
}
}
if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return
if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return
if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return
if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return
if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return
if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return
if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return
}
if js.Exists("blocking_mode") && !checkBlockingMode(req) {
httpError(r, w, http.StatusBadRequest, "blocking_mode: incorrect value")
return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
}
}
}
if js.Exists("blocking_mode") && !checkBlockingMode(req) {
httpError(r, w, http.StatusBadRequest, "blocking_mode: incorrect value")
return
}
if js.Exists("upstream_mode") &&
| </s> remove if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
</s> add if !req.checkUpstreamsMode() { </s> remove if js.Exists("bootstrap_dns") {
for _, boot := range req.Bootstraps {
if err := checkBootstrap(boot); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", boot, err)
return
}
}
</s> add if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return </s> remove if req.CacheMinTTL > req.CacheMaxTTL {
</s> add if !req.checkCacheTTL() { </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { | if !req.checkBlockingMode() { | }
}
}
if !req.checkBlockingMode() {
httpError(r, w, http.StatusBadRequest, "blocking_mode: incorrect value")
return
}
if js.Exists("upstream_mode") && | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
httpError(r, w, http.StatusBadRequest, "blocking_mode: incorrect value")
return
}
if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
if req.CacheMinTTL > req.CacheMaxTTL {
| </s> remove if req.CacheMinTTL > req.CacheMaxTTL {
</s> add if !req.checkCacheTTL() { </s> remove if js.Exists("blocking_mode") && !checkBlockingMode(req) {
</s> add if !req.checkBlockingMode() { </s> remove if js.Exists("bootstrap_dns") {
for _, boot := range req.Bootstraps {
if err := checkBootstrap(boot); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", boot, err)
return
}
}
</s> add if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { </s> remove w.Header().Set("Content-Type", "application/json")
_, _ = w.Write(js)
</s> add | if !req.checkUpstreamsMode() { | httpError(r, w, http.StatusBadRequest, "blocking_mode: incorrect value")
return
}
if !req.checkUpstreamsMode() {
if !req.checkUpstreamsMode() {
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
if req.CacheMinTTL > req.CacheMaxTTL { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
if req.CacheMinTTL > req.CacheMaxTTL {
httpError(r, w, http.StatusBadRequest, "cache_ttl_min must be less or equal than cache_ttl_max")
return
}
restart := false
| </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { </s> remove if js.Exists("upstream_mode") &&
!(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") {
</s> add if !req.checkUpstreamsMode() { </s> remove if js.Exists("bootstrap_dns") {
for _, boot := range req.Bootstraps {
if err := checkBootstrap(boot); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", boot, err)
return
}
}
</s> add if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return </s> remove if js.Exists("blocking_mode") && !checkBlockingMode(req) {
</s> add if !req.checkBlockingMode() { </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { | if !req.checkCacheTTL() { | httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value")
return
}
if !req.checkCacheTTL() {
httpError(r, w, http.StatusBadRequest, "cache_ttl_min must be less or equal than cache_ttl_max")
return
}
restart := false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
httpError(r, w, http.StatusBadRequest, "cache_ttl_min must be less or equal than cache_ttl_max")
return
}
restart := false
s.Lock()
if js.Exists("upstream_dns") {
s.conf.UpstreamDNS = req.Upstreams
restart = true
| </s> remove if req.CacheMinTTL > req.CacheMaxTTL {
</s> add if !req.checkCacheTTL() { </s> remove if js.Exists("upstream_dns") {
s.conf.UpstreamDNS = req.Upstreams
</s> add if dc.Upstreams != nil {
s.conf.UpstreamDNS = *dc.Upstreams </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { </s> remove if js.Exists("upstream_dns_file") {
s.conf.UpstreamDNSFileName = req.UpstreamsFile
</s> add if dc.UpstreamsFile != nil {
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile </s> remove if js.Exists("bootstrap_dns") {
for _, boot := range req.Bootstraps {
if err := checkBootstrap(boot); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", boot, err)
return
}
}
</s> add if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return | if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { | httpError(r, w, http.StatusBadRequest, "cache_ttl_min must be less or equal than cache_ttl_max")
return
}
if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) {
s.Lock()
if js.Exists("upstream_dns") {
s.conf.UpstreamDNS = req.Upstreams
restart = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
restart := false
s.Lock()
if js.Exists("upstream_dns") {
s.conf.UpstreamDNS = req.Upstreams
restart = true
}
if js.Exists("upstream_dns_file") {
s.conf.UpstreamDNSFileName = req.UpstreamsFile
| </s> remove if js.Exists("upstream_dns_file") {
s.conf.UpstreamDNSFileName = req.UpstreamsFile
</s> add if dc.UpstreamsFile != nil {
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { </s> remove if js.Exists("bootstrap_dns") {
s.conf.BootstrapDNS = req.Bootstraps
</s> add if dc.Bootstraps != nil {
s.conf.BootstrapDNS = *dc.Bootstraps </s> remove if js.Exists("cache_ttl_max") {
s.conf.CacheMaxTTL = req.CacheMaxTTL
</s> add if dc.CacheMaxTTL != nil {
s.conf.CacheMaxTTL = *dc.CacheMaxTTL </s> remove s.conf.Ratelimit = req.RateLimit
</s> add s.conf.Ratelimit = *dc.RateLimit | if dc.Upstreams != nil {
s.conf.UpstreamDNS = *dc.Upstreams |
restart := false
s.Lock()
if dc.Upstreams != nil {
s.conf.UpstreamDNS = *dc.Upstreams
if dc.Upstreams != nil {
s.conf.UpstreamDNS = *dc.Upstreams
restart = true
}
if js.Exists("upstream_dns_file") {
s.conf.UpstreamDNSFileName = req.UpstreamsFile | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
s.conf.UpstreamDNS = req.Upstreams
restart = true
}
if js.Exists("upstream_dns_file") {
s.conf.UpstreamDNSFileName = req.UpstreamsFile
restart = true
}
if js.Exists("bootstrap_dns") {
s.conf.BootstrapDNS = req.Bootstraps
| </s> remove if js.Exists("bootstrap_dns") {
s.conf.BootstrapDNS = req.Bootstraps
</s> add if dc.Bootstraps != nil {
s.conf.BootstrapDNS = *dc.Bootstraps </s> remove if js.Exists("upstream_dns") {
s.conf.UpstreamDNS = req.Upstreams
</s> add if dc.Upstreams != nil {
s.conf.UpstreamDNS = *dc.Upstreams </s> remove if js.Exists("protection_enabled") {
s.conf.ProtectionEnabled = req.ProtectionEnabled
</s> add if dc.ProtectionEnabled != nil {
s.conf.ProtectionEnabled = *dc.ProtectionEnabled </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { </s> remove s.conf.Ratelimit = req.RateLimit
</s> add s.conf.Ratelimit = *dc.RateLimit | if dc.UpstreamsFile != nil {
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile | s.conf.UpstreamDNS = req.Upstreams
restart = true
}
if dc.UpstreamsFile != nil {
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile
if dc.UpstreamsFile != nil {
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile
restart = true
}
if js.Exists("bootstrap_dns") {
s.conf.BootstrapDNS = req.Bootstraps | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
s.conf.UpstreamDNSFileName = req.UpstreamsFile
restart = true
}
if js.Exists("bootstrap_dns") {
s.conf.BootstrapDNS = req.Bootstraps
restart = true
}
if js.Exists("protection_enabled") {
s.conf.ProtectionEnabled = req.ProtectionEnabled
| </s> remove if js.Exists("upstream_dns_file") {
s.conf.UpstreamDNSFileName = req.UpstreamsFile
</s> add if dc.UpstreamsFile != nil {
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile </s> remove if js.Exists("protection_enabled") {
s.conf.ProtectionEnabled = req.ProtectionEnabled
</s> add if dc.ProtectionEnabled != nil {
s.conf.ProtectionEnabled = *dc.ProtectionEnabled </s> remove if js.Exists("upstream_dns") {
s.conf.UpstreamDNS = req.Upstreams
</s> add if dc.Upstreams != nil {
s.conf.UpstreamDNS = *dc.Upstreams </s> remove if js.Exists("blocking_mode") {
s.conf.BlockingMode = req.BlockingMode
if req.BlockingMode == "custom_ip" {
if js.Exists("blocking_ipv4") {
s.conf.BlockingIPv4 = req.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(req.BlockingIPv4)
}
if js.Exists("blocking_ipv6") {
s.conf.BlockingIPv6 = req.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(req.BlockingIPv6)
}
</s> add if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6) </s> remove s.conf.Ratelimit = req.RateLimit
</s> add s.conf.Ratelimit = *dc.RateLimit | if dc.Bootstraps != nil {
s.conf.BootstrapDNS = *dc.Bootstraps | s.conf.UpstreamDNSFileName = req.UpstreamsFile
restart = true
}
if dc.Bootstraps != nil {
s.conf.BootstrapDNS = *dc.Bootstraps
if dc.Bootstraps != nil {
s.conf.BootstrapDNS = *dc.Bootstraps
restart = true
}
if js.Exists("protection_enabled") {
s.conf.ProtectionEnabled = req.ProtectionEnabled | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
s.conf.BootstrapDNS = req.Bootstraps
restart = true
}
if js.Exists("protection_enabled") {
s.conf.ProtectionEnabled = req.ProtectionEnabled
}
if js.Exists("blocking_mode") {
s.conf.BlockingMode = req.BlockingMode
if req.BlockingMode == "custom_ip" {
| </s> remove if js.Exists("blocking_mode") {
s.conf.BlockingMode = req.BlockingMode
if req.BlockingMode == "custom_ip" {
if js.Exists("blocking_ipv4") {
s.conf.BlockingIPv4 = req.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(req.BlockingIPv4)
}
if js.Exists("blocking_ipv6") {
s.conf.BlockingIPv6 = req.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(req.BlockingIPv6)
}
</s> add if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6) </s> remove if js.Exists("bootstrap_dns") {
s.conf.BootstrapDNS = req.Bootstraps
</s> add if dc.Bootstraps != nil {
s.conf.BootstrapDNS = *dc.Bootstraps </s> remove if js.Exists("upstream_dns_file") {
s.conf.UpstreamDNSFileName = req.UpstreamsFile
</s> add if dc.UpstreamsFile != nil {
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile </s> remove func checkBlockingMode(req dnsConfigJSON) bool {
bm := req.BlockingMode
if !(bm == "default" || bm == "refused" || bm == "nxdomain" || bm == "null_ip" || bm == "custom_ip") {
return false
</s> add func (req *dnsConfig) checkBlockingMode() bool {
if req.BlockingMode == nil {
return true | if dc.ProtectionEnabled != nil {
s.conf.ProtectionEnabled = *dc.ProtectionEnabled | s.conf.BootstrapDNS = req.Bootstraps
restart = true
}
if dc.ProtectionEnabled != nil {
s.conf.ProtectionEnabled = *dc.ProtectionEnabled
if dc.ProtectionEnabled != nil {
s.conf.ProtectionEnabled = *dc.ProtectionEnabled
}
if js.Exists("blocking_mode") {
s.conf.BlockingMode = req.BlockingMode
if req.BlockingMode == "custom_ip" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
if js.Exists("protection_enabled") {
s.conf.ProtectionEnabled = req.ProtectionEnabled
}
if js.Exists("blocking_mode") {
s.conf.BlockingMode = req.BlockingMode
if req.BlockingMode == "custom_ip" {
if js.Exists("blocking_ipv4") {
s.conf.BlockingIPv4 = req.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(req.BlockingIPv4)
}
if js.Exists("blocking_ipv6") {
s.conf.BlockingIPv6 = req.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(req.BlockingIPv6)
}
}
}
if js.Exists("ratelimit") {
if s.conf.Ratelimit != req.RateLimit {
| </s> remove if js.Exists("protection_enabled") {
s.conf.ProtectionEnabled = req.ProtectionEnabled
</s> add if dc.ProtectionEnabled != nil {
s.conf.ProtectionEnabled = *dc.ProtectionEnabled </s> remove if js.Exists("ratelimit") {
if s.conf.Ratelimit != req.RateLimit {
</s> add if dc.RateLimit != nil {
if s.conf.Ratelimit != *dc.RateLimit { </s> remove s.conf.Ratelimit = req.RateLimit
</s> add s.conf.Ratelimit = *dc.RateLimit </s> remove ip := net.ParseIP(req.BlockingIPv4)
if ip == nil || ip.To4() == nil {
</s> add if req.BlockingIPv4 == nil || req.BlockingIPv6 == nil { </s> remove if js.Exists("bootstrap_dns") {
s.conf.BootstrapDNS = req.Bootstraps
</s> add if dc.Bootstraps != nil {
s.conf.BootstrapDNS = *dc.Bootstraps | if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6) | if js.Exists("protection_enabled") {
s.conf.ProtectionEnabled = req.ProtectionEnabled
}
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
}
}
if js.Exists("ratelimit") {
if s.conf.Ratelimit != req.RateLimit { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
}
}
}
if js.Exists("ratelimit") {
if s.conf.Ratelimit != req.RateLimit {
restart = true
}
s.conf.Ratelimit = req.RateLimit
}
| </s> remove s.conf.Ratelimit = req.RateLimit
</s> add s.conf.Ratelimit = *dc.RateLimit </s> remove if js.Exists("edns_cs_enabled") {
s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
</s> add if dc.EDNSCSEnabled != nil {
s.conf.EnableEDNSClientSubnet = *dc.EDNSCSEnabled </s> remove if js.Exists("blocking_mode") {
s.conf.BlockingMode = req.BlockingMode
if req.BlockingMode == "custom_ip" {
if js.Exists("blocking_ipv4") {
s.conf.BlockingIPv4 = req.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(req.BlockingIPv4)
}
if js.Exists("blocking_ipv6") {
s.conf.BlockingIPv6 = req.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(req.BlockingIPv6)
}
</s> add if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6) </s> remove if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
</s> add if dc.DNSSECEnabled != nil {
s.conf.EnableDNSSEC = *dc.DNSSECEnabled </s> remove if js.Exists("upstream_dns_file") {
s.conf.UpstreamDNSFileName = req.UpstreamsFile
</s> add if dc.UpstreamsFile != nil {
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile | if dc.RateLimit != nil {
if s.conf.Ratelimit != *dc.RateLimit { | }
}
}
if dc.RateLimit != nil {
if s.conf.Ratelimit != *dc.RateLimit {
if dc.RateLimit != nil {
if s.conf.Ratelimit != *dc.RateLimit {
restart = true
}
s.conf.Ratelimit = req.RateLimit
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
if js.Exists("ratelimit") {
if s.conf.Ratelimit != req.RateLimit {
restart = true
}
s.conf.Ratelimit = req.RateLimit
}
if js.Exists("edns_cs_enabled") {
s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
restart = true
| </s> remove if js.Exists("edns_cs_enabled") {
s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
</s> add if dc.EDNSCSEnabled != nil {
s.conf.EnableEDNSClientSubnet = *dc.EDNSCSEnabled </s> remove if js.Exists("ratelimit") {
if s.conf.Ratelimit != req.RateLimit {
</s> add if dc.RateLimit != nil {
if s.conf.Ratelimit != *dc.RateLimit { </s> remove if js.Exists("blocking_mode") {
s.conf.BlockingMode = req.BlockingMode
if req.BlockingMode == "custom_ip" {
if js.Exists("blocking_ipv4") {
s.conf.BlockingIPv4 = req.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(req.BlockingIPv4)
}
if js.Exists("blocking_ipv6") {
s.conf.BlockingIPv6 = req.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(req.BlockingIPv6)
}
</s> add if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6) </s> remove if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
</s> add if dc.DNSSECEnabled != nil {
s.conf.EnableDNSSEC = *dc.DNSSECEnabled </s> remove if js.Exists("bootstrap_dns") {
s.conf.BootstrapDNS = req.Bootstraps
</s> add if dc.Bootstraps != nil {
s.conf.BootstrapDNS = *dc.Bootstraps | s.conf.Ratelimit = *dc.RateLimit | if js.Exists("ratelimit") {
if s.conf.Ratelimit != req.RateLimit {
restart = true
}
s.conf.Ratelimit = *dc.RateLimit
}
if js.Exists("edns_cs_enabled") {
s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
restart = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
}
s.conf.Ratelimit = req.RateLimit
}
if js.Exists("edns_cs_enabled") {
s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
restart = true
}
if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
| </s> remove s.conf.Ratelimit = req.RateLimit
</s> add s.conf.Ratelimit = *dc.RateLimit </s> remove if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
</s> add if dc.DNSSECEnabled != nil {
s.conf.EnableDNSSEC = *dc.DNSSECEnabled </s> remove if js.Exists("disable_ipv6") {
s.conf.AAAADisabled = req.DisableIPv6
</s> add if dc.DisableIPv6 != nil {
s.conf.AAAADisabled = *dc.DisableIPv6 </s> remove if js.Exists("ratelimit") {
if s.conf.Ratelimit != req.RateLimit {
</s> add if dc.RateLimit != nil {
if s.conf.Ratelimit != *dc.RateLimit { </s> remove if js.Exists("blocking_mode") {
s.conf.BlockingMode = req.BlockingMode
if req.BlockingMode == "custom_ip" {
if js.Exists("blocking_ipv4") {
s.conf.BlockingIPv4 = req.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(req.BlockingIPv4)
}
if js.Exists("blocking_ipv6") {
s.conf.BlockingIPv6 = req.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(req.BlockingIPv6)
}
</s> add if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6) | if dc.EDNSCSEnabled != nil {
s.conf.EnableEDNSClientSubnet = *dc.EDNSCSEnabled | }
s.conf.Ratelimit = req.RateLimit
}
if dc.EDNSCSEnabled != nil {
s.conf.EnableEDNSClientSubnet = *dc.EDNSCSEnabled
if dc.EDNSCSEnabled != nil {
s.conf.EnableEDNSClientSubnet = *dc.EDNSCSEnabled
restart = true
}
if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
restart = true
}
if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
}
if js.Exists("disable_ipv6") {
s.conf.AAAADisabled = req.DisableIPv6
}
| </s> remove if js.Exists("disable_ipv6") {
s.conf.AAAADisabled = req.DisableIPv6
</s> add if dc.DisableIPv6 != nil {
s.conf.AAAADisabled = *dc.DisableIPv6 </s> remove if js.Exists("edns_cs_enabled") {
s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
</s> add if dc.EDNSCSEnabled != nil {
s.conf.EnableEDNSClientSubnet = *dc.EDNSCSEnabled </s> remove if js.Exists("cache_size") {
s.conf.CacheSize = req.CacheSize
</s> add if dc.CacheSize != nil {
s.conf.CacheSize = *dc.CacheSize </s> remove s.conf.Ratelimit = req.RateLimit
</s> add s.conf.Ratelimit = *dc.RateLimit </s> remove resp.Upstreams = stringArrayDup(s.conf.UpstreamDNS)
resp.UpstreamsFile = s.conf.UpstreamDNSFileName
resp.Bootstraps = stringArrayDup(s.conf.BootstrapDNS)
resp.ProtectionEnabled = s.conf.ProtectionEnabled
resp.BlockingMode = s.conf.BlockingMode
resp.BlockingIPv4 = s.conf.BlockingIPv4
resp.BlockingIPv6 = s.conf.BlockingIPv6
resp.RateLimit = s.conf.Ratelimit
resp.EDNSCSEnabled = s.conf.EnableEDNSClientSubnet
resp.DNSSECEnabled = s.conf.EnableDNSSEC
resp.DisableIPv6 = s.conf.AAAADisabled
resp.CacheSize = s.conf.CacheSize
resp.CacheMinTTL = s.conf.CacheMinTTL
resp.CacheMaxTTL = s.conf.CacheMaxTTL
</s> add upstreams := stringArrayDup(s.conf.UpstreamDNS)
upstreamFile := s.conf.UpstreamDNSFileName
bootstraps := stringArrayDup(s.conf.BootstrapDNS)
protectionEnabled := s.conf.ProtectionEnabled
blockingMode := s.conf.BlockingMode
BlockingIPv4 := s.conf.BlockingIPv4
BlockingIPv6 := s.conf.BlockingIPv6
Ratelimit := s.conf.Ratelimit
EnableEDNSClientSubnet := s.conf.EnableEDNSClientSubnet
EnableDNSSEC := s.conf.EnableDNSSEC
AAAADisabled := s.conf.AAAADisabled
CacheSize := s.conf.CacheSize
CacheMinTTL := s.conf.CacheMinTTL
CacheMaxTTL := s.conf.CacheMaxTTL
var upstreamMode string | if dc.DNSSECEnabled != nil {
s.conf.EnableDNSSEC = *dc.DNSSECEnabled | s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
restart = true
}
if dc.DNSSECEnabled != nil {
s.conf.EnableDNSSEC = *dc.DNSSECEnabled
if dc.DNSSECEnabled != nil {
s.conf.EnableDNSSEC = *dc.DNSSECEnabled
}
if js.Exists("disable_ipv6") {
s.conf.AAAADisabled = req.DisableIPv6
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
}
if js.Exists("disable_ipv6") {
s.conf.AAAADisabled = req.DisableIPv6
}
if js.Exists("cache_size") {
s.conf.CacheSize = req.CacheSize
restart = true
| </s> remove if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
</s> add if dc.DNSSECEnabled != nil {
s.conf.EnableDNSSEC = *dc.DNSSECEnabled </s> remove if js.Exists("cache_size") {
s.conf.CacheSize = req.CacheSize
</s> add if dc.CacheSize != nil {
s.conf.CacheSize = *dc.CacheSize </s> remove if js.Exists("edns_cs_enabled") {
s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
</s> add if dc.EDNSCSEnabled != nil {
s.conf.EnableEDNSClientSubnet = *dc.EDNSCSEnabled </s> remove if js.Exists("cache_ttl_min") {
s.conf.CacheMinTTL = req.CacheMinTTL
</s> add if dc.CacheMinTTL != nil {
s.conf.CacheMinTTL = *dc.CacheMinTTL </s> remove resp.Upstreams = stringArrayDup(s.conf.UpstreamDNS)
resp.UpstreamsFile = s.conf.UpstreamDNSFileName
resp.Bootstraps = stringArrayDup(s.conf.BootstrapDNS)
resp.ProtectionEnabled = s.conf.ProtectionEnabled
resp.BlockingMode = s.conf.BlockingMode
resp.BlockingIPv4 = s.conf.BlockingIPv4
resp.BlockingIPv6 = s.conf.BlockingIPv6
resp.RateLimit = s.conf.Ratelimit
resp.EDNSCSEnabled = s.conf.EnableEDNSClientSubnet
resp.DNSSECEnabled = s.conf.EnableDNSSEC
resp.DisableIPv6 = s.conf.AAAADisabled
resp.CacheSize = s.conf.CacheSize
resp.CacheMinTTL = s.conf.CacheMinTTL
resp.CacheMaxTTL = s.conf.CacheMaxTTL
</s> add upstreams := stringArrayDup(s.conf.UpstreamDNS)
upstreamFile := s.conf.UpstreamDNSFileName
bootstraps := stringArrayDup(s.conf.BootstrapDNS)
protectionEnabled := s.conf.ProtectionEnabled
blockingMode := s.conf.BlockingMode
BlockingIPv4 := s.conf.BlockingIPv4
BlockingIPv6 := s.conf.BlockingIPv6
Ratelimit := s.conf.Ratelimit
EnableEDNSClientSubnet := s.conf.EnableEDNSClientSubnet
EnableDNSSEC := s.conf.EnableDNSSEC
AAAADisabled := s.conf.AAAADisabled
CacheSize := s.conf.CacheSize
CacheMinTTL := s.conf.CacheMinTTL
CacheMaxTTL := s.conf.CacheMaxTTL
var upstreamMode string | if dc.DisableIPv6 != nil {
s.conf.AAAADisabled = *dc.DisableIPv6 | if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
}
if dc.DisableIPv6 != nil {
s.conf.AAAADisabled = *dc.DisableIPv6
if dc.DisableIPv6 != nil {
s.conf.AAAADisabled = *dc.DisableIPv6
}
if js.Exists("cache_size") {
s.conf.CacheSize = req.CacheSize
restart = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
if js.Exists("disable_ipv6") {
s.conf.AAAADisabled = req.DisableIPv6
}
if js.Exists("cache_size") {
s.conf.CacheSize = req.CacheSize
restart = true
}
if js.Exists("cache_ttl_min") {
s.conf.CacheMinTTL = req.CacheMinTTL
| </s> remove if js.Exists("disable_ipv6") {
s.conf.AAAADisabled = req.DisableIPv6
</s> add if dc.DisableIPv6 != nil {
s.conf.AAAADisabled = *dc.DisableIPv6 </s> remove if js.Exists("cache_ttl_min") {
s.conf.CacheMinTTL = req.CacheMinTTL
</s> add if dc.CacheMinTTL != nil {
s.conf.CacheMinTTL = *dc.CacheMinTTL </s> remove if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
</s> add if dc.DNSSECEnabled != nil {
s.conf.EnableDNSSEC = *dc.DNSSECEnabled </s> remove if js.Exists("cache_ttl_max") {
s.conf.CacheMaxTTL = req.CacheMaxTTL
</s> add if dc.CacheMaxTTL != nil {
s.conf.CacheMaxTTL = *dc.CacheMaxTTL </s> remove resp.UpstreamMode = "fastest_addr"
</s> add upstreamMode = "fastest_addr" | if dc.CacheSize != nil {
s.conf.CacheSize = *dc.CacheSize | if js.Exists("disable_ipv6") {
s.conf.AAAADisabled = req.DisableIPv6
}
if dc.CacheSize != nil {
s.conf.CacheSize = *dc.CacheSize
if dc.CacheSize != nil {
s.conf.CacheSize = *dc.CacheSize
restart = true
}
if js.Exists("cache_ttl_min") {
s.conf.CacheMinTTL = req.CacheMinTTL | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
s.conf.CacheSize = req.CacheSize
restart = true
}
if js.Exists("cache_ttl_min") {
s.conf.CacheMinTTL = req.CacheMinTTL
restart = true
}
if js.Exists("cache_ttl_max") {
s.conf.CacheMaxTTL = req.CacheMaxTTL
| </s> remove if js.Exists("cache_ttl_max") {
s.conf.CacheMaxTTL = req.CacheMaxTTL
</s> add if dc.CacheMaxTTL != nil {
s.conf.CacheMaxTTL = *dc.CacheMaxTTL </s> remove if js.Exists("cache_size") {
s.conf.CacheSize = req.CacheSize
</s> add if dc.CacheSize != nil {
s.conf.CacheSize = *dc.CacheSize </s> remove if js.Exists("disable_ipv6") {
s.conf.AAAADisabled = req.DisableIPv6
</s> add if dc.DisableIPv6 != nil {
s.conf.AAAADisabled = *dc.DisableIPv6 </s> remove if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
</s> add if dc.UpstreamMode != nil {
switch *dc.UpstreamMode { </s> remove resp.UpstreamMode = "fastest_addr"
</s> add upstreamMode = "fastest_addr" | if dc.CacheMinTTL != nil {
s.conf.CacheMinTTL = *dc.CacheMinTTL | s.conf.CacheSize = req.CacheSize
restart = true
}
if dc.CacheMinTTL != nil {
s.conf.CacheMinTTL = *dc.CacheMinTTL
if dc.CacheMinTTL != nil {
s.conf.CacheMinTTL = *dc.CacheMinTTL
restart = true
}
if js.Exists("cache_ttl_max") {
s.conf.CacheMaxTTL = req.CacheMaxTTL | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
s.conf.CacheMinTTL = req.CacheMinTTL
restart = true
}
if js.Exists("cache_ttl_max") {
s.conf.CacheMaxTTL = req.CacheMaxTTL
restart = true
}
if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
| </s> remove if js.Exists("cache_ttl_min") {
s.conf.CacheMinTTL = req.CacheMinTTL
</s> add if dc.CacheMinTTL != nil {
s.conf.CacheMinTTL = *dc.CacheMinTTL </s> remove if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
</s> add if dc.UpstreamMode != nil {
switch *dc.UpstreamMode { </s> remove if js.Exists("cache_size") {
s.conf.CacheSize = req.CacheSize
</s> add if dc.CacheSize != nil {
s.conf.CacheSize = *dc.CacheSize </s> remove resp.UpstreamMode = "fastest_addr"
</s> add upstreamMode = "fastest_addr" </s> remove s.conf.Ratelimit = req.RateLimit
</s> add s.conf.Ratelimit = *dc.RateLimit | if dc.CacheMaxTTL != nil {
s.conf.CacheMaxTTL = *dc.CacheMaxTTL | s.conf.CacheMinTTL = req.CacheMinTTL
restart = true
}
if dc.CacheMaxTTL != nil {
s.conf.CacheMaxTTL = *dc.CacheMaxTTL
if dc.CacheMaxTTL != nil {
s.conf.CacheMaxTTL = *dc.CacheMaxTTL
restart = true
}
if js.Exists("upstream_mode") {
s.conf.FastestAddr = false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
s.conf.CacheMaxTTL = req.CacheMaxTTL
restart = true
}
if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true
case "fastest_addr":
s.conf.FastestAddr = true
| </s> remove
</s> add s.conf.FastestAddr = false </s> remove if js.Exists("cache_ttl_max") {
s.conf.CacheMaxTTL = req.CacheMaxTTL
</s> add if dc.CacheMaxTTL != nil {
s.conf.CacheMaxTTL = *dc.CacheMaxTTL </s> remove resp.UpstreamMode = "fastest_addr"
</s> add upstreamMode = "fastest_addr" | if dc.UpstreamMode != nil {
switch *dc.UpstreamMode { | s.conf.CacheMaxTTL = req.CacheMaxTTL
restart = true
}
if dc.UpstreamMode != nil {
switch *dc.UpstreamMode {
if dc.UpstreamMode != nil {
switch *dc.UpstreamMode {
if dc.UpstreamMode != nil {
switch *dc.UpstreamMode {
if dc.UpstreamMode != nil {
switch *dc.UpstreamMode {
if dc.UpstreamMode != nil {
switch *dc.UpstreamMode {
if dc.UpstreamMode != nil {
switch *dc.UpstreamMode {
if dc.UpstreamMode != nil {
switch *dc.UpstreamMode {
case "parallel":
s.conf.AllServers = true
case "fastest_addr":
s.conf.FastestAddr = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
//
case "parallel":
s.conf.AllServers = true
case "fastest_addr":
s.conf.FastestAddr = true
}
}
| </s> remove if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
</s> add if dc.UpstreamMode != nil {
switch *dc.UpstreamMode { </s> remove resp.UpstreamMode = "fastest_addr"
</s> add upstreamMode = "fastest_addr" </s> remove resp.UpstreamMode = "parallel"
</s> add upstreamMode = "parallel" | s.conf.FastestAddr = false | //
case "parallel":
s.conf.AllServers = true
s.conf.FastestAddr = false
case "fastest_addr":
s.conf.FastestAddr = true
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
s.conf.FastestAddr = false
case "fastest_addr":
s.conf.FastestAddr = true
default:
s.conf.AllServers = false
s.conf.FastestAddr = false
}
}
| </s> remove
</s> add s.conf.FastestAddr = false </s> remove if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
</s> add if dc.UpstreamMode != nil {
switch *dc.UpstreamMode { </s> remove if js.Exists("cache_ttl_max") {
s.conf.CacheMaxTTL = req.CacheMaxTTL
</s> add if dc.CacheMaxTTL != nil {
s.conf.CacheMaxTTL = *dc.CacheMaxTTL </s> remove resp.UpstreamMode = "fastest_addr"
</s> add upstreamMode = "fastest_addr" | s.conf.AllServers = false | s.conf.FastestAddr = false
case "fastest_addr":
s.conf.AllServers = false
s.conf.FastestAddr = true
default:
s.conf.AllServers = false
s.conf.FastestAddr = false
}
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
case "fastest_addr":
s.conf.AllServers = false
s.conf.FastestAddr = true
}
}
s.Unlock()
s.conf.ConfigModified()
return restart
| </s> remove
</s> add s.conf.FastestAddr = false </s> remove if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
</s> add if dc.UpstreamMode != nil {
switch *dc.UpstreamMode { </s> remove
if restart {
err = s.Reconfigure(nil)
if err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
</s> add return restart </s> remove if js.Exists("cache_ttl_max") {
s.conf.CacheMaxTTL = req.CacheMaxTTL
</s> add if dc.CacheMaxTTL != nil {
s.conf.CacheMaxTTL = *dc.CacheMaxTTL | default:
s.conf.AllServers = false
s.conf.FastestAddr = false | case "fastest_addr":
s.conf.AllServers = false
s.conf.FastestAddr = true
default:
s.conf.AllServers = false
s.conf.FastestAddr = false
}
}
s.Unlock()
s.conf.ConfigModified()
return restart | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
}
s.Unlock()
s.conf.ConfigModified()
if restart {
err = s.Reconfigure(nil)
if err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
type upstreamJSON struct {
Upstreams []string `json:"upstream_dns"` // Upstreams
BootstrapDNS []string `json:"bootstrap_dns"` // Bootstrap DNS
| </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { </s> remove type dnsConfigJSON struct {
Upstreams []string `json:"upstream_dns"`
UpstreamsFile string `json:"upstream_dns_file"`
Bootstraps []string `json:"bootstrap_dns"`
ProtectionEnabled bool `json:"protection_enabled"`
RateLimit uint32 `json:"ratelimit"`
BlockingMode string `json:"blocking_mode"`
BlockingIPv4 string `json:"blocking_ipv4"`
BlockingIPv6 string `json:"blocking_ipv6"`
EDNSCSEnabled bool `json:"edns_cs_enabled"`
DNSSECEnabled bool `json:"dnssec_enabled"`
DisableIPv6 bool `json:"disable_ipv6"`
UpstreamMode string `json:"upstream_mode"`
CacheSize uint32 `json:"cache_size"`
CacheMinTTL uint32 `json:"cache_ttl_min"`
CacheMaxTTL uint32 `json:"cache_ttl_max"`
</s> add type dnsConfig struct {
Upstreams *[]string `json:"upstream_dns"`
UpstreamsFile *string `json:"upstream_dns_file"`
Bootstraps *[]string `json:"bootstrap_dns"`
ProtectionEnabled *bool `json:"protection_enabled"`
RateLimit *uint32 `json:"ratelimit"`
BlockingMode *string `json:"blocking_mode"`
BlockingIPv4 *string `json:"blocking_ipv4"`
BlockingIPv6 *string `json:"blocking_ipv6"`
EDNSCSEnabled *bool `json:"edns_cs_enabled"`
DNSSECEnabled *bool `json:"dnssec_enabled"`
DisableIPv6 *bool `json:"disable_ipv6"`
UpstreamMode *string `json:"upstream_mode"`
CacheSize *uint32 `json:"cache_size"`
CacheMinTTL *uint32 `json:"cache_ttl_min"`
CacheMaxTTL *uint32 `json:"cache_ttl_max"` </s> remove js, err := json.Marshal(resp)
if err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Marshal: %s", err)
</s> add func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
resp := s.getDNSConfig()
w.Header().Set("Content-Type", "application/json")
enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err) </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { </s> remove if js.Exists("bootstrap_dns") {
for _, boot := range req.Bootstraps {
if err := checkBootstrap(boot); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", boot, err)
return
}
}
</s> add if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return | return restart | }
s.Unlock()
s.conf.ConfigModified()
return restart
return restart
return restart
return restart
return restart
return restart
return restart
return restart
}
type upstreamJSON struct {
Upstreams []string `json:"upstream_dns"` // Upstreams
BootstrapDNS []string `json:"bootstrap_dns"` // Bootstrap DNS | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http.go |
name: "all_right",
conf: func() ServerConfig {
return defaultConf
},
want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "fastest_addr",
conf: func() ServerConfig {
conf := defaultConf
conf.FastestAddr = true
| </s> remove want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | name: "all_right",
conf: func() ServerConfig {
return defaultConf
},
want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "fastest_addr",
conf: func() ServerConfig {
conf := defaultConf
conf.FastestAddr = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
conf := defaultConf
conf.FastestAddr = true
return conf
},
want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "parallel",
conf: func() ServerConfig {
conf := defaultConf
conf.AllServers = true
| </s> remove want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil | want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | conf := defaultConf
conf.FastestAddr = true
return conf
},
want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "parallel",
conf: func() ServerConfig {
conf := defaultConf
conf.AllServers = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
conf := defaultConf
conf.AllServers = true
return conf
},
want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.conf = tc.conf()
| </s> remove want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil </s> remove a2 = convertMapToArray(m, maxDomains)
d["top_blocked_domains"] = convertTopArray(a2)
</s> add </s> remove a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
</s> add | want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | conf := defaultConf
conf.AllServers = true
return conf
},
want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s.conf = tc.conf() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}()
w := httptest.NewRecorder()
const defaultConfJSON = "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}"
testCases := []struct {
name string
req string
wantSet string
wantGet string
| </s> remove CertificatePath string `yaml:"certificate_path" json:"certificate_path"` // certificate file name
PrivateKeyPath string `yaml:"private_key_path" json:"private_key_path"` // private key file name
</s> add // PEM-encoded certificates chain
CertificateChain string `yaml:"certificate_chain" json:"certificate_chain"`
// PEM-encoded private key
PrivateKey string `yaml:"private_key" json:"private_key"`
CertificatePath string `yaml:"certificate_path" json:"certificate_path"`
PrivateKeyPath string `yaml:"private_key_path" json:"private_key_path"` </s> remove CertificateChain string `yaml:"certificate_chain" json:"certificate_chain"` // PEM-encoded certificates chain
PrivateKey string `yaml:"private_key" json:"private_key"` // PEM-encoded private key
</s> add // Reject connection if the client uses server name (in SNI) that doesn't match the certificate
StrictSNICheck bool `yaml:"strict_sni_check" json:"-"` </s> remove StrictSNICheck bool `yaml:"strict_sni_check" json:"-"` // Reject connection if the client uses server name (in SNI) that doesn't match the certificate
</s> add </s> remove func getSession(u *User) []byte {
// the developers don't currently believe that using a
// non-cryptographic RNG for the session hash salt is
// insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
</s> add func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash)) </s> remove type dnsConfigJSON struct {
Upstreams []string `json:"upstream_dns"`
UpstreamsFile string `json:"upstream_dns_file"`
Bootstraps []string `json:"bootstrap_dns"`
ProtectionEnabled bool `json:"protection_enabled"`
RateLimit uint32 `json:"ratelimit"`
BlockingMode string `json:"blocking_mode"`
BlockingIPv4 string `json:"blocking_ipv4"`
BlockingIPv6 string `json:"blocking_ipv6"`
EDNSCSEnabled bool `json:"edns_cs_enabled"`
DNSSECEnabled bool `json:"dnssec_enabled"`
DisableIPv6 bool `json:"disable_ipv6"`
UpstreamMode string `json:"upstream_mode"`
CacheSize uint32 `json:"cache_size"`
CacheMinTTL uint32 `json:"cache_ttl_min"`
CacheMaxTTL uint32 `json:"cache_ttl_max"`
</s> add type dnsConfig struct {
Upstreams *[]string `json:"upstream_dns"`
UpstreamsFile *string `json:"upstream_dns_file"`
Bootstraps *[]string `json:"bootstrap_dns"`
ProtectionEnabled *bool `json:"protection_enabled"`
RateLimit *uint32 `json:"ratelimit"`
BlockingMode *string `json:"blocking_mode"`
BlockingIPv4 *string `json:"blocking_ipv4"`
BlockingIPv6 *string `json:"blocking_ipv6"`
EDNSCSEnabled *bool `json:"edns_cs_enabled"`
DNSSECEnabled *bool `json:"dnssec_enabled"`
DisableIPv6 *bool `json:"disable_ipv6"`
UpstreamMode *string `json:"upstream_mode"`
CacheSize *uint32 `json:"cache_size"`
CacheMinTTL *uint32 `json:"cache_ttl_min"`
CacheMaxTTL *uint32 `json:"cache_ttl_max"` | const defaultConfJSON = "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n" | }()
w := httptest.NewRecorder()
const defaultConfJSON = "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n"
testCases := []struct {
name string
req string
wantSet string
wantGet string | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}{{
name: "upstream_dns",
req: "{\"upstream_dns\":[\"8.8.8.8:77\",\"8.8.4.4:77\"]}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:77\",\"8.8.4.4:77\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "bootstraps",
req: "{\"bootstrap_dns\":[\"9.9.9.10\"]}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:77\",\"8.8.4.4:77\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }{{
name: "upstream_dns",
req: "{\"upstream_dns\":[\"8.8.8.8:77\",\"8.8.4.4:77\"]}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:77\",\"8.8.4.4:77\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "bootstraps",
req: "{\"bootstrap_dns\":[\"9.9.9.10\"]}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}, {
name: "bootstraps",
req: "{\"bootstrap_dns\":[\"9.9.9.10\"]}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "blocking_mode_good",
req: "{\"blocking_mode\":\"refused\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:77\",\"8.8.4.4:77\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:77\",\"8.8.4.4:77\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }, {
name: "bootstraps",
req: "{\"bootstrap_dns\":[\"9.9.9.10\"]}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "blocking_mode_good",
req: "{\"blocking_mode\":\"refused\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}, {
name: "blocking_mode_good",
req: "{\"blocking_mode\":\"refused\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "blocking_mode_bad",
req: "{\"blocking_mode\":\"custom_ip\"}",
wantSet: "blocking_mode: incorrect value\n",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }, {
name: "blocking_mode_good",
req: "{\"blocking_mode\":\"refused\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "blocking_mode_bad",
req: "{\"blocking_mode\":\"custom_ip\"}",
wantSet: "blocking_mode: incorrect value\n",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}, {
name: "blocking_mode_bad",
req: "{\"blocking_mode\":\"custom_ip\"}",
wantSet: "blocking_mode: incorrect value\n",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "ratelimit",
req: "{\"ratelimit\":6}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"refused\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }, {
name: "blocking_mode_bad",
req: "{\"blocking_mode\":\"custom_ip\"}",
wantSet: "blocking_mode: incorrect value\n",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "ratelimit",
req: "{\"ratelimit\":6}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}, {
name: "ratelimit",
req: "{\"ratelimit\":6}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "edns_cs_enabled",
req: "{\"edns_cs_enabled\":true}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }, {
name: "ratelimit",
req: "{\"ratelimit\":6}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "edns_cs_enabled",
req: "{\"edns_cs_enabled\":true}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}, {
name: "edns_cs_enabled",
req: "{\"edns_cs_enabled\":true}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "dnssec_enabled",
req: "{\"dnssec_enabled\":true}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }, {
name: "edns_cs_enabled",
req: "{\"edns_cs_enabled\":true}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "dnssec_enabled",
req: "{\"dnssec_enabled\":true}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}, {
name: "dnssec_enabled",
req: "{\"dnssec_enabled\":true}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "cache_size",
req: "{\"cache_size\":1024}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }, {
name: "dnssec_enabled",
req: "{\"dnssec_enabled\":true}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "cache_size",
req: "{\"cache_size\":1024}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}, {
name: "cache_size",
req: "{\"cache_size\":1024}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "upstream_mode_parallel",
req: "{\"upstream_mode\":\"parallel\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }, {
name: "cache_size",
req: "{\"cache_size\":1024}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "upstream_mode_parallel",
req: "{\"upstream_mode\":\"parallel\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}, {
name: "upstream_mode_parallel",
req: "{\"upstream_mode\":\"parallel\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "upstream_mode_fastest_addr",
req: "{\"upstream_mode\":\"fastest_addr\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }, {
name: "upstream_mode_parallel",
req: "{\"upstream_mode\":\"parallel\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "upstream_mode_fastest_addr",
req: "{\"upstream_mode\":\"fastest_addr\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
}, {
name: "upstream_mode_fastest_addr",
req: "{\"upstream_mode\":\"fastest_addr\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
}, {
name: "upstream_dns_bad",
req: "{\"upstream_dns\":[\"\"]}",
wantSet: "wrong upstreams specification: missing port in address\n",
wantGet: defaultConfJSON,
| </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"parallel\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":1024,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":true,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":true,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":6,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", | }, {
name: "upstream_mode_fastest_addr",
req: "{\"upstream_mode\":\"fastest_addr\"}",
wantSet: "",
wantGet: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n",
}, {
name: "upstream_dns_bad",
req: "{\"upstream_dns\":[\"\"]}",
wantSet: "wrong upstreams specification: missing port in address\n",
wantGet: defaultConfJSON, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/dnsforward/dnsforward_http_test.go |
package home
import (
"crypto/sha256"
"encoding/binary"
"encoding/hex"
"encoding/json"
| </s> remove "math/rand"
</s> add "math"
"math/big" </s> remove
const (
jsonTErr = iota
jsonTObj
jsonTStr
jsonTNum
jsonTBool
)
// Parse JSON key-value pair
// e.g.: "key":VALUE where VALUE is "string", true|false (boolean), or 123.456 (number)
// Note the limitations:
// . doesn't support whitespace
// . doesn't support "null"
// . doesn't validate boolean or number
// . no proper handling of {} braces
// . no handling of [] brackets
// Return (key, value, type)
func readJSON(ps *string) (string, string, int32) {
s := *ps
k := ""
v := ""
t := int32(jsonTErr)
q1 := strings.IndexByte(s, '"')
if q1 == -1 {
return k, v, t
}
q2 := strings.IndexByte(s[q1+1:], '"')
if q2 == -1 {
return k, v, t
}
k = s[q1+1 : q1+1+q2]
s = s[q1+1+q2+1:]
if len(s) < 2 || s[0] != ':' {
return k, v, t
}
if s[1] == '"' {
q2 = strings.IndexByte(s[2:], '"')
if q2 == -1 {
return k, v, t
}
v = s[2 : 2+q2]
t = jsonTStr
s = s[2+q2+1:]
} else if s[1] == '{' {
t = jsonTObj
s = s[1+1:]
} else {
sep := strings.IndexAny(s[1:], ",}")
if sep == -1 {
return k, v, t
}
v = s[1 : 1+sep]
if s[1] == 't' || s[1] == 'f' {
t = jsonTBool
} else if s[1] == '.' || (s[1] >= '0' && s[1] <= '9') {
t = jsonTNum
}
s = s[1+sep+1:]
}
*ps = s
return k, v, t
}
</s> add </s> remove if js.Exists("upstream_dns_file") {
s.conf.UpstreamDNSFileName = req.UpstreamsFile
</s> add if dc.UpstreamsFile != nil {
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { | "crypto/rand" | package home
import (
"crypto/rand"
"crypto/sha256"
"encoding/binary"
"encoding/hex"
"encoding/json" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
"encoding/binary"
"encoding/hex"
"encoding/json"
"fmt"
"math/rand"
"net/http"
"strings"
"sync"
"time"
| </s> remove "github.com/AdguardTeam/golibs/jsonutil"
</s> add </s> remove if js.Exists("bootstrap_dns") {
for _, boot := range req.Bootstraps {
if err := checkBootstrap(boot); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", boot, err)
return
}
}
</s> add if errBoot, err := req.checkBootstrap(); err != nil {
httpError(r, w, http.StatusBadRequest, "%s can not be used as bootstrap dns cause: %s", errBoot, err)
return | "math"
"math/big" | "encoding/binary"
"encoding/hex"
"encoding/json"
"fmt"
"math"
"math/big"
"net/http"
"strings"
"sync"
"time"
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
a := Auth{}
a.sessionTTL = sessionTTL
a.sessions = make(map[string]*session)
rand.Seed(time.Now().UTC().Unix())
var err error
a.db, err = bbolt.Open(dbFilename, 0o644, nil)
if err != nil {
log.Error("Auth: open DB: %s: %s", dbFilename, err)
if err.Error() == "invalid argument" {
| </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { </s> remove js, err := json.Marshal(resp)
if err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Marshal: %s", err)
</s> add func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
resp := s.getDNSConfig()
w.Header().Set("Content-Type", "application/json")
enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err) </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { |
a := Auth{}
a.sessionTTL = sessionTTL
a.sessions = make(map[string]*session)
var err error
a.db, err = bbolt.Open(dbFilename, 0o644, nil)
if err != nil {
log.Error("Auth: open DB: %s: %s", dbFilename, err)
if err.Error() == "invalid argument" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
|
Name string `json:"name"`
Password string `json:"password"`
}
func getSession(u *User) []byte {
// the developers don't currently believe that using a
// non-cryptographic RNG for the session hash salt is
// insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
hash := sha256.Sum256(d)
return hash[:]
}
func (a *Auth) httpCookie(req loginJSON) string {
| </s> remove return hash[:]
</s> add return hash[:], nil </s> remove func (a *Auth) httpCookie(req loginJSON) string {
</s> add func (a *Auth) httpCookie(req loginJSON) (string, error) { </s> remove return ""
</s> add return "", nil </s> remove StrictSNICheck bool `yaml:"strict_sni_check" json:"-"` // Reject connection if the client uses server name (in SNI) that doesn't match the certificate
</s> add </s> remove CertificateChain string `yaml:"certificate_chain" json:"certificate_chain"` // PEM-encoded certificates chain
PrivateKey string `yaml:"private_key" json:"private_key"` // PEM-encoded private key
</s> add // Reject connection if the client uses server name (in SNI) that doesn't match the certificate
StrictSNICheck bool `yaml:"strict_sni_check" json:"-"` | func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash)) | Name string `json:"name"`
Password string `json:"password"`
}
func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash))
func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash))
func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash))
func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash))
func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash))
func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash))
hash := sha256.Sum256(d)
return hash[:]
}
func (a *Auth) httpCookie(req loginJSON) string { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
// insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
hash := sha256.Sum256(d)
return hash[:]
}
func (a *Auth) httpCookie(req loginJSON) string {
u := a.UserFind(req.Name, req.Password)
if len(u.Name) == 0 {
| </s> remove func getSession(u *User) []byte {
// the developers don't currently believe that using a
// non-cryptographic RNG for the session hash salt is
// insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
</s> add func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash)) </s> remove func (a *Auth) httpCookie(req loginJSON) string {
</s> add func (a *Auth) httpCookie(req loginJSON) (string, error) { </s> remove return ""
</s> add return "", nil </s> remove sess := getSession(&u)
</s> add sess, err := getSession(&u)
if err != nil {
return "", err
} </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
| return hash[:], nil | // insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
hash := sha256.Sum256(d)
return hash[:], nil
}
func (a *Auth) httpCookie(req loginJSON) string {
u := a.UserFind(req.Name, req.Password)
if len(u.Name) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
hash := sha256.Sum256(d)
return hash[:]
}
func (a *Auth) httpCookie(req loginJSON) string {
u := a.UserFind(req.Name, req.Password)
if len(u.Name) == 0 {
return ""
}
| </s> remove return hash[:]
</s> add return hash[:], nil </s> remove return ""
</s> add return "", nil </s> remove func getSession(u *User) []byte {
// the developers don't currently believe that using a
// non-cryptographic RNG for the session hash salt is
// insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
</s> add func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash)) </s> remove sess := getSession(&u)
</s> add sess, err := getSession(&u)
if err != nil {
return "", err
} </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
| func (a *Auth) httpCookie(req loginJSON) (string, error) { | hash := sha256.Sum256(d)
return hash[:]
}
func (a *Auth) httpCookie(req loginJSON) (string, error) {
u := a.UserFind(req.Name, req.Password)
if len(u.Name) == 0 {
return ""
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
func (a *Auth) httpCookie(req loginJSON) string {
u := a.UserFind(req.Name, req.Password)
if len(u.Name) == 0 {
return ""
}
sess := getSession(&u)
now := time.Now().UTC()
| </s> remove func (a *Auth) httpCookie(req loginJSON) string {
</s> add func (a *Auth) httpCookie(req loginJSON) (string, error) { </s> remove return hash[:]
</s> add return hash[:], nil </s> remove sess := getSession(&u)
</s> add sess, err := getSession(&u)
if err != nil {
return "", err
} </s> remove func getSession(u *User) []byte {
// the developers don't currently believe that using a
// non-cryptographic RNG for the session hash salt is
// insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
</s> add func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash)) </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
| return "", nil |
func (a *Auth) httpCookie(req loginJSON) string {
u := a.UserFind(req.Name, req.Password)
if len(u.Name) == 0 {
return "", nil
}
sess := getSession(&u)
now := time.Now().UTC() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
if len(u.Name) == 0 {
return ""
}
sess := getSession(&u)
now := time.Now().UTC()
expire := now.Add(cookieTTL * time.Hour)
expstr := expire.Format(time.RFC1123)
expstr = expstr[:len(expstr)-len("UTC")] // "UTC" -> "GMT"
| </s> remove return ""
</s> add return "", nil </s> remove if val != nil {
expire := binary.BigEndian.Uint32(val)
if now >= int64(expire) {
val = nil
} else {
for i := 4; i < len(val); i += 32 {
hash := val[i : i+32]
var hash32 [32]byte
copy(hash32[:], hash[0:32])
_, found := c.hashToHost[hash32]
if found {
log.Debug("%s: found in cache: %s: blocked by %v", c.svc, c.host, hash32)
return 1
}
}
}
}
if val == nil {
</s> add if val == nil || now >= int64(binary.BigEndian.Uint32(val)) { </s> remove func (a *Auth) httpCookie(req loginJSON) string {
</s> add func (a *Auth) httpCookie(req loginJSON) (string, error) { </s> remove return hash[:]
</s> add return hash[:], nil </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
| sess, err := getSession(&u)
if err != nil {
return "", err
} | if len(u.Name) == 0 {
return ""
}
sess, err := getSession(&u)
if err != nil {
return "", err
}
now := time.Now().UTC()
expire := now.Add(cookieTTL * time.Hour)
expstr := expire.Format(time.RFC1123)
expstr = expstr[:len(expstr)-len("UTC")] // "UTC" -> "GMT" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
s.expire = uint32(now.Unix()) + a.sessionTTL
a.addSession(sess, &s)
return fmt.Sprintf("%s=%s; Path=/; HttpOnly; Expires=%s",
sessionCookieName, hex.EncodeToString(sess), expstr)
}
func handleLogin(w http.ResponseWriter, r *http.Request) {
req := loginJSON{}
err := json.NewDecoder(r.Body).Decode(&req)
| </s> remove req := dnsConfigJSON{}
js, err := jsonutil.DecodeObject(&req, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
</s> add req := dnsConfig{}
dec := json.NewDecoder(r.Body)
if err := dec.Decode(&req); err != nil {
httpError(r, w, http.StatusBadRequest, "json Encode: %s", err) </s> remove // nolint(gocyclo) - we need to check each JSON field separately
</s> add </s> remove js, err := json.Marshal(resp)
if err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Marshal: %s", err)
</s> add func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
resp := s.getDNSConfig()
w.Header().Set("Content-Type", "application/json")
enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err) </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
</s> remove func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
resp := dnsConfigJSON{}
</s> add func (s *Server) getDNSConfig() dnsConfig { | sessionCookieName, hex.EncodeToString(sess), expstr), nil | s.expire = uint32(now.Unix()) + a.sessionTTL
a.addSession(sess, &s)
return fmt.Sprintf("%s=%s; Path=/; HttpOnly; Expires=%s",
sessionCookieName, hex.EncodeToString(sess), expstr), nil
}
func handleLogin(w http.ResponseWriter, r *http.Request) {
req := loginJSON{}
err := json.NewDecoder(r.Body).Decode(&req) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
httpError(w, http.StatusBadRequest, "json decode: %s", err)
return
}
cookie := Context.auth.httpCookie(req)
if len(cookie) == 0 {
log.Info("Auth: invalid user name or password: name=%q", req.Name)
time.Sleep(1 * time.Second)
http.Error(w, "invalid user name or password", http.StatusBadRequest)
return
| </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
</s> remove if req.CacheMinTTL > req.CacheMaxTTL {
</s> add if !req.checkCacheTTL() { </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { </s> remove req := dnsConfigJSON{}
js, err := jsonutil.DecodeObject(&req, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
</s> add req := dnsConfig{}
dec := json.NewDecoder(r.Body)
if err := dec.Decode(&req); err != nil {
httpError(r, w, http.StatusBadRequest, "json Encode: %s", err) </s> remove // redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
</s> add if optionalAuthThird(w, r) { | cookie, err := Context.auth.httpCookie(req)
if err != nil {
httpError(w, http.StatusBadRequest, "crypto rand reader: %s", err)
return
} | httpError(w, http.StatusBadRequest, "json decode: %s", err)
return
}
cookie, err := Context.auth.httpCookie(req)
if err != nil {
httpError(w, http.StatusBadRequest, "crypto rand reader: %s", err)
return
}
if len(cookie) == 0 {
log.Info("Auth: invalid user name or password: name=%q", req.Name)
time.Sleep(1 * time.Second)
http.Error(w, "invalid user name or password", http.StatusBadRequest)
return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
}
return ""
}
// nolint(gocyclo)
func optionalAuth(handler func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/login.html" {
// redirect to dashboard if already authenticated
authRequired := Context.auth != nil && Context.auth.AuthRequired()
| </s> remove // redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
</s> add if optionalAuthThird(w, r) { </s> remove // nolint(gocyclo) - we need to check each JSON field separately
</s> add </s> remove return nil
</s> add return false
}
func (req *dnsConfig) checkBootstrap() (string, error) {
if req.Bootstraps == nil {
return "", nil
}
for _, boot := range *req.Bootstraps {
if boot == "" {
return boot, fmt.Errorf("invalid bootstrap server address: empty")
}
if _, err := upstream.NewResolver(boot, 0); err != nil {
return boot, fmt.Errorf("invalid bootstrap server address: %w", err)
}
}
return "", nil
}
func (req *dnsConfig) checkCacheTTL() bool {
if req.CacheMinTTL == nil && req.CacheMaxTTL == nil {
return true
}
var min, max uint32
if req.CacheMinTTL != nil {
min = *req.CacheMinTTL
}
if req.CacheMaxTTL == nil {
max = *req.CacheMaxTTL
}
return min <= max </s> remove req := dnsConfigJSON{}
js, err := jsonutil.DecodeObject(&req, r.Body)
if err != nil {
httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
</s> add req := dnsConfig{}
dec := json.NewDecoder(r.Body)
if err := dec.Decode(&req); err != nil {
httpError(r, w, http.StatusBadRequest, "json Encode: %s", err) </s> remove _, err := upstream.NewResolver(addr, 0)
if err != nil {
return fmt.Errorf("invalid bootstrap server address: %w", err)
</s> add for _, valid := range []string{
"",
"fastest_addr",
"parallel",
} {
if *req.UpstreamMode == valid {
return true
} | // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
| }
return ""
}
// optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
func optionalAuth(handler func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/login.html" {
// redirect to dashboard if already authenticated
authRequired := Context.auth != nil && Context.auth.AuthRequired() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
strings.HasPrefix(r.URL.Path, "/login.") {
// process as usual
// no additional auth requirements
} else if Context.auth != nil && Context.auth.AuthRequired() {
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
return
}
}
handler(w, r)
| </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
</s> remove break
</s> add return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil </s> remove if val != nil {
expire := binary.BigEndian.Uint32(val)
if now >= int64(expire) {
val = nil
} else {
for i := 4; i < len(val); i += 32 {
hash := val[i : i+32]
var hash32 [32]byte
copy(hash32[:], hash[0:32])
_, found := c.hashToHost[hash32]
if found {
log.Debug("%s: found in cache: %s: blocked by %v", c.svc, c.host, hash32)
return 1
}
}
}
}
if val == nil {
</s> add if val == nil || now >= int64(binary.BigEndian.Uint32(val)) { </s> remove
const (
jsonTErr = iota
jsonTObj
jsonTStr
jsonTNum
jsonTBool
)
// Parse JSON key-value pair
// e.g.: "key":VALUE where VALUE is "string", true|false (boolean), or 123.456 (number)
// Note the limitations:
// . doesn't support whitespace
// . doesn't support "null"
// . doesn't validate boolean or number
// . no proper handling of {} braces
// . no handling of [] brackets
// Return (key, value, type)
func readJSON(ps *string) (string, string, int32) {
s := *ps
k := ""
v := ""
t := int32(jsonTErr)
q1 := strings.IndexByte(s, '"')
if q1 == -1 {
return k, v, t
}
q2 := strings.IndexByte(s[q1+1:], '"')
if q2 == -1 {
return k, v, t
}
k = s[q1+1 : q1+1+q2]
s = s[q1+1+q2+1:]
if len(s) < 2 || s[0] != ':' {
return k, v, t
}
if s[1] == '"' {
q2 = strings.IndexByte(s[2:], '"')
if q2 == -1 {
return k, v, t
}
v = s[2 : 2+q2]
t = jsonTStr
s = s[2+q2+1:]
} else if s[1] == '{' {
t = jsonTObj
s = s[1+1:]
} else {
sep := strings.IndexAny(s[1:], ",}")
if sep == -1 {
return k, v, t
}
v = s[1 : 1+sep]
if s[1] == 't' || s[1] == 'f' {
t = jsonTBool
} else if s[1] == '.' || (s[1] >= '0' && s[1] <= '9') {
t = jsonTNum
}
s = s[1+sep+1:]
}
*ps = s
return k, v, t
}
</s> add | if optionalAuthThird(w, r) { | strings.HasPrefix(r.URL.Path, "/login.") {
// process as usual
// no additional auth requirements
} else if Context.auth != nil && Context.auth.AuthRequired() {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
if optionalAuthThird(w, r) {
return
}
}
handler(w, r) | [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth.go |
assert.True(t, a.CheckSession("notfound") == -1)
a.RemoveSession("notfound")
sess := getSession(&users[0])
sessStr := hex.EncodeToString(sess)
now := time.Now().UTC().Unix()
// check expiration
s.expire = uint32(now)
| </s> remove sess := getSession(&u)
</s> add sess, err := getSession(&u)
if err != nil {
return "", err
} </s> remove return ""
</s> add return "", nil </s> remove cookie := Context.auth.httpCookie(loginJSON{Name: "name", Password: "password"})
</s> add cookie, err := Context.auth.httpCookie(loginJSON{Name: "name", Password: "password"})
assert.Nil(t, err) </s> remove if val != nil {
expire := binary.BigEndian.Uint32(val)
if now >= int64(expire) {
val = nil
} else {
for i := 4; i < len(val); i += 32 {
hash := val[i : i+32]
var hash32 [32]byte
copy(hash32[:], hash[0:32])
_, found := c.hashToHost[hash32]
if found {
log.Debug("%s: found in cache: %s: blocked by %v", c.svc, c.host, hash32)
return 1
}
}
}
}
if val == nil {
</s> add if val == nil || now >= int64(binary.BigEndian.Uint32(val)) { </s> remove sessionCookieName, hex.EncodeToString(sess), expstr)
</s> add sessionCookieName, hex.EncodeToString(sess), expstr), nil | sess, err := getSession(&users[0])
assert.Nil(t, err) |
assert.True(t, a.CheckSession("notfound") == -1)
a.RemoveSession("notfound")
sess, err := getSession(&users[0])
assert.Nil(t, err)
sessStr := hex.EncodeToString(sess)
now := time.Now().UTC().Unix()
// check expiration
s.expire = uint32(now) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth_test.go |
handler2(&w, &r)
assert.True(t, handlerCalled)
// perform login
cookie := Context.auth.httpCookie(loginJSON{Name: "name", Password: "password"})
assert.True(t, cookie != "")
// get /
handler2 = optionalAuth(handler)
w.hdr = make(http.Header)
| </s> remove sess := getSession(&users[0])
</s> add sess, err := getSession(&users[0])
assert.Nil(t, err) </s> remove // redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
</s> add if optionalAuthThird(w, r) { </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
</s> remove
func TestJSON(t *testing.T) {
s := `
{"keystr":"val","obj":{"keybool":true,"keyint":123456}}
`
k, v, jtype := readJSON(&s)
assert.Equal(t, jtype, int32(jsonTStr))
assert.Equal(t, "keystr", k)
assert.Equal(t, "val", v)
k, _, jtype = readJSON(&s)
assert.Equal(t, jtype, int32(jsonTObj))
assert.Equal(t, "obj", k)
k, v, jtype = readJSON(&s)
assert.Equal(t, jtype, int32(jsonTBool))
assert.Equal(t, "keybool", k)
assert.Equal(t, "true", v)
k, v, jtype = readJSON(&s)
assert.Equal(t, jtype, int32(jsonTNum))
assert.Equal(t, "keyint", k)
assert.Equal(t, "123456", v)
_, _, jtype = readJSON(&s)
assert.True(t, jtype == jsonTErr)
}
</s> add </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) | cookie, err := Context.auth.httpCookie(loginJSON{Name: "name", Password: "password"})
assert.Nil(t, err) | handler2(&w, &r)
assert.True(t, handlerCalled)
// perform login
cookie, err := Context.auth.httpCookie(loginJSON{Name: "name", Password: "password"})
assert.Nil(t, err)
assert.True(t, cookie != "")
// get /
handler2 = optionalAuth(handler)
w.hdr = make(http.Header) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/auth_test.go |
func isRunning() bool {
return Context.dnsServer != nil && Context.dnsServer.IsRunning()
}
// nolint (gocyclo)
// Return TRUE if IP is within public Internet IP range
func isPublicIP(ip net.IP) bool {
ip4 := ip.To4()
if ip4 != nil {
switch ip4[0] {
case 0:
return false // software
case 10:
return false // private network
case 127:
return false // loopback
case 169:
if ip4[1] == 254 {
return false // link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false // private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { // documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { // multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet
return false
}
}
} else {
if ip.IsLoopback() || ip.IsLinkLocalMulticast() || ip.IsLinkLocalUnicast() {
return false
}
}
return true
}
func onDNSRequest(d *proxy.DNSContext) {
ip := dnsforward.GetIPString(d.Addr)
if ip == "" {
// This would be quite weird if we get here
return
| </s> remove case ctFilteringStatus:
res := entry.Result
switch c.value {
case filteringStatusAll:
return true
case filteringStatusFiltered:
return res.IsFiltered ||
res.Reason == dnsfilter.NotFilteredWhiteList ||
res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusBlocked:
return res.IsFiltered &&
(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService)
case filteringStatusBlockedService:
return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
case filteringStatusBlockedParental:
return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
case filteringStatusBlockedSafebrowsing:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
case filteringStatusWhitelisted:
return res.Reason == dnsfilter.NotFilteredWhiteList
case filteringStatusRewritten:
return res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusSafeSearch:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
case filteringStatusProcessed:
return !(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService ||
res.Reason == dnsfilter.NotFilteredWhiteList)
default:
return false
}
</s> add func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true </s> remove qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
if c.strict && entry.IP == c.value {
return true
}
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
</s> add return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
} </s> remove ip = net.ParseIP(req.BlockingIPv6)
if ip == nil {
</s> add ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil { </s> remove ip := net.ParseIP(req.BlockingIPv4)
if ip == nil || ip.To4() == nil {
</s> add if req.BlockingIPv4 == nil || req.BlockingIPv6 == nil { | func isRunning() bool {
return Context.dnsServer != nil && Context.dnsServer.IsRunning()
}
func onDNSRequest(d *proxy.DNSContext) {
ip := dnsforward.GetIPString(d.Addr)
if ip == "" {
// This would be quite weird if we get here
return | [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/dns.go |
|
ipAddr := net.ParseIP(ip)
if !ipAddr.IsLoopback() {
Context.rdns.Begin(ip)
}
if isPublicIP(ipAddr) {
Context.whois.Begin(ip)
}
}
func generateServerConfig() dnsforward.ServerConfig {
| </s> remove if isPublicIP(ipAddr) {
</s> add if !Context.ipDetector.detectSpecialNetwork(ipAddr) { </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
</s> remove break
</s> add return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} </s> remove // redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
</s> add if optionalAuthThird(w, r) { </s> remove return nil
</s> add return false
}
func (req *dnsConfig) checkBootstrap() (string, error) {
if req.Bootstraps == nil {
return "", nil
}
for _, boot := range *req.Bootstraps {
if boot == "" {
return boot, fmt.Errorf("invalid bootstrap server address: empty")
}
if _, err := upstream.NewResolver(boot, 0); err != nil {
return boot, fmt.Errorf("invalid bootstrap server address: %w", err)
}
}
return "", nil
}
func (req *dnsConfig) checkCacheTTL() bool {
if req.CacheMinTTL == nil && req.CacheMaxTTL == nil {
return true
}
var min, max uint32
if req.CacheMinTTL != nil {
min = *req.CacheMinTTL
}
if req.CacheMaxTTL == nil {
max = *req.CacheMaxTTL
}
return min <= max | if !Context.ipDetector.detectSpecialNetwork(ipAddr) { | ipAddr := net.ParseIP(ip)
if !ipAddr.IsLoopback() {
Context.rdns.Begin(ip)
}
if !Context.ipDetector.detectSpecialNetwork(ipAddr) {
Context.whois.Begin(ip)
}
}
func generateServerConfig() dnsforward.ServerConfig { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/dns.go |
ipAddr := net.ParseIP(ip)
if !ipAddr.IsLoopback() {
Context.rdns.Begin(ip)
}
if isPublicIP(ipAddr) {
Context.whois.Begin(ip)
}
}
return nil
| </s> remove if isPublicIP(ipAddr) {
</s> add if !Context.ipDetector.detectSpecialNetwork(ipAddr) { </s> remove break
</s> add return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} </s> remove return nil
</s> add return false
}
func (req *dnsConfig) checkBootstrap() (string, error) {
if req.Bootstraps == nil {
return "", nil
}
for _, boot := range *req.Bootstraps {
if boot == "" {
return boot, fmt.Errorf("invalid bootstrap server address: empty")
}
if _, err := upstream.NewResolver(boot, 0); err != nil {
return boot, fmt.Errorf("invalid bootstrap server address: %w", err)
}
}
return "", nil
}
func (req *dnsConfig) checkCacheTTL() bool {
if req.CacheMinTTL == nil && req.CacheMaxTTL == nil {
return true
}
var min, max uint32
if req.CacheMinTTL != nil {
min = *req.CacheMinTTL
}
if req.CacheMaxTTL == nil {
max = *req.CacheMaxTTL
}
return min <= max </s> remove qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
if c.strict && entry.IP == c.value {
return true
}
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
</s> add return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
} </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
| if !Context.ipDetector.detectSpecialNetwork(ipAddr) { | ipAddr := net.ParseIP(ip)
if !ipAddr.IsLoopback() {
Context.rdns.Begin(ip)
}
if !Context.ipDetector.detectSpecialNetwork(ipAddr) {
Context.whois.Begin(ip)
}
}
return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/dns.go |
"hash/crc32"
"io"
"io/ioutil"
"os"
"path/filepath"
"regexp"
"strconv"
"strings"
"sync"
| </s> remove "math/rand"
</s> add "math"
"math/big" </s> remove "github.com/AdguardTeam/golibs/jsonutil"
</s> add </s> remove a2 = convertMapToArray(m, maxClients)
d["top_clients"] = convertTopArray(a2)
</s> add </s> remove restart := false
</s> add if s.setConfig(req) {
if err := s.Reconfigure(nil); err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err)
return
}
}
}
func (s *Server) setConfig(dc dnsConfig) (restart bool) { | "net/http" | "hash/crc32"
"io"
"io/ioutil"
"net/http"
"os"
"path/filepath"
"regexp"
"strconv"
"strings"
"sync" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
}
return b, err
}
// nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
| </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove break
</s> add return total, nil </s> remove break
</s> add return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} </s> remove return true, nil
</s> add return updated, nil </s> remove js, err := json.Marshal(resp)
if err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Marshal: %s", err)
</s> add func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
resp := s.getDNSConfig()
w.Header().Set("Content-Type", "application/json")
enc := json.NewEncoder(w)
if err := enc.Encode(resp); err != nil {
httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err) | func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { | }
return b, err
}
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) {
htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0 | [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk, firstChunkLen) {
return false, fmt.Errorf("data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Contains(s, "<html") || strings.Contains(s, "<!doctype") {
return false, fmt.Errorf("data is HTML, not plain text")
| </s> remove return false, fmt.Errorf("data is HTML, not plain text")
</s> add return total, fmt.Errorf("data is HTML, not plain text") </s> remove return false, err2
</s> add return total, err2 </s> remove break
</s> add return total, nil </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { </s> remove ip = net.ParseIP(req.BlockingIPv6)
if ip == nil {
</s> add ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil { | return total, fmt.Errorf("data contains non-printable characters") | firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk, firstChunkLen) {
return total, fmt.Errorf("data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Contains(s, "<html") || strings.Contains(s, "<!doctype") {
return false, fmt.Errorf("data is HTML, not plain text") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
}
s := strings.ToLower(string(firstChunk))
if strings.Contains(s, "<html") || strings.Contains(s, "<!doctype") {
return false, fmt.Errorf("data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
| </s> remove return false, fmt.Errorf("data contains non-printable characters")
</s> add return total, fmt.Errorf("data contains non-printable characters") </s> remove
const (
jsonTErr = iota
jsonTObj
jsonTStr
jsonTNum
jsonTBool
)
// Parse JSON key-value pair
// e.g.: "key":VALUE where VALUE is "string", true|false (boolean), or 123.456 (number)
// Note the limitations:
// . doesn't support whitespace
// . doesn't support "null"
// . doesn't validate boolean or number
// . no proper handling of {} braces
// . no handling of [] brackets
// Return (key, value, type)
func readJSON(ps *string) (string, string, int32) {
s := *ps
k := ""
v := ""
t := int32(jsonTErr)
q1 := strings.IndexByte(s, '"')
if q1 == -1 {
return k, v, t
}
q2 := strings.IndexByte(s[q1+1:], '"')
if q2 == -1 {
return k, v, t
}
k = s[q1+1 : q1+1+q2]
s = s[q1+1+q2+1:]
if len(s) < 2 || s[0] != ':' {
return k, v, t
}
if s[1] == '"' {
q2 = strings.IndexByte(s[2:], '"')
if q2 == -1 {
return k, v, t
}
v = s[2 : 2+q2]
t = jsonTStr
s = s[2+q2+1:]
} else if s[1] == '{' {
t = jsonTObj
s = s[1+1:]
} else {
sep := strings.IndexAny(s[1:], ",}")
if sep == -1 {
return k, v, t
}
v = s[1 : 1+sep]
if s[1] == 't' || s[1] == 'f' {
t = jsonTBool
} else if s[1] == '.' || (s[1] >= '0' && s[1] <= '9') {
t = jsonTNum
}
s = s[1+sep+1:]
}
*ps = s
return k, v, t
}
</s> add </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { </s> remove ip = net.ParseIP(req.BlockingIPv6)
if ip == nil {
</s> add ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil { </s> remove ip := net.ParseIP(req.BlockingIPv4)
if ip == nil || ip.To4() == nil {
</s> add if req.BlockingIPv4 == nil || req.BlockingIPv6 == nil { | return total, fmt.Errorf("data is HTML, not plain text") | }
s := strings.ToLower(string(firstChunk))
if strings.Contains(s, "<html") || strings.Contains(s, "<!doctype") {
return total, fmt.Errorf("data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
}
_, err2 := tmpFile.Write(buf[:n])
if err2 != nil {
return false, err2
}
if err == io.EOF {
break
}
| </s> remove break
</s> add return total, nil </s> remove break
</s> add return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} </s> remove return false, fmt.Errorf("data contains non-printable characters")
</s> add return total, fmt.Errorf("data contains non-printable characters") </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { | return total, err2 | }
_, err2 := tmpFile.Write(buf[:n])
if err2 != nil {
return total, err2
}
if err == io.EOF {
break
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
return false, err2
}
if err == io.EOF {
break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
}
| </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { </s> remove return false, err2
</s> add return total, err2 </s> remove break
</s> add return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} </s> remove return true, nil
</s> add return updated, nil | return total, nil | return false, err2
}
if err == io.EOF {
return total, nil
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
}
}
// Extract filter name and count number of rules
_, _ = tmpFile.Seek(0, io.SeekStart)
| </s> remove break
</s> add return total, nil </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { </s> remove return true, nil
</s> add return updated, nil </s> remove break
</s> add return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} | return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) | break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err)
}
}
// Extract filter name and count number of rules
_, _ = tmpFile.Seek(0, io.SeekStart) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
rulesCount, checksum, filterName := f.parseFilterContents(tmpFile)
// Check if the filter has been really changed
if filter.checksum == checksum {
log.Tracef("Filter #%d at URL %s hasn't changed, not updating it", filter.ID, filter.URL)
return false, nil
}
log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount)
if len(filter.Name) == 0 {
| </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove break
</s> add return total, nil </s> remove return false, fmt.Errorf("data contains non-printable characters")
</s> add return total, fmt.Errorf("data contains non-printable characters") </s> remove return false, err2
</s> add return total, err2 | return updated, nil | rulesCount, checksum, filterName := f.parseFilterContents(tmpFile)
// Check if the filter has been really changed
if filter.checksum == checksum {
log.Tracef("Filter #%d at URL %s hasn't changed, not updating it", filter.ID, filter.URL)
return updated, nil
}
log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount)
if len(filter.Name) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
// Closing the file before renaming it is necessary on Windows
_ = tmpFile.Close()
err = os.Rename(tmpFile.Name(), filterFilePath)
if err != nil {
return false, err
}
tmpFile = nil
return true, nil
}
| </s> remove return true, nil
</s> add return updated, nil </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil | return updated, err | // Closing the file before renaming it is necessary on Windows
_ = tmpFile.Close()
err = os.Rename(tmpFile.Name(), filterFilePath)
if err != nil {
return updated, err
}
tmpFile = nil
return true, nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
return updated, err
}
tmpFile = nil
return updated, nil
}
// loads filter contents from the file in dataDir
| </s> remove return true, nil
</s> add return updated, nil </s> remove return false, err
</s> add return updated, err </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove break
</s> add return total, nil </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { | updated = true | return updated, err
}
tmpFile = nil
updated = true
return updated, nil
}
// loads filter contents from the file in dataDir | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
return false, err
}
tmpFile = nil
return true, nil
}
// loads filter contents from the file in dataDir
func (f *Filtering) load(filter *filter) error {
filterFilePath := filter.Path()
| </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove return false, err
</s> add return updated, err </s> remove break
</s> add return total, nil | return updated, nil | return false, err
}
tmpFile = nil
return updated, nil
}
// loads filter contents from the file in dataDir
func (f *Filtering) load(filter *filter) error {
filterFilePath := filter.Path() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/filter.go |
tls *TLSMod // TLS module
autoHosts util.AutoHosts // IP-hostname pairs taken from system configuration (e.g. /etc/hosts) files
updater *update.Updater
// Runtime properties
// --
configFilename string // Config filename (can be overridden via the command line arguments)
workDir string // Location of our directory, used to protect against CWD being somewhere else
firstRun bool // if set to true, don't run any services except HTTP web inteface, and serve only first-run html
| </s> remove StrictSNICheck bool `yaml:"strict_sni_check" json:"-"` // Reject connection if the client uses server name (in SNI) that doesn't match the certificate
</s> add </s> remove // run initializes configuration and runs the AdGuard Home
// run is a blocking method!
// nolint
func run(args options) {
// configure config filename
initConfigFilename(args)
// configure working dir and config path
initWorkingDir(args)
// configure log level and output
configureLogger(args)
// Go memory hacks
memoryUsage(args)
// print the first message after logger is configured
log.Println(version())
log.Debug("Current working directory is %s", Context.workDir)
if args.runningAsService {
log.Info("AdGuard Home is running as a service")
}
</s> add func setupContext(args options) { </s> remove CertificateChain string `yaml:"certificate_chain" json:"certificate_chain"` // PEM-encoded certificates chain
PrivateKey string `yaml:"private_key" json:"private_key"` // PEM-encoded private key
</s> add // Reject connection if the client uses server name (in SNI) that doesn't match the certificate
StrictSNICheck bool `yaml:"strict_sni_check" json:"-"` </s> remove func getSession(u *User) []byte {
// the developers don't currently believe that using a
// non-cryptographic RNG for the session hash salt is
// insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
</s> add func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash)) </s> remove CertificatePath string `yaml:"certificate_path" json:"certificate_path"` // certificate file name
PrivateKeyPath string `yaml:"private_key_path" json:"private_key_path"` // private key file name
</s> add // PEM-encoded certificates chain
CertificateChain string `yaml:"certificate_chain" json:"certificate_chain"`
// PEM-encoded private key
PrivateKey string `yaml:"private_key" json:"private_key"`
CertificatePath string `yaml:"certificate_path" json:"certificate_path"`
PrivateKeyPath string `yaml:"private_key_path" json:"private_key_path"` | ipDetector *ipDetector
| tls *TLSMod // TLS module
autoHosts util.AutoHosts // IP-hostname pairs taken from system configuration (e.g. /etc/hosts) files
updater *update.Updater
ipDetector *ipDetector
// Runtime properties
// --
configFilename string // Config filename (can be overridden via the command line arguments)
workDir string // Location of our directory, used to protect against CWD being somewhere else
firstRun bool // if set to true, don't run any services except HTTP web inteface, and serve only first-run html | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/home.go |
}
return fmt.Sprintf(msg, versionString, updateChannel, runtime.GOOS, runtime.GOARCH)
}
// run initializes configuration and runs the AdGuard Home
// run is a blocking method!
// nolint
func run(args options) {
// configure config filename
initConfigFilename(args)
// configure working dir and config path
initWorkingDir(args)
// configure log level and output
configureLogger(args)
// Go memory hacks
memoryUsage(args)
// print the first message after logger is configured
log.Println(version())
log.Debug("Current working directory is %s", Context.workDir)
if args.runningAsService {
log.Info("AdGuard Home is running as a service")
}
Context.runningAsService = args.runningAsService
Context.disableUpdate = args.disableUpdate
Context.firstRun = detectFirstRun()
if Context.firstRun {
| </s> remove StrictSNICheck bool `yaml:"strict_sni_check" json:"-"` // Reject connection if the client uses server name (in SNI) that doesn't match the certificate
</s> add </s> remove return false, err
</s> add return updated, err </s> remove return result, nil
</s> add return Result{}, nil </s> remove func getSession(u *User) []byte {
// the developers don't currently believe that using a
// non-cryptographic RNG for the session hash salt is
// insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
</s> add func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash)) | func setupContext(args options) { | }
return fmt.Sprintf(msg, versionString, updateChannel, runtime.GOOS, runtime.GOARCH)
}
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
func setupContext(args options) {
Context.runningAsService = args.runningAsService
Context.disableUpdate = args.disableUpdate
Context.firstRun = detectFirstRun()
if Context.firstRun { | [
"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",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/home.go |
Context.transport = &http.Transport{
DialContext: customDialContext,
Proxy: getHTTPProxy,
TLSClientConfig: &tls.Config{
RootCAs: Context.tlsRoots,
},
}
Context.client = &http.Client{
Timeout: time.Minute * 5,
Transport: Context.transport,
| </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil </s> remove sess := getSession(&u)
</s> add sess, err := getSession(&u)
if err != nil {
return "", err
} </s> remove want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}",
</s> add want: "{\"upstream_dns\":[\"8.8.8.8:53\",\"8.8.4.4:53\"],\"upstream_dns_file\":\"\",\"bootstrap_dns\":[\"9.9.9.10\",\"149.112.112.10\",\"2620:fe::10\",\"2620:fe::fe:10\"],\"protection_enabled\":true,\"ratelimit\":0,\"blocking_mode\":\"\",\"blocking_ipv4\":\"\",\"blocking_ipv6\":\"\",\"edns_cs_enabled\":false,\"dnssec_enabled\":false,\"disable_ipv6\":false,\"upstream_mode\":\"fastest_addr\",\"cache_size\":0,\"cache_ttl_min\":0,\"cache_ttl_max\":0}\n", </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add | RootCAs: Context.tlsRoots,
MinVersion: tls.VersionTLS12, | Context.transport = &http.Transport{
DialContext: customDialContext,
Proxy: getHTTPProxy,
TLSClientConfig: &tls.Config{
RootCAs: Context.tlsRoots,
MinVersion: tls.VersionTLS12,
},
}
Context.client = &http.Client{
Timeout: time.Minute * 5,
Transport: Context.transport, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/home.go |
}
}
func setupConfig(args options) {
config.DHCP.WorkDir = Context.workDir
config.DHCP.HTTPRegister = httpRegister
| </s> remove // 'clients' module uses 'dnsfilter' module's static data (dnsfilter.BlockedSvcKnown()),
// so we have to initialize dnsfilter's static data first,
// but also avoid relying on automatic Go init() function
dnsfilter.InitModule()
</s> add func setupConfig(args options) { </s> remove // run initializes configuration and runs the AdGuard Home
// run is a blocking method!
// nolint
func run(args options) {
// configure config filename
initConfigFilename(args)
// configure working dir and config path
initWorkingDir(args)
// configure log level and output
configureLogger(args)
// Go memory hacks
memoryUsage(args)
// print the first message after logger is configured
log.Println(version())
log.Debug("Current working directory is %s", Context.workDir)
if args.runningAsService {
log.Info("AdGuard Home is running as a service")
}
</s> add func setupContext(args options) { </s> remove if js.Exists("blocking_mode") {
s.conf.BlockingMode = req.BlockingMode
if req.BlockingMode == "custom_ip" {
if js.Exists("blocking_ipv4") {
s.conf.BlockingIPv4 = req.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(req.BlockingIPv4)
}
if js.Exists("blocking_ipv6") {
s.conf.BlockingIPv6 = req.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(req.BlockingIPv6)
}
</s> add if dc.BlockingMode != nil {
s.conf.BlockingMode = *dc.BlockingMode
if *dc.BlockingMode == "custom_ip" {
s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6) </s> remove if js.Exists("edns_cs_enabled") {
s.conf.EnableEDNSClientSubnet = req.EDNSCSEnabled
</s> add if dc.EDNSCSEnabled != nil {
s.conf.EnableEDNSClientSubnet = *dc.EDNSCSEnabled </s> remove if js.Exists("dnssec_enabled") {
s.conf.EnableDNSSEC = req.DNSSECEnabled
</s> add if dc.DNSSECEnabled != nil {
s.conf.EnableDNSSEC = *dc.DNSSECEnabled | } | }
}
}
func setupConfig(args options) {
config.DHCP.WorkDir = Context.workDir
config.DHCP.HTTPRegister = httpRegister | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/home.go |
os.Exit(0)
}
}
// 'clients' module uses 'dnsfilter' module's static data (dnsfilter.BlockedSvcKnown()),
// so we have to initialize dnsfilter's static data first,
// but also avoid relying on automatic Go init() function
dnsfilter.InitModule()
config.DHCP.WorkDir = Context.workDir
config.DHCP.HTTPRegister = httpRegister
config.DHCP.ConfigModified = onConfigModified
Context.dhcpServer = dhcpd.Create(config.DHCP)
| </s> remove c.storeCache(receivedHashes)
</s> add </s> remove return result, nil
</s> add return Result{}, nil </s> remove // Disabling "dupl": the algorithm of SB/PC is similar, but it uses different data
// nolint:dupl
func (d *Dnsfilter) checkSafeBrowsing(host string) (Result, error) {
if log.GetLevel() >= log.DEBUG {
timer := log.StartTimer()
defer timer.LogElapsed("SafeBrowsing lookup for %s", host)
}
result := Result{}
hashes := hostnameToHashes(host)
c := &sbCtx{
host: host,
svc: "SafeBrowsing",
hashToHost: hashes,
cache: gctx.safebrowsingCache,
cacheTime: d.Config.CacheTime,
}
// check cache
match := c.getCached()
if match < 0 {
return result, nil
} else if match > 0 {
result.IsFiltered = true
result.Reason = FilteredSafeBrowsing
result.Rule = "adguard-malware-shavar"
return result, nil
</s> add func check(c *sbCtx, r Result, u upstream.Upstream) (Result, error) {
c.hashToHost = hostnameToHashes(c.host)
switch c.getCached() {
case -1:
return Result{}, nil
case 1:
return r, nil </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) | func setupConfig(args options) { | os.Exit(0)
}
}
func setupConfig(args options) {
func setupConfig(args options) {
func setupConfig(args options) {
func setupConfig(args options) {
func setupConfig(args options) {
config.DHCP.WorkDir = Context.workDir
config.DHCP.HTTPRegister = httpRegister
config.DHCP.ConfigModified = onConfigModified
Context.dhcpServer = dhcpd.Create(config.DHCP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/home.go |
_ = Context.dhcpServer.Start()
}
}
Context.web.Start()
// wait indefinitely for other go-routines to complete their job
select {}
}
| </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
</s> remove // redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
</s> add if optionalAuthThird(w, r) { </s> remove return false, err
</s> add return updated, err </s> remove // 'clients' module uses 'dnsfilter' module's static data (dnsfilter.BlockedSvcKnown()),
// so we have to initialize dnsfilter's static data first,
// but also avoid relying on automatic Go init() function
dnsfilter.InitModule()
</s> add func setupConfig(args options) { </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { | Context.ipDetector, err = newIPDetector()
if err != nil {
log.Fatal(err)
}
| _ = Context.dhcpServer.Start()
}
}
Context.ipDetector, err = newIPDetector()
if err != nil {
log.Fatal(err)
}
Context.web.Start()
// wait indefinitely for other go-routines to complete their job
select {}
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/home/home.go |
package querylog
import (
"encoding/base64"
"strconv"
"strings"
"time"
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
"github.com/AdguardTeam/golibs/log"
| </s> remove "github.com/AdguardTeam/golibs/jsonutil"
</s> add </s> remove "math/rand"
</s> add "math"
"math/big" </s> remove
const (
jsonTErr = iota
jsonTObj
jsonTStr
jsonTNum
jsonTBool
)
// Parse JSON key-value pair
// e.g.: "key":VALUE where VALUE is "string", true|false (boolean), or 123.456 (number)
// Note the limitations:
// . doesn't support whitespace
// . doesn't support "null"
// . doesn't validate boolean or number
// . no proper handling of {} braces
// . no handling of [] brackets
// Return (key, value, type)
func readJSON(ps *string) (string, string, int32) {
s := *ps
k := ""
v := ""
t := int32(jsonTErr)
q1 := strings.IndexByte(s, '"')
if q1 == -1 {
return k, v, t
}
q2 := strings.IndexByte(s[q1+1:], '"')
if q2 == -1 {
return k, v, t
}
k = s[q1+1 : q1+1+q2]
s = s[q1+1+q2+1:]
if len(s) < 2 || s[0] != ':' {
return k, v, t
}
if s[1] == '"' {
q2 = strings.IndexByte(s[2:], '"')
if q2 == -1 {
return k, v, t
}
v = s[2 : 2+q2]
t = jsonTStr
s = s[2+q2+1:]
} else if s[1] == '{' {
t = jsonTObj
s = s[1+1:]
} else {
sep := strings.IndexAny(s[1:], ",}")
if sep == -1 {
return k, v, t
}
v = s[1 : 1+sep]
if s[1] == 't' || s[1] == 'f' {
t = jsonTBool
} else if s[1] == '.' || (s[1] >= '0' && s[1] <= '9') {
t = jsonTNum
}
s = s[1+sep+1:]
}
*ps = s
return k, v, t
}
</s> add | "encoding/json" | package querylog
import (
"encoding/base64"
"encoding/json"
"strconv"
"strings"
"time"
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
"github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/decode.go |
"github.com/AdguardTeam/golibs/log"
"github.com/miekg/dns"
)
// decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
}
if err != nil {
log.Debug("decodeLogEntry err: %s", err)
break
| </s> remove if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
</s> add if dc.UpstreamMode != nil {
switch *dc.UpstreamMode { </s> remove
const (
jsonTErr = iota
jsonTObj
jsonTStr
jsonTNum
jsonTBool
)
// Parse JSON key-value pair
// e.g.: "key":VALUE where VALUE is "string", true|false (boolean), or 123.456 (number)
// Note the limitations:
// . doesn't support whitespace
// . doesn't support "null"
// . doesn't validate boolean or number
// . no proper handling of {} braces
// . no handling of [] brackets
// Return (key, value, type)
func readJSON(ps *string) (string, string, int32) {
s := *ps
k := ""
v := ""
t := int32(jsonTErr)
q1 := strings.IndexByte(s, '"')
if q1 == -1 {
return k, v, t
}
q2 := strings.IndexByte(s[q1+1:], '"')
if q2 == -1 {
return k, v, t
}
k = s[q1+1 : q1+1+q2]
s = s[q1+1+q2+1:]
if len(s) < 2 || s[0] != ':' {
return k, v, t
}
if s[1] == '"' {
q2 = strings.IndexByte(s[2:], '"')
if q2 == -1 {
return k, v, t
}
v = s[2 : 2+q2]
t = jsonTStr
s = s[2+q2+1:]
} else if s[1] == '{' {
t = jsonTObj
s = s[1+1:]
} else {
sep := strings.IndexAny(s[1:], ",}")
if sep == -1 {
return k, v, t
}
v = s[1 : 1+sep]
if s[1] == 't' || s[1] == 'f' {
t = jsonTBool
} else if s[1] == '.' || (s[1] >= '0' && s[1] <= '9') {
t = jsonTNum
}
s = s[1+sep+1:]
}
*ps = s
return k, v, t
}
</s> add </s> remove
</s> add s.conf.FastestAddr = false </s> remove rand.Seed(time.Now().UTC().Unix())
</s> add </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) | var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil | "github.com/AdguardTeam/golibs/log"
"github.com/miekg/dns"
)
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if err != nil {
log.Debug("decodeLogEntry err: %s", err)
break | [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/decode.go |
return err
},
}
if err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
}
| </s> remove break
</s> add return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove break
</s> add return total, nil | func decodeLogEntry(ent *logEntry, str string) {
dec := json.NewDecoder(strings.NewReader(str))
for dec.More() {
keyToken, err := dec.Token() | return err
},
}
func decodeLogEntry(ent *logEntry, str string) {
dec := json.NewDecoder(strings.NewReader(str))
for dec.More() {
keyToken, err := dec.Token()
if err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/decode.go |
}
if err != nil {
log.Debug("decodeLogEntry err: %s", err)
break
}
}
}
// Get value from "key":"value"
| </s> remove break
</s> add return total, nil </s> remove return false, err
</s> add return total, err
}
}
}
// updateIntl returns true if filter update performed successfully.
func (f *Filtering) updateIntl(filter *filter) (updated bool, err error) {
updated = false
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return updated, err
}
defer func() {
if tmpFile != nil {
if err := tmpFile.Close(); err != nil {
log.Printf("Couldn't close temporary file: %s", err)
}
tmpFileName := tmpFile.Name()
if err := os.Remove(tmpFileName); err != nil {
log.Printf("Couldn't delete temporary file %s: %s", tmpFileName, err)
}
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return updated, fmt.Errorf("open file: %w", err) </s> remove // nolint(gocyclo)
func (f *Filtering) updateIntl(filter *filter) (bool, error) {
log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpFile != nil {
_ = tmpFile.Close()
_ = os.Remove(tmpFile.Name())
}
}()
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body
}
</s> add func (f *Filtering) read(reader io.Reader, tmpFile *os.File, filter *filter) (int, error) { </s> remove if js.Exists("upstream_dns") {
err = ValidateUpstreams(req.Upstreams)
if err != nil {
</s> add if req.Upstreams != nil {
if err := ValidateUpstreams(*req.Upstreams); err != nil { | return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
} | }
if err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
}
if _, ok := keyToken.(json.Delim); ok {
continue
}
key := keyToken.(string)
handler, ok := logEntryHandlers[key]
value, err := dec.Token()
if err != nil {
return
}
if ok {
if err := handler(value, ent); err != nil {
log.Debug("decodeLogEntry err: %s", err)
return
}
}
}
}
// Get value from "key":"value" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/decode.go |
}
end := start + i
return s[start:end]
}
const (
jsonTErr = iota
jsonTObj
jsonTStr
jsonTNum
jsonTBool
)
// Parse JSON key-value pair
// e.g.: "key":VALUE where VALUE is "string", true|false (boolean), or 123.456 (number)
// Note the limitations:
// . doesn't support whitespace
// . doesn't support "null"
// . doesn't validate boolean or number
// . no proper handling of {} braces
// . no handling of [] brackets
// Return (key, value, type)
func readJSON(ps *string) (string, string, int32) {
s := *ps
k := ""
v := ""
t := int32(jsonTErr)
q1 := strings.IndexByte(s, '"')
if q1 == -1 {
return k, v, t
}
q2 := strings.IndexByte(s[q1+1:], '"')
if q2 == -1 {
return k, v, t
}
k = s[q1+1 : q1+1+q2]
s = s[q1+1+q2+1:]
if len(s) < 2 || s[0] != ':' {
return k, v, t
}
if s[1] == '"' {
q2 = strings.IndexByte(s[2:], '"')
if q2 == -1 {
return k, v, t
}
v = s[2 : 2+q2]
t = jsonTStr
s = s[2+q2+1:]
} else if s[1] == '{' {
t = jsonTObj
s = s[1+1:]
} else {
sep := strings.IndexAny(s[1:], ",}")
if sep == -1 {
return k, v, t
}
v = s[1 : 1+sep]
if s[1] == 't' || s[1] == 'f' {
t = jsonTBool
} else if s[1] == '.' || (s[1] >= '0' && s[1] <= '9') {
t = jsonTNum
}
s = s[1+sep+1:]
}
*ps = s
return k, v, t
}
| </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil </s> remove if val != nil {
expire := binary.BigEndian.Uint32(val)
if now >= int64(expire) {
val = nil
} else {
for i := 4; i < len(val); i += 32 {
hash := val[i : i+32]
var hash32 [32]byte
copy(hash32[:], hash[0:32])
_, found := c.hashToHost[hash32]
if found {
log.Debug("%s: found in cache: %s: blocked by %v", c.svc, c.host, hash32)
return 1
}
}
}
}
if val == nil {
</s> add if val == nil || now >= int64(binary.BigEndian.Uint32(val)) { </s> remove
func TestJSON(t *testing.T) {
s := `
{"keystr":"val","obj":{"keybool":true,"keyint":123456}}
`
k, v, jtype := readJSON(&s)
assert.Equal(t, jtype, int32(jsonTStr))
assert.Equal(t, "keystr", k)
assert.Equal(t, "val", v)
k, _, jtype = readJSON(&s)
assert.Equal(t, jtype, int32(jsonTObj))
assert.Equal(t, "obj", k)
k, v, jtype = readJSON(&s)
assert.Equal(t, jtype, int32(jsonTBool))
assert.Equal(t, "keybool", k)
assert.Equal(t, "true", v)
k, v, jtype = readJSON(&s)
assert.Equal(t, jtype, int32(jsonTNum))
assert.Equal(t, "keyint", k)
assert.Equal(t, "123456", v)
_, _, jtype = readJSON(&s)
assert.True(t, jtype == jsonTErr)
}
</s> add </s> remove // nolint(gocyclo)
</s> add // optionalAuthThird return true if user should authenticate first.
func optionalAuthThird(w http.ResponseWriter, r *http.Request) (authFirst bool) {
authFirst = false
// redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
authFirst = true
}
return authFirst
}
</s> remove // redirect to login page if not authenticated
ok := false
cookie, err := r.Cookie(sessionCookieName)
if glProcessCookie(r) {
log.Debug("Auth: authentification was handled by GL-Inet submodule")
ok = true
} else if err == nil {
r := Context.auth.CheckSession(cookie.Value)
if r == 0 {
ok = true
} else if r < 0 {
log.Debug("Auth: invalid cookie value: %s", cookie)
}
} else {
// there's no Cookie, check Basic authentication
user, pass, ok2 := r.BasicAuth()
if ok2 {
u := Context.auth.UserFind(user, pass)
if len(u.Name) != 0 {
ok = true
} else {
log.Info("Auth: invalid Basic Authorization value")
}
}
}
if !ok {
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
if glProcessRedirect(w, r) {
log.Debug("Auth: redirected to login page by GL-Inet submodule")
} else {
w.Header().Set("Location", "/login.html")
w.WriteHeader(http.StatusFound)
}
} else {
w.WriteHeader(http.StatusForbidden)
_, _ = w.Write([]byte("Forbidden"))
}
</s> add if optionalAuthThird(w, r) { | }
end := start + i
return s[start:end]
}
| [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/decode.go |
|
logOutput.Reset()
})
}
}
func TestJSON(t *testing.T) {
s := `
{"keystr":"val","obj":{"keybool":true,"keyint":123456}}
`
k, v, jtype := readJSON(&s)
assert.Equal(t, jtype, int32(jsonTStr))
assert.Equal(t, "keystr", k)
assert.Equal(t, "val", v)
k, _, jtype = readJSON(&s)
assert.Equal(t, jtype, int32(jsonTObj))
assert.Equal(t, "obj", k)
k, v, jtype = readJSON(&s)
assert.Equal(t, jtype, int32(jsonTBool))
assert.Equal(t, "keybool", k)
assert.Equal(t, "true", v)
k, v, jtype = readJSON(&s)
assert.Equal(t, jtype, int32(jsonTNum))
assert.Equal(t, "keyint", k)
assert.Equal(t, "123456", v)
_, _, jtype = readJSON(&s)
assert.True(t, jtype == jsonTErr)
}
| </s> remove
const (
jsonTErr = iota
jsonTObj
jsonTStr
jsonTNum
jsonTBool
)
// Parse JSON key-value pair
// e.g.: "key":VALUE where VALUE is "string", true|false (boolean), or 123.456 (number)
// Note the limitations:
// . doesn't support whitespace
// . doesn't support "null"
// . doesn't validate boolean or number
// . no proper handling of {} braces
// . no handling of [] brackets
// Return (key, value, type)
func readJSON(ps *string) (string, string, int32) {
s := *ps
k := ""
v := ""
t := int32(jsonTErr)
q1 := strings.IndexByte(s, '"')
if q1 == -1 {
return k, v, t
}
q2 := strings.IndexByte(s[q1+1:], '"')
if q2 == -1 {
return k, v, t
}
k = s[q1+1 : q1+1+q2]
s = s[q1+1+q2+1:]
if len(s) < 2 || s[0] != ':' {
return k, v, t
}
if s[1] == '"' {
q2 = strings.IndexByte(s[2:], '"')
if q2 == -1 {
return k, v, t
}
v = s[2 : 2+q2]
t = jsonTStr
s = s[2+q2+1:]
} else if s[1] == '{' {
t = jsonTObj
s = s[1+1:]
} else {
sep := strings.IndexAny(s[1:], ",}")
if sep == -1 {
return k, v, t
}
v = s[1 : 1+sep]
if s[1] == 't' || s[1] == 'f' {
t = jsonTBool
} else if s[1] == '.' || (s[1] >= '0' && s[1] <= '9') {
t = jsonTNum
}
s = s[1+sep+1:]
}
*ps = s
return k, v, t
}
</s> add </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil </s> remove if val != nil {
expire := binary.BigEndian.Uint32(val)
if now >= int64(expire) {
val = nil
} else {
for i := 4; i < len(val); i += 32 {
hash := val[i : i+32]
var hash32 [32]byte
copy(hash32[:], hash[0:32])
_, found := c.hashToHost[hash32]
if found {
log.Debug("%s: found in cache: %s: blocked by %v", c.svc, c.host, hash32)
return 1
}
}
}
}
if val == nil {
</s> add if val == nil || now >= int64(binary.BigEndian.Uint32(val)) { </s> remove m := map[string]uint64{}
for _, u := range units {
for _, it := range u.Domains {
m[it.Name] += it.Count
}
</s> add dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit) | logOutput.Reset()
})
}
}
| [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/decode_test.go |
|
return false
}
// match - checks if the log entry matches this search criteria
// nolint (gocyclo)
func (c *searchCriteria) match(entry *logEntry) bool {
switch c.criteriaType {
case ctDomainOrClient:
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
| </s> remove qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
if c.strict && entry.IP == c.value {
return true
}
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
</s> add return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
} </s> remove case ctFilteringStatus:
res := entry.Result
switch c.value {
case filteringStatusAll:
return true
case filteringStatusFiltered:
return res.IsFiltered ||
res.Reason == dnsfilter.NotFilteredWhiteList ||
res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusBlocked:
return res.IsFiltered &&
(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService)
case filteringStatusBlockedService:
return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
case filteringStatusBlockedParental:
return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
case filteringStatusBlockedSafebrowsing:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
case filteringStatusWhitelisted:
return res.Reason == dnsfilter.NotFilteredWhiteList
case filteringStatusRewritten:
return res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusSafeSearch:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
case filteringStatusProcessed:
return !(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService ||
res.Reason == dnsfilter.NotFilteredWhiteList)
default:
return false
}
</s> add func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true </s> remove // decodeLogEntry - decodes query log entry from a line
// nolint (gocyclo)
func decodeLogEntry(ent *logEntry, str string) {
var b bool
var i int
var err error
for {
k, v, t := readJSON(&str)
if t == jsonTErr {
break
}
switch k {
case "IP":
if len(ent.IP) == 0 {
ent.IP = v
}
case "T":
ent.Time, err = time.Parse(time.RFC3339, v)
case "QH":
ent.QHost = v
case "QT":
ent.QType = v
case "QC":
ent.QClass = v
case "CP":
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)
case "OrigAnswer":
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
case "IsFiltered":
b, err = strconv.ParseBool(v)
ent.Result.IsFiltered = b
case "Rule":
ent.Result.Rule = v
case "FilterID":
i, err = strconv.Atoi(v)
ent.Result.FilterID = int64(i)
case "Reason":
i, err = strconv.Atoi(v)
ent.Result.Reason = dnsfilter.Reason(i)
case "ServiceName":
ent.Result.ServiceName = v
case "Upstream":
ent.Upstream = v
case "Elapsed":
i, err = strconv.Atoi(v)
ent.Elapsed = time.Duration(i)
// pre-v0.99.3 compatibility:
case "Question":
var qstr []byte
qstr, err = base64.StdEncoding.DecodeString(v)
if err != nil {
break
}
q := new(dns.Msg)
err = q.Unpack(qstr)
if err != nil {
break
}
ent.QHost = q.Question[0].Name
if len(ent.QHost) == 0 {
break
}
ent.QHost = ent.QHost[:len(ent.QHost)-1]
ent.QType = dns.TypeToString[q.Question[0].Qtype]
ent.QClass = dns.ClassToString[q.Question[0].Qclass]
case "Time":
ent.Time, err = time.Parse(time.RFC3339, v)
</s> add var logEntryHandlers = map[string](func(t json.Token, ent *logEntry) error){
"IP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
if len(ent.IP) == 0 {
ent.IP = v
}
return nil
},
"T": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Time, err = time.Parse(time.RFC3339, v)
return err
},
"QH": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QHost = v
return nil
},
"QT": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QType = v
return nil
},
"QC": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.QClass = v
return nil
},
"CP": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.ClientProto, err = NewClientProto(v)
return err
},
"Answer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.Answer, err = base64.StdEncoding.DecodeString(v)
return err
},
"OrigAnswer": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
var err error
ent.OrigAnswer, err = base64.StdEncoding.DecodeString(v)
return err
},
"IsFiltered": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
b, err := strconv.ParseBool(v)
if err != nil {
return err
}
ent.Result.IsFiltered = b
return nil
},
"Rule": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.Rule = v
return nil
},
"FilterID": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.FilterID = int64(i)
return nil
},
"Reason": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
i, err := strconv.Atoi(v)
if err != nil {
return err
}
ent.Result.Reason = dnsfilter.Reason(i)
return nil
},
"ServiceName": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil
}
ent.Result.ServiceName = v
return nil
},
"Upstream": func(t json.Token, ent *logEntry) error {
v, ok := t.(string)
if !ok {
return nil </s> remove // nolint (gocyclo)
// Return TRUE if IP is within public Internet IP range
func isPublicIP(ip net.IP) bool {
ip4 := ip.To4()
if ip4 != nil {
switch ip4[0] {
case 0:
return false // software
case 10:
return false // private network
case 127:
return false // loopback
case 169:
if ip4[1] == 254 {
return false // link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false // private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { // documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { // multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet
return false
}
}
} else {
if ip.IsLoopback() || ip.IsLinkLocalMulticast() || ip.IsLinkLocalUnicast() {
return false
}
}
return true
}
</s> add | return false
}
// match - checks if the log entry matches this search criteria
func (c *searchCriteria) match(entry *logEntry) bool {
switch c.criteriaType {
case ctDomainOrClient:
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/search_criteria.go |
|
// nolint (gocyclo)
func (c *searchCriteria) match(entry *logEntry) bool {
switch c.criteriaType {
case ctDomainOrClient:
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
if c.strict && entry.IP == c.value {
return true
}
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
return false
case ctFilteringStatus:
res := entry.Result
| </s> remove case ctFilteringStatus:
res := entry.Result
switch c.value {
case filteringStatusAll:
return true
case filteringStatusFiltered:
return res.IsFiltered ||
res.Reason == dnsfilter.NotFilteredWhiteList ||
res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusBlocked:
return res.IsFiltered &&
(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService)
case filteringStatusBlockedService:
return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
case filteringStatusBlockedParental:
return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
case filteringStatusBlockedSafebrowsing:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
case filteringStatusWhitelisted:
return res.Reason == dnsfilter.NotFilteredWhiteList
case filteringStatusRewritten:
return res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusSafeSearch:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
case filteringStatusProcessed:
return !(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService ||
res.Reason == dnsfilter.NotFilteredWhiteList)
default:
return false
}
</s> add func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true </s> remove // nolint (gocyclo)
</s> add </s> remove return false
</s> add return false
} </s> remove // nolint (gocyclo)
// Return TRUE if IP is within public Internet IP range
func isPublicIP(ip net.IP) bool {
ip4 := ip.To4()
if ip4 != nil {
switch ip4[0] {
case 0:
return false // software
case 10:
return false // private network
case 127:
return false // loopback
case 169:
if ip4[1] == 254 {
return false // link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false // private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { // documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { // multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet
return false
}
}
} else {
if ip.IsLoopback() || ip.IsLinkLocalMulticast() || ip.IsLinkLocalUnicast() {
return false
}
}
return true
}
</s> add | return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
} | // nolint (gocyclo)
func (c *searchCriteria) match(entry *logEntry) bool {
switch c.criteriaType {
case ctDomainOrClient:
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
}
return false
case ctFilteringStatus:
res := entry.Result | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/search_criteria.go |
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
return false
case ctFilteringStatus:
res := entry.Result
switch c.value {
| </s> remove qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
if c.strict && entry.IP == c.value {
return true
}
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
</s> add return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
} </s> remove case ctFilteringStatus:
res := entry.Result
switch c.value {
case filteringStatusAll:
return true
case filteringStatusFiltered:
return res.IsFiltered ||
res.Reason == dnsfilter.NotFilteredWhiteList ||
res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusBlocked:
return res.IsFiltered &&
(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService)
case filteringStatusBlockedService:
return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
case filteringStatusBlockedParental:
return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
case filteringStatusBlockedSafebrowsing:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
case filteringStatusWhitelisted:
return res.Reason == dnsfilter.NotFilteredWhiteList
case filteringStatusRewritten:
return res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusSafeSearch:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
case filteringStatusProcessed:
return !(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService ||
res.Reason == dnsfilter.NotFilteredWhiteList)
default:
return false
}
</s> add func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true </s> remove // nolint (gocyclo)
// Return TRUE if IP is within public Internet IP range
func isPublicIP(ip net.IP) bool {
ip4 := ip.To4()
if ip4 != nil {
switch ip4[0] {
case 0:
return false // software
case 10:
return false // private network
case 127:
return false // loopback
case 169:
if ip4[1] == 254 {
return false // link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false // private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { // documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { // multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet
return false
}
}
} else {
if ip.IsLoopback() || ip.IsLinkLocalMulticast() || ip.IsLinkLocalUnicast() {
return false
}
}
return true
}
</s> add </s> remove if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
</s> add if dc.UpstreamMode != nil {
switch *dc.UpstreamMode { | return false
} | if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
return false
}
case ctFilteringStatus:
res := entry.Result
switch c.value { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/search_criteria.go |
}
return false
case ctFilteringStatus:
res := entry.Result
switch c.value {
case filteringStatusAll:
return true
case filteringStatusFiltered:
return res.IsFiltered ||
res.Reason == dnsfilter.NotFilteredWhiteList ||
res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusBlocked:
return res.IsFiltered &&
(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService)
case filteringStatusBlockedService:
return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
case filteringStatusBlockedParental:
return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
case filteringStatusBlockedSafebrowsing:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
case filteringStatusWhitelisted:
return res.Reason == dnsfilter.NotFilteredWhiteList
case filteringStatusRewritten:
return res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusSafeSearch:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
case filteringStatusProcessed:
return !(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService ||
res.Reason == dnsfilter.NotFilteredWhiteList)
default:
return false
}
}
return false
}
| </s> remove // nolint (gocyclo)
// Return TRUE if IP is within public Internet IP range
func isPublicIP(ip net.IP) bool {
ip4 := ip.To4()
if ip4 != nil {
switch ip4[0] {
case 0:
return false // software
case 10:
return false // private network
case 127:
return false // loopback
case 169:
if ip4[1] == 254 {
return false // link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false // private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { // documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { // multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet
return false
}
}
} else {
if ip.IsLoopback() || ip.IsLinkLocalMulticast() || ip.IsLinkLocalUnicast() {
return false
}
}
return true
}
</s> add </s> remove qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
if c.strict && entry.IP == c.value {
return true
}
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
</s> add return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
} </s> remove return false
</s> add return false
} </s> remove ip = net.ParseIP(req.BlockingIPv6)
if ip == nil {
</s> add ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil { | func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true | }
return false
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
return false
} | [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/search_criteria.go |
if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
return false
}
func (c *searchCriteria) ctFilteringStatusCase(res dnsfilter.Result) bool {
switch c.value {
case filteringStatusAll:
| </s> remove qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
if c.strict && entry.IP == c.value {
return true
}
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
</s> add return c.ctDomainOrClientCase(entry)
case ctFilteringStatus:
return c.ctFilteringStatusCase(entry.Result)
} </s> remove case ctFilteringStatus:
res := entry.Result
switch c.value {
case filteringStatusAll:
return true
case filteringStatusFiltered:
return res.IsFiltered ||
res.Reason == dnsfilter.NotFilteredWhiteList ||
res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusBlocked:
return res.IsFiltered &&
(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService)
case filteringStatusBlockedService:
return res.IsFiltered && res.Reason == dnsfilter.FilteredBlockedService
case filteringStatusBlockedParental:
return res.IsFiltered && res.Reason == dnsfilter.FilteredParental
case filteringStatusBlockedSafebrowsing:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeBrowsing
case filteringStatusWhitelisted:
return res.Reason == dnsfilter.NotFilteredWhiteList
case filteringStatusRewritten:
return res.Reason == dnsfilter.ReasonRewrite ||
res.Reason == dnsfilter.RewriteEtcHosts
case filteringStatusSafeSearch:
return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch
case filteringStatusProcessed:
return !(res.Reason == dnsfilter.FilteredBlackList ||
res.Reason == dnsfilter.FilteredBlockedService ||
res.Reason == dnsfilter.NotFilteredWhiteList)
default:
return false
}
</s> add func (c *searchCriteria) ctDomainOrClientCase(entry *logEntry) bool {
qhost := strings.ToLower(entry.QHost)
searchVal := strings.ToLower(c.value)
if c.strict && qhost == searchVal {
return true
}
if !c.strict && strings.Contains(qhost, searchVal) {
return true </s> remove return false
</s> add return false
} </s> remove // nolint (gocyclo)
</s> add </s> remove // nolint (gocyclo)
// Return TRUE if IP is within public Internet IP range
func isPublicIP(ip net.IP) bool {
ip4 := ip.To4()
if ip4 != nil {
switch ip4[0] {
case 0:
return false // software
case 10:
return false // private network
case 127:
return false // loopback
case 169:
if ip4[1] == 254 {
return false // link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false // private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { // documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { // multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet
return false
}
}
} else {
if ip.IsLoopback() || ip.IsLinkLocalMulticast() || ip.IsLinkLocalUnicast() {
return false
}
}
return true
}
</s> add | if c.strict && entry.IP == c.value {
return true
}
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
} | if !c.strict && strings.Contains(qhost, searchVal) {
return true
}
if c.strict && entry.IP == c.value {
return true
}
if !c.strict && strings.Contains(entry.IP, c.value) {
return true
}
return false
}
func (c *searchCriteria) ctFilteringStatusCase(res dnsfilter.Result) bool {
switch c.value {
case filteringStatusAll: | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/querylog/search_criteria.go |
* safesearch-blocked
* parental-blocked
These values are just the sum of data for all units.
*/
// nolint (gocyclo)
func (s *statsCtx) getData() map[string]interface{} {
limit := s.conf.limit
d := map[string]interface{}{}
timeUnit := Hours
| </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) </s> remove // nolint (gocyclo)
</s> add </s> remove func getSession(u *User) []byte {
// the developers don't currently believe that using a
// non-cryptographic RNG for the session hash salt is
// insecure
salt := rand.Uint32() //nolint:gosec
d := []byte(fmt.Sprintf("%d%s%s", salt, u.Name, u.PasswordHash))
</s> add func getSession(u *User) ([]byte, error) {
maxSalt := big.NewInt(math.MaxUint32)
salt, err := rand.Int(rand.Reader, maxSalt)
if err != nil {
return nil, err
}
d := []byte(fmt.Sprintf("%s%s%s", salt, u.Name, u.PasswordHash)) </s> remove a = []uint64{}
if timeUnit == Hours {
</s> add topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{} </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count | * safesearch-blocked
* parental-blocked
These values are just the sum of data for all units.
*/
func (s *statsCtx) getData() map[string]interface{} {
limit := s.conf.limit
d := map[string]interface{}{}
timeUnit := Hours | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
|
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
| </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
if len(a) != int(limit/24) {
log.Fatalf("len(a) != limit: %d %d", len(a), limit)
}
}
d["dns_queries"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RFiltered])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RFiltered]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add } else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++ </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add if id <= nextDayID {
nums = append(nums, sum) </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add | statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) |
// 720 hours may span 31 days, so we skip data for the first day in this case
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u))
}
id++
}
if id <= nextDayID {
a = append(a, sum) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
}
if len(a) != int(limit/24) {
log.Fatalf("len(a) != limit: %d %d", len(a), limit)
}
}
d["dns_queries"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RFiltered])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RFiltered]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
| </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add if id <= nextDayID {
nums = append(nums, sum) </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add | } else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++ | a = append(a, sum)
sum = 0
nextDayID += 24
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++
}
id++
}
if id <= nextDayID {
a = append(a, sum) | [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
| </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
if len(a) != int(limit/24) {
log.Fatalf("len(a) != limit: %d %d", len(a), limit)
}
}
d["dns_queries"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RFiltered])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RFiltered]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add } else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++ </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add | if id <= nextDayID {
nums = append(nums, sum) | a = append(a, sum)
sum = 0
nextDayID += 24
}
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
if id <= nextDayID {
nums = append(nums, sum)
}
id++
}
if id <= nextDayID {
a = append(a, sum) | [
"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",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["replaced_safebrowsing"] = a
a = []uint64{}
| </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add if id <= nextDayID {
nums = append(nums, sum) </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
if len(a) != int(limit/24) {
log.Fatalf("len(a) != limit: %d %d", len(a), limit)
}
}
d["dns_queries"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RFiltered])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RFiltered]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add } else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++ </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count </s> remove d["replaced_safebrowsing"] = a
</s> add | a = append(a, sum)
sum = 0
nextDayID += 24
}
}
}
d["replaced_safebrowsing"] = a
a = []uint64{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
|
if id <= nextDayID {
nums = append(nums, sum)
}
}
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
| </s> remove a = []uint64{}
if timeUnit == Hours {
</s> add topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{} </s> remove d["replaced_parental"] = a
// top counters:
</s> add </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add if id <= nextDayID {
nums = append(nums, sum) </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) </s> remove m = map[string]uint64{}
for _, u := range units {
for _, it := range u.BlockedDomains {
m[it.Name] += it.Count
}
</s> add statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }), | return nums | if id <= nextDayID {
nums = append(nums, sum)
}
}
return nums
}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
if id <= nextDayID {
a = append(a, sum)
}
}
d["replaced_safebrowsing"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RParental])
| </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add if id <= nextDayID {
nums = append(nums, sum) </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
if len(a) != int(limit/24) {
log.Fatalf("len(a) != limit: %d %d", len(a), limit)
}
}
d["dns_queries"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RFiltered])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RFiltered]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add } else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++ </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add </s> remove a = []uint64{}
if timeUnit == Hours {
</s> add topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{} | if id <= nextDayID {
a = append(a, sum)
}
}
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RParental]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
|
}
}
d["replaced_safebrowsing"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
| </s> remove d["replaced_safebrowsing"] = a
</s> add </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add if id <= nextDayID {
nums = append(nums, sum) </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
if len(a) != int(limit/24) {
log.Fatalf("len(a) != limit: %d %d", len(a), limit)
}
}
d["dns_queries"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RFiltered])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RFiltered]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add } else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++ </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) | topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{} | }
}
d["replaced_safebrowsing"] = a
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
topsCollector := func(max int, pairsGetter func(u *unitDB) (pairs []countPair)) []map[string]uint64 {
m := map[string]uint64{}
for _, u := range units {
a = append(a, u.NResult[RParental])
}
} else {
var sum uint64 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
| </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add if id <= nextDayID {
nums = append(nums, sum) </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
if len(a) != int(limit/24) {
log.Fatalf("len(a) != limit: %d %d", len(a), limit)
}
}
d["dns_queries"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RFiltered])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RFiltered]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add } else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++ </s> remove a := []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NTotal)
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NTotal
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add statsCollector := func(numsGetter func(u *unitDB) (num uint64)) (nums []uint64) {
if timeUnit == Hours {
for _, u := range units {
nums = append(nums, numsGetter(u)) </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add </s> remove d["replaced_safebrowsing"] = a
</s> add | for _, it := range pairsGetter(u) {
m[it.Name] += it.Count |
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
id++
}
if id <= nextDayID {
a = append(a, sum) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["replaced_parental"] = a
// top counters:
| </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add if id <= nextDayID {
nums = append(nums, sum) </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
if len(a) != int(limit/24) {
log.Fatalf("len(a) != limit: %d %d", len(a), limit)
}
}
d["dns_queries"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RFiltered])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RFiltered]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add } else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++ </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count </s> remove d["replaced_parental"] = a
// top counters:
</s> add | a = append(a, sum)
sum = 0
nextDayID += 24
}
}
}
d["replaced_parental"] = a
// top counters: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
|
for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit)
| </s> remove m := map[string]uint64{}
for _, u := range units {
for _, it := range u.Domains {
m[it.Name] += it.Count
}
</s> add dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit) </s> remove m = map[string]uint64{}
for _, u := range units {
for _, it := range u.BlockedDomains {
m[it.Name] += it.Count
}
</s> add statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }), </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
if len(a) != int(limit/24) {
log.Fatalf("len(a) != limit: %d %d", len(a), limit)
}
}
d["dns_queries"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RFiltered])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RFiltered]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add } else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := int(firstDayID - firstID); i != len(units); i++ {
sum += numsGetter(units[i])
if id == nextDayID {
nums = append(nums, sum)
sum = 0
nextDayID += 24
}
id++ </s> remove a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
</s> add | a2 := convertMapToArray(m, max)
return convertTopArray(a2) | for _, it := range pairsGetter(u) {
m[it.Name] += it.Count
}
}
a2 := convertMapToArray(m, max)
return convertTopArray(a2)
}
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
if id <= nextDayID {
a = append(a, sum)
}
}
d["replaced_parental"] = a
// top counters:
m := map[string]uint64{}
for _, u := range units {
for _, it := range u.Domains {
m[it.Name] += it.Count
| </s> remove m := map[string]uint64{}
for _, u := range units {
for _, it := range u.Domains {
m[it.Name] += it.Count
}
</s> add dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit) </s> remove a = append(a, u.NResult[RParental])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RParental]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add for _, it := range pairsGetter(u) {
m[it.Name] += it.Count </s> remove a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
</s> add </s> remove id++
}
if id <= nextDayID {
a = append(a, sum)
}
}
d["blocked_filtering"] = a
a = []uint64{}
if timeUnit == Hours {
for _, u := range units {
a = append(a, u.NResult[RSafeBrowsing])
}
} else {
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != len(units); i++ {
sum += units[i].NResult[RSafeBrowsing]
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
</s> add if id <= nextDayID {
nums = append(nums, sum) </s> remove d["replaced_safebrowsing"] = a
</s> add | if id <= nextDayID {
a = append(a, sum)
}
}
m := map[string]uint64{}
for _, u := range units {
for _, it := range u.Domains {
m[it.Name] += it.Count | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
|
d["replaced_parental"] = a
// top counters:
m := map[string]uint64{}
for _, u := range units {
for _, it := range u.Domains {
m[it.Name] += it.Count
}
}
a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
m = map[string]uint64{}
| </s> remove a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
</s> add </s> remove d["replaced_parental"] = a
// top counters:
</s> add </s> remove a2 = convertMapToArray(m, maxDomains)
d["top_blocked_domains"] = convertTopArray(a2)
</s> add </s> remove m = map[string]uint64{}
for _, u := range units {
for _, it := range u.Clients {
m[it.Name] += it.Count
}
</s> add for dataKey, dataValue := range statsData {
d[dataKey] = dataValue </s> remove m = map[string]uint64{}
for _, u := range units {
for _, it := range u.BlockedDomains {
m[it.Name] += it.Count
}
</s> add statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }), | dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit) | d["replaced_parental"] = a
// top counters:
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit)
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit)
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit)
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit)
dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit)
}
a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
m = map[string]uint64{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
for _, it := range u.Domains {
m[it.Name] += it.Count
}
}
a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
m = map[string]uint64{}
for _, u := range units {
for _, it := range u.BlockedDomains {
m[it.Name] += it.Count
| </s> remove a2 = convertMapToArray(m, maxDomains)
d["top_blocked_domains"] = convertTopArray(a2)
</s> add </s> remove m = map[string]uint64{}
for _, u := range units {
for _, it := range u.Clients {
m[it.Name] += it.Count
}
</s> add for dataKey, dataValue := range statsData {
d[dataKey] = dataValue </s> remove m := map[string]uint64{}
for _, u := range units {
for _, it := range u.Domains {
m[it.Name] += it.Count
}
</s> add dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit) </s> remove m = map[string]uint64{}
for _, u := range units {
for _, it := range u.BlockedDomains {
m[it.Name] += it.Count
}
</s> add statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }), </s> remove d["replaced_parental"] = a
// top counters:
</s> add | for _, it := range u.Domains {
m[it.Name] += it.Count
}
}
m = map[string]uint64{}
for _, u := range units {
for _, it := range u.BlockedDomains {
m[it.Name] += it.Count | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
|
}
a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
m = map[string]uint64{}
for _, u := range units {
for _, it := range u.BlockedDomains {
m[it.Name] += it.Count
}
}
a2 = convertMapToArray(m, maxDomains)
d["top_blocked_domains"] = convertTopArray(a2)
m = map[string]uint64{}
| </s> remove a2 = convertMapToArray(m, maxDomains)
d["top_blocked_domains"] = convertTopArray(a2)
</s> add </s> remove a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
</s> add </s> remove m = map[string]uint64{}
for _, u := range units {
for _, it := range u.Clients {
m[it.Name] += it.Count
}
</s> add for dataKey, dataValue := range statsData {
d[dataKey] = dataValue </s> remove m := map[string]uint64{}
for _, u := range units {
for _, it := range u.Domains {
m[it.Name] += it.Count
}
</s> add dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit) </s> remove a2 = convertMapToArray(m, maxClients)
d["top_clients"] = convertTopArray(a2)
</s> add | statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }), | }
a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }),
statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }),
statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }),
statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }),
statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }),
}
a2 = convertMapToArray(m, maxDomains)
d["top_blocked_domains"] = convertTopArray(a2)
m = map[string]uint64{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
for _, it := range u.BlockedDomains {
m[it.Name] += it.Count
}
}
a2 = convertMapToArray(m, maxDomains)
d["top_blocked_domains"] = convertTopArray(a2)
m = map[string]uint64{}
for _, u := range units {
for _, it := range u.Clients {
m[it.Name] += it.Count
| </s> remove a2 := convertMapToArray(m, maxDomains)
d["top_queried_domains"] = convertTopArray(a2)
</s> add </s> remove m = map[string]uint64{}
for _, u := range units {
for _, it := range u.Clients {
m[it.Name] += it.Count
}
</s> add for dataKey, dataValue := range statsData {
d[dataKey] = dataValue </s> remove m = map[string]uint64{}
for _, u := range units {
for _, it := range u.BlockedDomains {
m[it.Name] += it.Count
}
</s> add statsData := map[string]interface{}{
"dns_queries": dnsQueries,
"blocked_filtering": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RFiltered] }),
"replaced_safebrowsing": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RSafeBrowsing] }),
"replaced_parental": statsCollector(func(u *unitDB) (num uint64) { return u.NResult[RParental] }),
"top_queried_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.Domains }),
"top_blocked_domains": topsCollector(maxDomains, func(u *unitDB) (pairs []countPair) { return u.BlockedDomains }),
"top_clients": topsCollector(maxClients, func(u *unitDB) (pairs []countPair) { return u.Clients }), </s> remove m := map[string]uint64{}
for _, u := range units {
for _, it := range u.Domains {
m[it.Name] += it.Count
}
</s> add dnsQueries := statsCollector(func(u *unitDB) (num uint64) { return u.NTotal })
if timeUnit != Hours && len(dnsQueries) != int(limit/24) {
log.Fatalf("len(dnsQueries) != limit: %d %d", len(dnsQueries), limit) </s> remove a2 = convertMapToArray(m, maxClients)
d["top_clients"] = convertTopArray(a2)
</s> add | for _, it := range u.BlockedDomains {
m[it.Name] += it.Count
}
}
m = map[string]uint64{}
for _, u := range units {
for _, it := range u.Clients {
m[it.Name] += it.Count | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 2271 handle nolint
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271.
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <[email protected]>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <[email protected]>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271. | https://github.com/AdguardTeam/AdGuardHome/commit/3045da1742ee0e75392de1623900d7d88b08f0b4 | internal/stats/stats_unit.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.