docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= | <mask> github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
<mask> github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
<mask> github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
<mask> github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
<mask> github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
<mask> github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
<mask> github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
<mask> github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
<mask> github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
</s> add github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= </s> remove github.com/sirupsen/logrus v1.6.0 // indirect
github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
</s> add github.com/sirupsen/logrus v1.7.0 // indirect
github.com/spf13/cobra v1.1.1 // indirect </s> remove github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGHS9rXE9x1/pEaSwCXRLOZRF6qtlw=
github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0=
</s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect
</s> add github.com/rogpeppe/go-internal v1.6.2 // indirect | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= | <mask> github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
<mask> github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
<mask> github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
<mask> github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
<mask> github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
<mask> github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
<mask> github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
<mask> github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGHS9rXE9x1/pEaSwCXRLOZRF6qtlw=
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0=
<mask> github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGHS9rXE9x1/pEaSwCXRLOZRF6qtlw=
github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0=
</s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> remove github.com/sirupsen/logrus v1.6.0 // indirect
github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
</s> add github.com/sirupsen/logrus v1.7.0 // indirect
github.com/spf13/cobra v1.1.1 // indirect </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect
</s> add github.com/rogpeppe/go-internal v1.6.2 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= | <mask> github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
<mask> github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
<mask> github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
<mask> github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGHS9rXE9x1/pEaSwCXRLOZRF6qtlw=
<mask> github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0=
<mask> github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
<mask> github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
<mask> github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
<mask> github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
<mask> github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
</s> add github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= </s> remove github.com/sirupsen/logrus v1.6.0 // indirect
github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
</s> add github.com/sirupsen/logrus v1.7.0 // indirect
github.com/spf13/cobra v1.1.1 // indirect </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect
</s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/u-root/u-root v6.0.0+incompatible
go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
</s> add github.com/u-root/u-root v7.0.0+incompatible
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4=
github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= | <mask> github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
<mask> github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
<mask> github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
<mask> github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
<mask> github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
<mask> github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
<mask> github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGHS9rXE9x1/pEaSwCXRLOZRF6qtlw=
github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0=
</s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> remove github.com/sirupsen/logrus v1.6.0 // indirect
github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
</s> add github.com/sirupsen/logrus v1.7.0 // indirect
github.com/spf13/cobra v1.1.1 // indirect | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= | <mask> github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
<mask> github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
<mask> github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
<mask> github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
<mask> github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
<mask> github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
</s> add github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= | <mask> github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
<mask> github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
<mask> github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
<mask> github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
<mask> github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/u-root/u-root v6.0.0+incompatible h1:YqPGmRoRyYmeg17KIWFRSyVq6LX5T6GSzawyA6wG6EE=
github.com/u-root/u-root v6.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
</s> add github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect
</s> add github.com/rogpeppe/go-internal v1.6.2 // indirect | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= | <mask> github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
<mask> github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
<mask> github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
<mask> github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
<mask> github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
<mask> github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/u-root/u-root v6.0.0+incompatible h1:YqPGmRoRyYmeg17KIWFRSyVq6LX5T6GSzawyA6wG6EE=
github.com/u-root/u-root v6.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
</s> add github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= </s> remove github.com/u-root/u-root v6.0.0+incompatible
go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
</s> add github.com/u-root/u-root v7.0.0+incompatible
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 </s> remove github.com/rogpeppe/go-internal v1.5.2 // indirect
</s> add github.com/rogpeppe/go-internal v1.6.2 // indirect </s> remove github.com/sirupsen/logrus v1.6.0 // indirect
github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
</s> add github.com/sirupsen/logrus v1.7.0 // indirect
github.com/spf13/cobra v1.1.1 // indirect | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= | <mask> github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
<mask> github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
<mask> github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
<mask> github.com/u-root/u-root v6.0.0+incompatible h1:YqPGmRoRyYmeg17KIWFRSyVq6LX5T6GSzawyA6wG6EE=
<mask> github.com/u-root/u-root v6.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
<mask> github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
<mask> github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
<mask> github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
<mask> github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
<mask> go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
</s> add go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= </s> remove github.com/u-root/u-root v6.0.0+incompatible
go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
</s> add github.com/u-root/u-root v7.0.0+incompatible
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 </s> remove github.com/sirupsen/logrus v1.6.0 // indirect
github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c
</s> add github.com/sirupsen/logrus v1.7.0 // indirect
github.com/spf13/cobra v1.1.1 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= | <mask> github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
<mask> github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
<mask> github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
<mask> github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
<mask> github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
<mask> go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
<mask> go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
<mask> go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
<mask> go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
<mask> go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
</s> add go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= </s> remove github.com/u-root/u-root v6.0.0+incompatible h1:YqPGmRoRyYmeg17KIWFRSyVq6LX5T6GSzawyA6wG6EE=
github.com/u-root/u-root v6.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
</s> add github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= </s> remove github.com/u-root/u-root v6.0.0+incompatible
go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
</s> add github.com/u-root/u-root v7.0.0+incompatible
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= | <mask> github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
<mask> github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
<mask> github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
<mask> github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
<mask> go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
<mask> go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
<mask> go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
<mask> go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
<mask> go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
<mask> golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
<mask> golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/u-root/u-root v6.0.0+incompatible h1:YqPGmRoRyYmeg17KIWFRSyVq6LX5T6GSzawyA6wG6EE=
github.com/u-root/u-root v6.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
</s> add github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= | <mask> go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
<mask> go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
<mask> go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
<mask> go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
<mask> go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
<mask> go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
<mask> go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
<mask> go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
<mask> go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
</s> add go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= </s> remove github.com/u-root/u-root v6.0.0+incompatible
go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
</s> add github.com/u-root/u-root v7.0.0+incompatible
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= | <mask> go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
<mask> go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
<mask> go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
<mask> go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
<mask> go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
<mask> golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
<mask> golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
</s> add go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= | <mask> go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
<mask> go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
<mask> golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
<mask> golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
</s> add go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | <mask> golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | <mask> golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/u-root/u-root v6.0.0+incompatible
go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
</s> add github.com/u-root/u-root v7.0.0+incompatible
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 h1:umElSU9WZirRdgu2yFHY0ayQkEnKiOC1TtM3fWXFnoU=
golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o=
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= | <mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
<mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
<mask> golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
<mask> golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
<mask> golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/u-root/u-root v6.0.0+incompatible
go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
</s> add github.com/u-root/u-root v7.0.0+incompatible
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= | <mask> golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o=
<mask> golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
<mask> golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
<mask> golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
<mask> golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | <mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
<mask> golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
<mask> golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
<mask> golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
<mask> golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
<mask> golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
<mask> golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k=
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
</s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 h1:R1oP0/QEyvaL7dm+mBQouQ9V1X6gqQr5taZA1yaq5zQ=
github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= | <mask> golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
<mask> golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | <mask> golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | <mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | <mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= | <mask> golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | <mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | <mask> golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
<mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | <mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
<mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
<mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= | <mask> golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
<mask> golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove golang.org/x/sys v0.0.0-20201109165425-215b40eba54c
</s> add golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 </s> remove github.com/u-root/u-root v6.0.0+incompatible
go.etcd.io/bbolt v1.3.4
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
</s> add github.com/u-root/u-root v7.0.0+incompatible
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | <mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
<mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove golang.org/x/sys v0.0.0-20201109165425-215b40eba54c
</s> add golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | <mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
<mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | <mask> golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | <mask> golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA=
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
<mask> golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove golang.org/x/sys v0.0.0-20201109165425-215b40eba54c h1:+B+zPA6081G5cEb2triOIJpcvSW4AYzmIyWAqMn2JAc=
golang.org/x/sys v0.0.0-20201109165425-215b40eba54c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= | <mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201109165425-215b40eba54c h1:+B+zPA6081G5cEb2triOIJpcvSW4AYzmIyWAqMn2JAc=
<mask> golang.org/x/sys v0.0.0-20201109165425-215b40eba54c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | <mask> golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
<mask> golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
<mask> golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
<mask> golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= | <mask> golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
<mask> golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
<mask> golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
<mask> golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
<mask> golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
<mask> golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= | <mask> golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
<mask> golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
<mask> golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
<mask> golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
<mask> golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
<mask> golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
<mask> golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
<mask> golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= | <mask> golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
<mask> golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
<mask> golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
<mask> golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
<mask> golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= | <mask> golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
<mask> golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/tools v0.0.0-20200308013534-11ec41452d41/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
golang.org/x/tools v0.0.0-20200308013534-11ec41452d41/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | <mask> golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= | <mask> google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
<mask> google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
<mask> google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
<mask> google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
<mask> google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
<mask> google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
<mask> google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= | <mask> google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
<mask> google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
<mask> google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
<mask> google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
<mask> google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
<mask> google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
<mask> google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
<mask> google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= | <mask> google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
<mask> google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
<mask> google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
<mask> google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
<mask> google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
<mask> google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
<mask> google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
<mask> google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= | <mask> google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
<mask> google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
<mask> google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
<mask> google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
<mask> google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
<mask> google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
<mask> google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
<mask> google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
<mask> google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= | <mask> google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
<mask> google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
<mask> google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
<mask> google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
<mask> google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
<mask> google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
<mask> google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
<mask> google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= | <mask> google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
<mask> google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
<mask> google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
<mask> google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
<mask> google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
<mask> google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
<mask> google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k=
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
</s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 h1:R1oP0/QEyvaL7dm+mBQouQ9V1X6gqQr5taZA1yaq5zQ=
github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= | <mask> google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
<mask> google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
<mask> google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
<mask> gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 h1:u+vle+5E78+cT/CSMD5/Y3NUpMgA83Yu2KhG+Zbco/k=
github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8/go.mod h1:CfMdguCK66I5DAUJgGKyNz8aB6vO5dZzkm9Xep6WGvw=
</s> add github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8 h1:R1oP0/QEyvaL7dm+mBQouQ9V1X6gqQr5taZA1yaq5zQ=
github.com/insomniacslk/dhcp v0.0.0-20201112113307-4de412bc85d8/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= | <mask> gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
<mask> gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
<mask> gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
</s> add howett.net/plist v0.0.0-20201026045517-117a925f2150 </s> remove golang.org/x/sys v0.0.0-20201109165425-215b40eba54c
</s> add golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= | <mask> gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
<mask> gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
<mask> gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
</s> add howett.net/plist v0.0.0-20201026045517-117a925f2150 </s> remove golang.org/x/sys v0.0.0-20201109165425-215b40eba54c
</s> add golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= | <mask> gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
<mask> gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
</s> add howett.net/plist v0.0.0-20201026045517-117a925f2150 </s> remove golang.org/x/sys v0.0.0-20201109165425-215b40eba54c
</s> add golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 </s> remove pinger.Run()
</s> add err = pinger.Run()
if err != nil {
log.Error("pinger.Run(): %v", err)
return true
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | <mask> honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
<mask> howett.net/plist v0.0.0-20201026045517-117a925f2150 h1:s7O/9fwMNd6O1yXyQ8zv+U7dfl8k+zdiLWAY8h7XdVI=
<mask> howett.net/plist v0.0.0-20201026045517-117a925f2150/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
<mask> rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
<mask> rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 h1:AQkaJpH+/FmqRjmXZPELom5zIERYZfwTjnHpfoVMQEc=
howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
</s> add honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
howett.net/plist v0.0.0-20201026045517-117a925f2150 h1:s7O/9fwMNd6O1yXyQ8zv+U7dfl8k+zdiLWAY8h7XdVI=
howett.net/plist v0.0.0-20201026045517-117a925f2150/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
</s> add howett.net/plist v0.0.0-20201026045517-117a925f2150 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
howett.net/plist v0.0.0-20201026045517-117a925f2150 h1:s7O/9fwMNd6O1yXyQ8zv+U7dfl8k+zdiLWAY8h7XdVI=
howett.net/plist v0.0.0-20201026045517-117a925f2150/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= | <mask> honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 h1:AQkaJpH+/FmqRjmXZPELom5zIERYZfwTjnHpfoVMQEc=
<mask> howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
<mask> rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
<mask> rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
<mask> sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
<mask> sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
</s> add howett.net/plist v0.0.0-20201026045517-117a925f2150 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | go.sum |
"github.com/go-ping/ping" | <mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv4/server4"
<mask> )
<mask>
<mask> // v4Server - DHCPv4 server
<mask> type v4Server struct {
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove "github.com/sparrc/go-ping"
</s> add </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
</s> add howett.net/plist v0.0.0-20201026045517-117a925f2150 </s> remove pinger.Run()
</s> add err = pinger.Run()
if err != nil {
log.Error("pinger.Run(): %v", err)
return true
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | internal/dhcpd/v4.go |
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv4/server4"
<mask> "github.com/sparrc/go-ping"
<mask> )
<mask>
<mask> // v4Server - DHCPv4 server
<mask> type v4Server struct {
<mask> srv *server4.Server
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5
</s> add howett.net/plist v0.0.0-20201026045517-117a925f2150 </s> remove pinger.Run()
</s> add err = pinger.Run()
if err != nil {
log.Error("pinger.Run(): %v", err)
return true
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | internal/dhcpd/v4.go |
|
err = pinger.Run()
if err != nil {
log.Error("pinger.Run(): %v", err)
return true
} | <mask> pinger.OnRecv = func(pkt *ping.Packet) {
<mask> reply = true
<mask> }
<mask> log.Debug("dhcpv4: Sending ICMP Echo to %v", target)
<mask> pinger.Run()
<mask>
<mask> if reply {
<mask> log.Info("dhcpv4: IP conflict: %v is already used by another device", target)
<mask> return false
<mask> }
</s> Pull request: all: update backend tools and dependencies
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <[email protected]>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <[email protected]>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies </s> remove "github.com/sparrc/go-ping"
</s> add </s> remove # make build output
rm -f AdGuardHome
rm -f AdGuardHome.exe
# tests output
rm -rf data
rm -f coverage.txt
# static build output
rm -rf build
# dist folder
rm -rf $(DIST_DIR)
# client deps
rm -rf client/node_modules
# packr-generated files
PATH=$(GOPATH)/bin:$(PATH) packr clean || true
</s> add rm -f ./AdGuardHome ./AdGuardHome.exe ./coverage.txt
rm -f -r ./build/ ./client/node_modules/ ./data/ $(DIST_DIR)
# Set the GOPATH explicitly in case make clean is called from under sudo
# after a Docker build.
env PATH="$(GOPATH)/bin:$$PATH" packr clean </s> remove TEST_FLAGS := --race -v
</s> add TEST_FLAGS := --race $(VERBOSE) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/642dcd647c0f753f7955499484a9ad01a4a36eca | internal/dhcpd/v4.go |
<mask> log.Error("Couldn't write config: %s", err)
<mask> return err
<mask> }
<mask>
<mask> userFilter := userFilter()
<mask> err = userFilter.save()
<mask> if err != nil {
<mask> log.Error("Couldn't save the user filter: %s", err)
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove userFilter := userFilter()
err = userFilter.save()
if err != nil {
log.Error("Couldn't save the user filter: %s", err)
}
</s> add </s> remove err := filter.load()
</s> add err := f.load(filter) </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove _, err = fmt.Fprintf(w, "OK %d rules\n", f.RulesCount)
</s> add _, err = fmt.Fprintf(w, "OK %d rules\n", filt.RulesCount) </s> remove resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false)
</s> add resp.Updated, err = f.refreshFilters(flags|FilterRefreshForce, false) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/config.go |
|
<mask> httpRegister(http.MethodPost, "/control/update", handleUpdate)
<mask>
<mask> httpRegister("GET", "/control/profile", handleGetProfile)
<mask>
<mask> RegisterFilteringHandlers()
<mask> RegisterTLSHandlers()
<mask> RegisterBlockedServicesHandlers()
<mask> RegisterAuthHandlers()
<mask>
<mask> http.HandleFunc("/dns-query", postInstall(handleDOH))
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func RegisterFilteringHandlers() {
httpRegister("GET", "/control/filtering/status", handleFilteringStatus)
httpRegister("POST", "/control/filtering/config", handleFilteringConfig)
httpRegister("POST", "/control/filtering/add_url", handleFilteringAddURL)
httpRegister("POST", "/control/filtering/remove_url", handleFilteringRemoveURL)
httpRegister("POST", "/control/filtering/set_url", handleFilteringSetURL)
httpRegister("POST", "/control/filtering/refresh", handleFilteringRefresh)
httpRegister("POST", "/control/filtering/set_rules", handleFilteringSetRules)
httpRegister("GET", "/control/filtering/check_host", handleCheckHost)
</s> add func (f *Filtering) RegisterFilteringHandlers() {
httpRegister("GET", "/control/filtering/status", f.handleFilteringStatus)
httpRegister("POST", "/control/filtering/config", f.handleFilteringConfig)
httpRegister("POST", "/control/filtering/add_url", f.handleFilteringAddURL)
httpRegister("POST", "/control/filtering/remove_url", f.handleFilteringRemoveURL)
httpRegister("POST", "/control/filtering/set_url", f.handleFilteringSetURL)
httpRegister("POST", "/control/filtering/refresh", f.handleFilteringRefresh)
httpRegister("POST", "/control/filtering/set_rules", f.handleFilteringSetRules)
httpRegister("GET", "/control/filtering/check_host", f.handleCheckHost) </s> remove func filterSetProperties(url string, newf filter, whitelist bool) int {
</s> add func (f *Filtering) filterSetProperties(url string, newf filter, whitelist bool) int { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control.go |
|
func (f *Filtering) handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { | <mask> URL string `json:"url"`
<mask> Whitelist bool `json:"whitelist"`
<mask> }
<mask>
<mask> func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) {
<mask> fj := filterAddJSON{}
<mask> err := json.NewDecoder(r.Body).Decode(&fj)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to parse request body json: %s", err)
<mask> return
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func handleFilteringSetURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringConfig(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringConfig(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRefresh(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
filt := filter{ | <mask> return
<mask> }
<mask>
<mask> // Set necessary properties
<mask> f := filter{
<mask> Enabled: true,
<mask> URL: fj.URL,
<mask> Name: fj.Name,
<mask> white: fj.Whitelist,
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f.ID = assignUniqueFilterID()
</s> add filt.ID = assignUniqueFilterID() </s> remove f := filter{
</s> add filt := filter{ </s> remove Timeout: time.Minute * 5,
</s> add Timeout: 5 * time.Second, </s> remove status := filterSetProperties(fj.URL, f, fj.Whitelist)
</s> add status := f.filterSetProperties(fj.URL, filt, fj.Whitelist) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
filt.ID = assignUniqueFilterID() | <mask> URL: fj.URL,
<mask> Name: fj.Name,
<mask> white: fj.Whitelist,
<mask> }
<mask> f.ID = assignUniqueFilterID()
<mask>
<mask> // Download the filter contents
<mask> ok, err := f.update()
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) </s> remove f := filter{
</s> add filt := filter{ </s> remove httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
return
}
// Save the filter contents
err = f.save()
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to save filter %d due to %s", f.ID, err)
</s> add httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", filt.URL) </s> remove ok, err := f.update()
assert.True(t, ok && err == nil)
</s> add ok, err := Context.filters.update(&f)
assert.Equal(t, nil, err)
assert.True(t, ok) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
ok, err := f.update(&filt) | <mask> }
<mask> f.ID = assignUniqueFilterID()
<mask>
<mask> // Download the filter contents
<mask> ok, err := f.update()
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
<mask> return
<mask> }
<mask> if f.RulesCount == 0 {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f.ID = assignUniqueFilterID()
</s> add filt.ID = assignUniqueFilterID() </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) </s> remove body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
</s> add htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
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 httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
return
}
// Save the filter contents
err = f.save()
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to save filter %d due to %s", f.ID, err)
</s> add httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", filt.URL) </s> remove f := &(*filters)[i]
if f.URL != url {
</s> add filt := &(*filters)[i]
if filt.URL != url { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) | <mask>
<mask> // Download the filter contents
<mask> ok, err := f.update()
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
<mask> return
<mask> }
<mask> if f.RulesCount == 0 {
<mask> httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
<mask> return
<mask> }
<mask> if !ok {
<mask> httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
<mask> return
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
return
}
// Save the filter contents
err = f.save()
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to save filter %d due to %s", f.ID, err)
</s> add httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", filt.URL) </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove f.ID = assignUniqueFilterID()
</s> add filt.ID = assignUniqueFilterID() </s> remove if !filterAdd(f) {
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
</s> add if !filterAdd(filt) {
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", filt.URL) </s> remove f := &(*filters)[i]
if f.URL != url {
</s> add filt := &(*filters)[i]
if filt.URL != url { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", filt.URL) | <mask> httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
<mask> return
<mask> }
<mask> if !ok {
<mask> httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
<mask> return
<mask> }
<mask>
<mask> // Save the filter contents
<mask> err = f.save()
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to save filter %d due to %s", f.ID, err)
<mask> return
<mask> }
<mask>
<mask> // URL is deemed valid, append it to filters, update config, write new filter file and tell dns to reload it
<mask> if !filterAdd(f) {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) </s> remove if !filterAdd(f) {
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
</s> add if !filterAdd(filt) {
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", filt.URL) </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
if !filterAdd(filt) {
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", filt.URL) | <mask> return
<mask> }
<mask>
<mask> // URL is deemed valid, append it to filters, update config, write new filter file and tell dns to reload it
<mask> if !filterAdd(f) {
<mask> httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
<mask> return
<mask> }
<mask>
<mask> onConfigModified()
<mask> enableFilters(true)
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
return
}
// Save the filter contents
err = f.save()
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to save filter %d due to %s", f.ID, err)
</s> add httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", filt.URL) </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { </s> remove _, err = fmt.Fprintf(w, "OK %d rules\n", f.RulesCount)
</s> add _, err = fmt.Fprintf(w, "OK %d rules\n", filt.RulesCount) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
_, err = fmt.Fprintf(w, "OK %d rules\n", filt.RulesCount) | <mask>
<mask> onConfigModified()
<mask> enableFilters(true)
<mask>
<mask> _, err = fmt.Fprintf(w, "OK %d rules\n", f.RulesCount)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't write body: %s", err)
<mask> }
<mask> }
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { </s> remove userFilter := userFilter()
err = userFilter.save()
if err != nil {
log.Error("Couldn't save the user filter: %s", err)
}
</s> add </s> remove if !filterAdd(f) {
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL)
</s> add if !filterAdd(filt) {
httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", filt.URL) </s> remove resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false)
</s> add resp.Updated, err = f.refreshFilters(flags|FilterRefreshForce, false) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
func (f *Filtering) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) { | <mask> httpError(w, http.StatusInternalServerError, "Couldn't write body: %s", err)
<mask> }
<mask> }
<mask>
<mask> func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
<mask>
<mask> type request struct {
<mask> URL string `json:"url"`
<mask> Whitelist bool `json:"whitelist"`
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRefresh(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { </s> remove _, err = fmt.Fprintf(w, "OK %d rules\n", f.RulesCount)
</s> add _, err = fmt.Fprintf(w, "OK %d rules\n", filt.RulesCount) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
func (f *Filtering) handleFilteringSetURL(w http.ResponseWriter, r *http.Request) { | <mask> Whitelist bool `json:"whitelist"`
<mask> Data filterURLJSON `json:"data"`
<mask> }
<mask>
<mask> func handleFilteringSetURL(w http.ResponseWriter, r *http.Request) {
<mask> fj := filterURLReq{}
<mask> err := json.NewDecoder(r.Body).Decode(&fj)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "json decode: %s", err)
<mask> return
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringConfig(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringConfig(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRefresh(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
filt := filter{ | <mask> http.Error(w, "invalid URL", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> f := filter{
<mask> Enabled: fj.Data.Enabled,
<mask> Name: fj.Data.Name,
<mask> URL: fj.Data.URL,
<mask> }
<mask> status := filterSetProperties(fj.URL, f, fj.Whitelist)
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove status := filterSetProperties(fj.URL, f, fj.Whitelist)
</s> add status := f.filterSetProperties(fj.URL, filt, fj.Whitelist) </s> remove f := filter{
</s> add filt := filter{ </s> remove Timeout: time.Minute * 5,
</s> add Timeout: 5 * time.Second, </s> remove f.ID = assignUniqueFilterID()
</s> add filt.ID = assignUniqueFilterID() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
status := f.filterSetProperties(fj.URL, filt, fj.Whitelist) | <mask> Enabled: fj.Data.Enabled,
<mask> Name: fj.Data.Name,
<mask> URL: fj.Data.URL,
<mask> }
<mask> status := filterSetProperties(fj.URL, f, fj.Whitelist)
<mask> if (status & statusFound) == 0 {
<mask> http.Error(w, "URL doesn't exist", http.StatusBadRequest)
<mask> return
<mask> }
<mask> if (status & statusURLExists) != 0 {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f := filter{
</s> add filt := filter{ </s> remove updateCount, updateFilters, updateFlags, netError = refreshFiltersArray(&config.Filters, force)
</s> add updateCount, updateFilters, updateFlags, netError = f.refreshFiltersArray(&config.Filters, force) </s> remove if f.Enabled != newf.Enabled {
</s> add if filt.Enabled != newf.Enabled { </s> remove body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
</s> add htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
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 f.Enabled = newf.Enabled
if f.Enabled {
</s> add filt.Enabled = newf.Enabled
if filt.Enabled { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
nUpdated, _ := f.refreshFilters(flags, true) | <mask> flags := FilterRefreshBlocklists
<mask> if fj.Whitelist {
<mask> flags = FilterRefreshAllowlists
<mask> }
<mask> nUpdated, _ := refreshFilters(flags, true)
<mask> // if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
<mask> // if not - we restart the filtering ourselves
<mask> restart = false
<mask> if nUpdated == 0 {
<mask> restart = true
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false)
</s> add resp.Updated, err = f.refreshFilters(flags|FilterRefreshForce, false) </s> remove checksum := crc32.ChecksumIEEE(body)
</s> add </s> remove // Count lines in the filter
for len(data) != 0 {
line := util.SplitNext(&data, '\n')
</s> add checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
line = strings.TrimSpace(line) </s> remove var firstChunk []byte
if len(body) <= 4096 {
firstChunk = body
} else {
firstChunk = body[:4096]
}
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
// Extract filter name and count number of rules
rulesCount, filterName := parseFilterContents(body)
log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
</s> add log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { | <mask> enableFilters(true)
<mask> }
<mask> }
<mask>
<mask> func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err)
<mask> return
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringConfig(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringConfig(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetURL(w http.ResponseWriter, r *http.Request) { </s> remove userFilter := userFilter()
err = userFilter.save()
if err != nil {
log.Error("Couldn't save the user filter: %s", err)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
<mask> }
<mask>
<mask> config.UserRules = strings.Split(string(body), "\n")
<mask> onConfigModified()
<mask> userFilter := userFilter()
<mask> err = userFilter.save()
<mask> if err != nil {
<mask> log.Error("Couldn't save the user filter: %s", err)
<mask> }
<mask> enableFilters(true)
<mask> }
<mask>
<mask> func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
<mask> type Req struct {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove userFilter := userFilter()
err = userFilter.save()
if err != nil {
log.Error("Couldn't save the user filter: %s", err)
return err
}
</s> add </s> remove func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRefresh(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringConfig(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringConfig(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
|
func (f *Filtering) handleFilteringRefresh(w http.ResponseWriter, r *http.Request) { | <mask> }
<mask> enableFilters(true)
<mask> }
<mask>
<mask> func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
<mask> type Req struct {
<mask> White bool `json:"whitelist"`
<mask> }
<mask> type Resp struct {
<mask> Updated int `json:"updated"`
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove userFilter := userFilter()
err = userFilter.save()
if err != nil {
log.Error("Couldn't save the user filter: %s", err)
}
</s> add </s> remove func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
resp.Updated, err = f.refreshFilters(flags|FilterRefreshForce, false) | <mask> flags := FilterRefreshBlocklists
<mask> if req.White {
<mask> flags = FilterRefreshAllowlists
<mask> }
<mask> resp.Updated, err = refreshFilters(flags|FilterRefreshForce, false)
<mask> Context.controlLock.Lock()
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "%s", err)
<mask> return
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove nUpdated, _ := refreshFilters(flags, true)
</s> add nUpdated, _ := f.refreshFilters(flags, true) </s> remove _, err = fmt.Fprintf(w, "OK %d rules\n", f.RulesCount)
</s> add _, err = fmt.Fprintf(w, "OK %d rules\n", filt.RulesCount) </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove userFilter := userFilter()
err = userFilter.save()
if err != nil {
log.Error("Couldn't save the user filter: %s", err)
return err
}
</s> add </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
func (f *Filtering) handleFilteringStatus(w http.ResponseWriter, r *http.Request) { | <mask> return fj
<mask> }
<mask>
<mask> // Get filtering configuration
<mask> func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
<mask> resp := filteringConfig{}
<mask> config.RLock()
<mask> resp.Enabled = config.DNS.FilteringEnabled
<mask> resp.Interval = config.DNS.FiltersUpdateIntervalHours
<mask> for _, f := range config.Filters {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func handleFilteringConfig(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringConfig(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleCheckHost(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleCheckHost(w http.ResponseWriter, r *http.Request) { </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
refreshLock.Lock()
_, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
refreshLock.Unlock()
refreshStatus = 0
</s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) {
f.refreshLock.Lock()
_, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
f.refreshLock.Unlock()
f.refreshStatus = 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
func (f *Filtering) handleFilteringConfig(w http.ResponseWriter, r *http.Request) { | <mask> }
<mask> }
<mask>
<mask> // Set filtering configuration
<mask> func handleFilteringConfig(w http.ResponseWriter, r *http.Request) {
<mask> req := filteringConfig{}
<mask> err := json.NewDecoder(r.Body).Decode(&req)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "json decode: %s", err)
<mask> return
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func handleFilteringSetURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringStatus(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { </s> remove userFilter := userFilter()
err = userFilter.save()
if err != nil {
log.Error("Couldn't save the user filter: %s", err)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
func (f *Filtering) handleCheckHost(w http.ResponseWriter, r *http.Request) { | <mask> CanonName string `json:"cname"` // CNAME value
<mask> IPList []net.IP `json:"ip_addrs"` // list of IP addresses
<mask> }
<mask>
<mask> func handleCheckHost(w http.ResponseWriter, r *http.Request) {
<mask> q := r.URL.Query()
<mask> host := q.Get("name")
<mask>
<mask> setts := Context.dnsFilter.GetConfig()
<mask> setts.FilteringEnabled = true
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringStatus(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringConfig(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringConfig(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringAddURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringAddURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringSetURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetURL(w http.ResponseWriter, r *http.Request) { </s> remove func handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringRemoveURL(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
func (f *Filtering) RegisterFilteringHandlers() {
httpRegister("GET", "/control/filtering/status", f.handleFilteringStatus)
httpRegister("POST", "/control/filtering/config", f.handleFilteringConfig)
httpRegister("POST", "/control/filtering/add_url", f.handleFilteringAddURL)
httpRegister("POST", "/control/filtering/remove_url", f.handleFilteringRemoveURL)
httpRegister("POST", "/control/filtering/set_url", f.handleFilteringSetURL)
httpRegister("POST", "/control/filtering/refresh", f.handleFilteringRefresh)
httpRegister("POST", "/control/filtering/set_rules", f.handleFilteringSetRules)
httpRegister("GET", "/control/filtering/check_host", f.handleCheckHost) | <mask> _, _ = w.Write(js)
<mask> }
<mask>
<mask> // RegisterFilteringHandlers - register handlers
<mask> func RegisterFilteringHandlers() {
<mask> httpRegister("GET", "/control/filtering/status", handleFilteringStatus)
<mask> httpRegister("POST", "/control/filtering/config", handleFilteringConfig)
<mask> httpRegister("POST", "/control/filtering/add_url", handleFilteringAddURL)
<mask> httpRegister("POST", "/control/filtering/remove_url", handleFilteringRemoveURL)
<mask> httpRegister("POST", "/control/filtering/set_url", handleFilteringSetURL)
<mask> httpRegister("POST", "/control/filtering/refresh", handleFilteringRefresh)
<mask> httpRegister("POST", "/control/filtering/set_rules", handleFilteringSetRules)
<mask> httpRegister("GET", "/control/filtering/check_host", handleCheckHost)
<mask> }
<mask>
<mask> func checkFiltersUpdateIntervalHours(i uint32) bool {
<mask> return i == 0 || i == 1 || i == 12 || i == 1*24 || i == 3*24 || i == 7*24
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func loadFilters(array []filter) {
</s> add func (f *Filtering) loadFilters(array []filter) { </s> remove if updated {
err := uf.saveAndBackupOld()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)
continue
}
} else {
e := os.Chtimes(uf.Path(), uf.LastUpdated, uf.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
</s> add </s> remove body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
</s> add htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
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 f := &(*filters)[i]
if f.URL != url {
</s> add filt := &(*filters)[i]
if filt.URL != url { </s> remove nUpdated, _ := refreshFilters(flags, true)
</s> add nUpdated, _ := f.refreshFilters(flags, true) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/control_filtering.go |
Context.filters.Init() | <mask>
<mask> Context.rdns = InitRDNS(Context.dnsServer, &Context.clients)
<mask> Context.whois = initWhois(&Context.clients)
<mask>
<mask> initFiltering()
<mask> return nil
<mask> }
<mask>
<mask> func isRunning() bool {
<mask> return Context.dnsServer != nil && Context.dnsServer.IsRunning()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove return filter.save()
</s> add tmpfile.Close()
tmpfile = nil
return true, nil </s> remove refreshLock.Lock()
nUpdated, _ := refreshFiltersIfNecessary(flags)
refreshLock.Unlock()
refreshStatus = 0
</s> add f.refreshLock.Lock()
nUpdated, _ := f.refreshFiltersIfNecessary(flags)
f.refreshLock.Unlock()
f.refreshStatus = 0 </s> remove filter.Data = body
</s> add </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/dns.go |
Context.filters.Start() | <mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask>
<mask> Context.dnsFilter.Start()
<mask> startFiltering()
<mask> Context.stats.Start()
<mask> Context.queryLog.Start()
<mask>
<mask> const topClientsNumber = 100 // the number of clients to get
<mask> topClients := Context.stats.GetTopClientsIP(topClientsNumber)
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func startFiltering() {
</s> add // Start - start the module
func (f *Filtering) Start() {
f.RegisterFilteringHandlers()
</s> remove go periodicallyRefreshFilters()
</s> add go f.periodicallyRefreshFilters()
}
// Close - close the module
func (f *Filtering) Close() { </s> remove func parseFilterContents(contents []byte) (int, string) {
data := string(contents)
</s> add func (f *Filtering) parseFilterContents(file io.Reader) (int, uint32, string) { </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/dns.go |
Context.filters.Close()
| <mask> }
<mask>
<mask> log.Debug("Closed all DNS modules")
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove startFiltering()
</s> add Context.filters.Start() </s> remove f.unload()
</s> add filt.unload() </s> remove err := filter.load()
</s> add err := f.load(filter) </s> remove uf.LastUpdated = now
</s> add | [
"keep",
"add",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/dns.go |
"bufio" | <mask>
<mask> import (
<mask> "fmt"
<mask> "hash/crc32"
<mask> "io"
<mask> "io/ioutil"
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove "github.com/AdguardTeam/golibs/file"
</s> add </s> remove nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> add nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
// type FilteringConf struct {
// BlockLists []filter
// AllowLists []filter
// UserRules []string
// }
// Filtering - module object
type Filtering struct {
// conf FilteringConf </s> remove go periodicallyRefreshFilters()
</s> add go f.periodicallyRefreshFilters()
}
// Close - close the module
func (f *Filtering) Close() { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
"io" | <mask> "fmt"
<mask> "hash/crc32"
<mask> "io/ioutil"
<mask> "os"
<mask> "path/filepath"
<mask> "regexp"
<mask> "strconv"
<mask> "strings"
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // ---------------------
// general helpers
// ---------------------
</s> add </s> remove go periodicallyRefreshFilters()
</s> add go f.periodicallyRefreshFilters()
}
// Close - close the module
func (f *Filtering) Close() { </s> remove startFiltering()
</s> add Context.filters.Start() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/util"
<mask> "github.com/AdguardTeam/golibs/file"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> var (
<mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> add nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
// type FilteringConf struct {
// BlockLists []filter
// AllowLists []filter
// UserRules []string
// }
// Filtering - module object
type Filtering struct {
// conf FilteringConf </s> remove )
</s> add filterTitleRegexp *regexp.Regexp
} </s> remove func initFiltering() {
loadFilters(config.Filters)
loadFilters(config.WhitelistFilters)
</s> add // Init - initialize the module
func (f *Filtering) Init() {
f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
_ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
f.loadFilters(config.Filters)
f.loadFilters(config.WhitelistFilters) </s> remove func refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) {
</s> add func (f *Filtering) refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
|
nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
// type FilteringConf struct {
// BlockLists []filter
// AllowLists []filter
// UserRules []string
// }
// Filtering - module object
type Filtering struct {
// conf FilteringConf | <mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> var (
<mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask> filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
<mask> refreshStatus uint32 // 0:none; 1:in progress
<mask> refreshLock sync.Mutex
<mask> )
<mask>
<mask> func initFiltering() {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove )
</s> add filterTitleRegexp *regexp.Regexp
} </s> remove "github.com/AdguardTeam/golibs/file"
</s> add </s> remove func initFiltering() {
loadFilters(config.Filters)
loadFilters(config.WhitelistFilters)
</s> add // Init - initialize the module
func (f *Filtering) Init() {
f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
_ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
f.loadFilters(config.Filters)
f.loadFilters(config.WhitelistFilters) </s> remove func refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) {
</s> add func (f *Filtering) refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) { </s> remove // ---------------------
// general helpers
// ---------------------
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
filterTitleRegexp *regexp.Regexp
} | <mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask> filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
<mask> refreshStatus uint32 // 0:none; 1:in progress
<mask> refreshLock sync.Mutex
<mask> )
<mask>
<mask> func initFiltering() {
<mask> loadFilters(config.Filters)
<mask> loadFilters(config.WhitelistFilters)
<mask> deduplicateFilters()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> add nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
// type FilteringConf struct {
// BlockLists []filter
// AllowLists []filter
// UserRules []string
// }
// Filtering - module object
type Filtering struct {
// conf FilteringConf </s> remove func initFiltering() {
loadFilters(config.Filters)
loadFilters(config.WhitelistFilters)
</s> add // Init - initialize the module
func (f *Filtering) Init() {
f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
_ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
f.loadFilters(config.Filters)
f.loadFilters(config.WhitelistFilters) </s> remove "github.com/AdguardTeam/golibs/file"
</s> add </s> remove filter.Data = nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
// Init - initialize the module
func (f *Filtering) Init() {
f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
_ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
f.loadFilters(config.Filters)
f.loadFilters(config.WhitelistFilters) | <mask> refreshStatus uint32 // 0:none; 1:in progress
<mask> refreshLock sync.Mutex
<mask> )
<mask>
<mask> func initFiltering() {
<mask> loadFilters(config.Filters)
<mask> loadFilters(config.WhitelistFilters)
<mask> deduplicateFilters()
<mask> updateUniqueFilterID(config.Filters)
<mask> updateUniqueFilterID(config.WhitelistFilters)
<mask> }
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove )
</s> add filterTitleRegexp *regexp.Regexp
} </s> remove nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> add nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
// type FilteringConf struct {
// BlockLists []filter
// AllowLists []filter
// UserRules []string
// }
// Filtering - module object
type Filtering struct {
// conf FilteringConf </s> remove func startFiltering() {
</s> add // Start - start the module
func (f *Filtering) Start() {
f.RegisterFilteringHandlers()
</s> remove initFiltering()
</s> add Context.filters.Init() </s> remove // ---------------------
// general helpers
// ---------------------
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
// Start - start the module
func (f *Filtering) Start() {
f.RegisterFilteringHandlers()
| <mask> updateUniqueFilterID(config.Filters)
<mask> updateUniqueFilterID(config.WhitelistFilters)
<mask> }
<mask>
<mask> func startFiltering() {
<mask> // Here we should start updating filters,
<mask> // but currently we can't wake up the periodic task to do so.
<mask> // So for now we just start this periodic task from here.
<mask> go periodicallyRefreshFilters()
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove go periodicallyRefreshFilters()
</s> add go f.periodicallyRefreshFilters()
}
// Close - close the module
func (f *Filtering) Close() { </s> remove startFiltering()
</s> add Context.filters.Start() </s> remove // . rename the old file (1.txt -> 1.txt.old)
// . store the new data on disk (1.txt)
</s> add // . rename the temporary file (<temp> -> 1.txt)
// Note that this method works only on UNIX.
// On Windows we don't pass files to dnsfilter - we pass the whole data. </s> remove func periodicallyRefreshFilters() {
</s> add func (f *Filtering) periodicallyRefreshFilters() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
go f.periodicallyRefreshFilters()
}
// Close - close the module
func (f *Filtering) Close() { | <mask> func startFiltering() {
<mask> // Here we should start updating filters,
<mask> // but currently we can't wake up the periodic task to do so.
<mask> // So for now we just start this periodic task from here.
<mask> go periodicallyRefreshFilters()
<mask> }
<mask>
<mask> func defaultFilters() []filter {
<mask> return []filter{
<mask> {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func startFiltering() {
</s> add // Start - start the module
func (f *Filtering) Start() {
f.RegisterFilteringHandlers()
</s> remove f := filter{
</s> add filt := filter{ </s> remove startFiltering()
</s> add Context.filters.Start() </s> remove func periodicallyRefreshFilters() {
</s> add func (f *Filtering) periodicallyRefreshFilters() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
func (f *Filtering) filterSetProperties(url string, newf filter, whitelist bool) int { | <mask> )
<mask>
<mask> // Update properties for a filter specified by its URL
<mask> // Return status* flags.
<mask> func filterSetProperties(url string, newf filter, whitelist bool) int {
<mask> r := 0
<mask> config.Lock()
<mask> defer config.Unlock()
<mask>
<mask> filters := &config.Filters
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func refreshFiltersIfNecessary(flags int) (int, bool) {
</s> add func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { </s> remove // . Remove the old filter files (1.txt.old)
</s> add </s> remove func loadFilters(array []filter) {
</s> add func (f *Filtering) loadFilters(array []filter) { </s> remove func periodicallyRefreshFilters() {
</s> add func (f *Filtering) periodicallyRefreshFilters() { </s> remove func refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&refreshStatus, 0, 1)
</s> add func (f *Filtering) refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
filt := &(*filters)[i]
if filt.URL != url { | <mask> filters = &config.WhitelistFilters
<mask> }
<mask>
<mask> for i := range *filters {
<mask> f := &(*filters)[i]
<mask> if f.URL != url {
<mask> continue
<mask> }
<mask>
<mask> log.Debug("filter: set properties: %s: {%s %s %v}",
<mask> f.URL, newf.Name, newf.URL, newf.Enabled)
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f.URL, newf.Name, newf.URL, newf.Enabled)
f.Name = newf.Name
</s> add filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name </s> remove if f.URL != newf.URL {
</s> add if filt.URL != newf.URL { </s> remove if updated {
err := uf.saveAndBackupOld()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)
continue
}
} else {
e := os.Chtimes(uf.Path(), uf.LastUpdated, uf.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
</s> add </s> remove updated, err := uf.update()
</s> add updated, err := f.update(uf) </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name | <mask> continue
<mask> }
<mask>
<mask> log.Debug("filter: set properties: %s: {%s %s %v}",
<mask> f.URL, newf.Name, newf.URL, newf.Enabled)
<mask> f.Name = newf.Name
<mask>
<mask> if f.URL != newf.URL {
<mask> r |= statusURLChanged | statusUpdateRequired
<mask> if filterExistsNoLock(newf.URL) {
<mask> return statusURLExists
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove if f.URL != newf.URL {
</s> add if filt.URL != newf.URL { </s> remove f := &(*filters)[i]
if f.URL != url {
</s> add filt := &(*filters)[i]
if filt.URL != url { </s> remove f.URL = newf.URL
f.unload()
f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.URL = newf.URL
filt.unload()
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove f.unload()
</s> add filt.unload() </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
if filt.URL != newf.URL { | <mask> log.Debug("filter: set properties: %s: {%s %s %v}",
<mask> f.URL, newf.Name, newf.URL, newf.Enabled)
<mask> f.Name = newf.Name
<mask>
<mask> if f.URL != newf.URL {
<mask> r |= statusURLChanged | statusUpdateRequired
<mask> if filterExistsNoLock(newf.URL) {
<mask> return statusURLExists
<mask> }
<mask> f.URL = newf.URL
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f.URL, newf.Name, newf.URL, newf.Enabled)
f.Name = newf.Name
</s> add filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name </s> remove f := &(*filters)[i]
if f.URL != url {
</s> add filt := &(*filters)[i]
if filt.URL != url { </s> remove f.URL = newf.URL
f.unload()
f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.URL = newf.URL
filt.unload()
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove f.unload()
</s> add filt.unload() </s> remove if f.Enabled != newf.Enabled {
</s> add if filt.Enabled != newf.Enabled { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
filt.URL = newf.URL
filt.unload()
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 | <mask> r |= statusURLChanged | statusUpdateRequired
<mask> if filterExistsNoLock(newf.URL) {
<mask> return statusURLExists
<mask> }
<mask> f.URL = newf.URL
<mask> f.unload()
<mask> f.LastUpdated = time.Time{}
<mask> f.checksum = 0
<mask> f.RulesCount = 0
<mask> }
<mask>
<mask> if f.Enabled != newf.Enabled {
<mask> r |= statusEnabledChanged
<mask> f.Enabled = newf.Enabled
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove if f.Enabled != newf.Enabled {
</s> add if filt.Enabled != newf.Enabled { </s> remove if f.URL != newf.URL {
</s> add if filt.URL != newf.URL { </s> remove e := f.load()
</s> add e := f.load(filt) </s> remove f.URL, newf.Name, newf.URL, newf.Enabled)
f.Name = newf.Name
</s> add filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name </s> remove f.Enabled = newf.Enabled
if f.Enabled {
</s> add filt.Enabled = newf.Enabled
if filt.Enabled { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
if filt.Enabled != newf.Enabled { | <mask> f.checksum = 0
<mask> f.RulesCount = 0
<mask> }
<mask>
<mask> if f.Enabled != newf.Enabled {
<mask> r |= statusEnabledChanged
<mask> f.Enabled = newf.Enabled
<mask> if f.Enabled {
<mask> if (r & statusURLChanged) == 0 {
<mask> e := f.load()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f.Enabled = newf.Enabled
if f.Enabled {
</s> add filt.Enabled = newf.Enabled
if filt.Enabled { </s> remove e := f.load()
</s> add e := f.load(filt) </s> remove f.URL = newf.URL
f.unload()
f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.URL = newf.URL
filt.unload()
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove updateCount, updateFilters, updateFlags, netError = refreshFiltersArray(&config.Filters, force)
</s> add updateCount, updateFilters, updateFlags, netError = f.refreshFiltersArray(&config.Filters, force) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
filt.Enabled = newf.Enabled
if filt.Enabled { | <mask> }
<mask>
<mask> if f.Enabled != newf.Enabled {
<mask> r |= statusEnabledChanged
<mask> f.Enabled = newf.Enabled
<mask> if f.Enabled {
<mask> if (r & statusURLChanged) == 0 {
<mask> e := f.load()
<mask> if e != nil {
<mask> // This isn't a fatal error,
<mask> // because it may occur when someone removes the file from disk.
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove e := f.load()
</s> add e := f.load(filt) </s> remove if f.Enabled != newf.Enabled {
</s> add if filt.Enabled != newf.Enabled { </s> remove f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove f.URL = newf.URL
f.unload()
f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.URL = newf.URL
filt.unload()
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.