docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
IP: netip.MustParseAddr("2001::1"), | <mask> require.True(t, ok)
<mask>
<mask> // Add dynamic leases.
<mask> dynLeases := []*Lease{{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0x11, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }, {
<mask> IP: net.ParseIP("2001::2"),
<mask> HWAddr: net.HardwareAddr{0x22, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }}
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove IP: net.ParseIP("2001::2"),
</s> add IP: netip.MustParseAddr("2001::2"), </s> remove IP: net.ParseIP("2001::1"),
</s> add IP: netip.MustParseAddr("2001::1"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), </s> remove IP: net.ParseIP("2001::3"),
</s> add IP: netip.MustParseAddr("2001::3"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dhcpd/v6_unix_test.go |
IP: netip.MustParseAddr("2001::2"), | <mask> dynLeases := []*Lease{{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0x11, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }, {
<mask> IP: net.ParseIP("2001::2"),
<mask> HWAddr: net.HardwareAddr{0x22, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }}
<mask>
<mask> for _, l := range dynLeases {
<mask> s.addLease(l)
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove IP: net.ParseIP("2001::1"),
</s> add IP: netip.MustParseAddr("2001::1"), </s> remove IP: net.ParseIP("2001::1"),
</s> add IP: netip.MustParseAddr("2001::1"), </s> remove IP: net.ParseIP("2001::3"),
</s> add IP: netip.MustParseAddr("2001::3"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), </s> remove IP: net.IP{192, 168, 10, 151},
</s> add IP: netip.MustParseAddr("192.168.10.151"), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dhcpd/v6_unix_test.go |
IP: netip.MustParseAddr("2001::1"), | <mask> s.addLease(l)
<mask> }
<mask>
<mask> stLeases := []*Lease{{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0x33, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }, {
<mask> IP: net.ParseIP("2001::3"),
<mask> HWAddr: net.HardwareAddr{0x22, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }}
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove IP: net.ParseIP("2001::3"),
</s> add IP: netip.MustParseAddr("2001::3"), </s> remove IP: net.ParseIP("2001::2"),
</s> add IP: netip.MustParseAddr("2001::2"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), </s> remove IP: net.ParseIP("2001::1"),
</s> add IP: netip.MustParseAddr("2001::1"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dhcpd/v6_unix_test.go |
IP: netip.MustParseAddr("2001::3"), | <mask> stLeases := []*Lease{{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0x33, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }, {
<mask> IP: net.ParseIP("2001::3"),
<mask> HWAddr: net.HardwareAddr{0x22, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }}
<mask>
<mask> for _, l := range stLeases {
<mask> err = s.AddStaticLease(l)
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove IP: net.ParseIP("2001::1"),
</s> add IP: netip.MustParseAddr("2001::1"), </s> remove IP: net.ParseIP("2001::2"),
</s> add IP: netip.MustParseAddr("2001::2"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), </s> remove IP: net.IP{192, 168, 10, 152},
</s> add IP: netip.MustParseAddr("192.168.10.152"), </s> remove IP: net.ParseIP("2001::1"),
</s> add IP: netip.MustParseAddr("2001::1"), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dhcpd/v6_unix_test.go |
assert.Equal(t, stLeases[i].IP, l.IP) | <mask> ls := s.GetLeases(LeasesStatic)
<mask> require.Len(t, ls, 2)
<mask>
<mask> for i, l := range ls {
<mask> assert.True(t, stLeases[i].IP.Equal(l.IP))
<mask> assert.Equal(t, stLeases[i].HWAddr, l.HWAddr)
<mask> assert.EqualValues(t, leaseExpireStatic, l.Expiry.Unix())
<mask> }
<mask> }
<mask>
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove assert.True(t, stLeases[i].IP.Equal(l.IP))
</s> add assert.Equal(t, stLeases[i].IP, l.IP) </s> remove assert.True(t, l.IP.Equal(ls[0].IP))
</s> add assert.Equal(t, l.IP, ls[0].IP) </s> remove assert.True(t, net.IP{192, 168, 10, 100}.Equal(ls[0].IP))
</s> add ip := netip.MustParseAddr("192.168.10.100")
assert.Equal(t, ip, ls[0].IP) </s> remove assert.True(t, l.IP.Equal(resp.YourIPAddr))
</s> add ip := net.IP(l.IP.AsSlice())
assert.True(t, ip.Equal(resp.YourIPAddr)) </s> remove assert.True(t, l.IP.Equal(resp.YourIPAddr))
</s> add ip := net.IP(l.IP.AsSlice())
assert.True(t, ip.Equal(resp.YourIPAddr)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dhcpd/v6_unix_test.go |
IP: netip.MustParseAddr("2001::1"), | <mask> LinkLayerAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask>
<mask> l := &Lease{
<mask> IP: net.ParseIP("2001::1"),
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> }
<mask> err = s.AddStaticLease(l)
<mask> require.NoError(t, err)
<mask>
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove IP: net.ParseIP("2001::1"),
</s> add IP: netip.MustParseAddr("2001::1"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), </s> remove IP: net.ParseIP("2001::3"),
</s> add IP: netip.MustParseAddr("2001::3"), </s> remove IP: net.ParseIP("2001::1"),
</s> add IP: netip.MustParseAddr("2001::1"), </s> remove IP: net.ParseIP("2001::2"),
</s> add IP: netip.MustParseAddr("2001::2"), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dhcpd/v6_unix_test.go |
ip := net.IP(l.IP.AsSlice())
assert.Equal(t, ip, oiaAddr.IPv6Addr) | <mask>
<mask> oia = resp.Options.OneIANA()
<mask> oiaAddr = oia.Options.OneAddress()
<mask>
<mask> assert.Equal(t, l.IP, oiaAddr.IPv6Addr)
<mask> assert.Equal(t, s.conf.leaseTime.Seconds(), oiaAddr.ValidLifetime.Seconds())
<mask> })
<mask>
<mask> t.Run("request", func(t *testing.T) {
<mask> req, err = dhcpv6.NewRequestFromAdvertise(resp)
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove assert.Equal(t, l.IP, oiaAddr.IPv6Addr)
</s> add ip := net.IP(l.IP.AsSlice())
assert.Equal(t, ip, oiaAddr.IPv6Addr) </s> remove assert.True(t, l.IP.Equal(ls[0].IP))
</s> add assert.Equal(t, l.IP, ls[0].IP) </s> remove resp := discoverAnOffer(t, anotherName, anotherIP.AsSlice(), staticMAC)
</s> add resp := discoverAnOffer(t, anotherName, anotherIP, staticMAC) </s> remove assert.True(t, net.IP{192, 168, 10, 100}.Equal(ls[0].IP))
</s> add ip := netip.MustParseAddr("192.168.10.100")
assert.Equal(t, ip, ls[0].IP) </s> remove assert.Equal(t, staticIP, resp.YourIPAddr)
</s> add ip := net.IP(staticIP.AsSlice())
assert.Equal(t, ip, resp.YourIPAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dhcpd/v6_unix_test.go |
ip := net.IP(l.IP.AsSlice())
assert.Equal(t, ip, oiaAddr.IPv6Addr) | <mask>
<mask> oia = resp.Options.OneIANA()
<mask> oiaAddr = oia.Options.OneAddress()
<mask>
<mask> assert.Equal(t, l.IP, oiaAddr.IPv6Addr)
<mask> assert.Equal(t, s.conf.leaseTime.Seconds(), oiaAddr.ValidLifetime.Seconds())
<mask> })
<mask>
<mask> dnsAddrs := resp.Options.DNS()
<mask> require.Len(t, dnsAddrs, 1)
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove assert.Equal(t, l.IP, oiaAddr.IPv6Addr)
</s> add ip := net.IP(l.IP.AsSlice())
assert.Equal(t, ip, oiaAddr.IPv6Addr) </s> remove assert.True(t, l.IP.Equal(ls[0].IP))
</s> add assert.Equal(t, l.IP, ls[0].IP) </s> remove assert.True(t, net.IP{192, 168, 10, 100}.Equal(ls[0].IP))
</s> add ip := netip.MustParseAddr("192.168.10.100")
assert.Equal(t, ip, ls[0].IP) </s> remove assert.Equal(t, staticIP, resp.YourIPAddr)
</s> add ip := net.IP(staticIP.AsSlice())
assert.Equal(t, ip, resp.YourIPAddr) </s> remove assert.True(t, stLeases[i].IP.Equal(l.IP))
</s> add assert.Equal(t, stLeases[i].IP, l.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dhcpd/v6_unix_test.go |
if !l.IP.Is4() {
log.Debug("dnsforward: skipping invalid ip from dhcp: bad ipv4 net.IP %v", l.IP) | <mask>
<mask> lowhost := strings.ToLower(l.Hostname + "." + s.localDomainSuffix)
<mask>
<mask> // Assume that we only process IPv4 now.
<mask> //
<mask> // TODO(a.garipov): Remove once we switch to netip.Addr more fully.
<mask> ip, err := netutil.IPToAddr(l.IP, netutil.AddrFamilyIPv4)
<mask> if err != nil {
<mask> log.Debug("dnsforward: skipping invalid ip %v from dhcp: %s", l.IP, err)
<mask>
<mask> continue
<mask> }
<mask>
<mask> ipToHost[ip] = lowhost
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove // TODO(a.garipov): Remove once we switch to netip.Addr more fully.
ipAddr, err := netutil.IPToAddrNoMapped(l.IP)
if err != nil {
log.Error("clients: bad client ip %v from dhcp: %s", l.IP, err)
continue
}
ok := clients.addHostLocked(ipAddr, l.Hostname, ClientSourceDHCP)
</s> add ok := clients.addHostLocked(l.IP, l.Hostname, ClientSourceDHCP) </s> remove ipToHost[ip] = lowhost
hostToIP[lowhost] = ip
</s> add leaseIP := l.IP
ipToHost[leaseIP] = lowhost
hostToIP[lowhost] = leaseIP </s> remove func (s *v4Server) validHostnameForClient(cliHostname string, ip net.IP) (hostname string) {
</s> add func (s *v4Server) validHostnameForClient(cliHostname string, ip netip.Addr) (hostname string) { </s> remove func GenerateHostname(ip net.IP) (hostname string) {
if ipv4 := ip.To4(); ipv4 != nil {
return generateIPv4Hostname(ipv4)
</s> add func GenerateHostname(ip netip.Addr) (hostname string) {
if !ip.IsValid() {
// TODO(s.chzhen): Get rid of it.
panic("aghnet generate hostname: invalid ip")
}
ip = ip.Unmap()
hostname = ip.StringExpanded()
if ip.Is4() {
return strings.Replace(hostname, ".", "-", -1) </s> remove // TODO(a.garipov): Migrate leases.db and use netip.Addr.
IP net.IP `json:"ip"`
</s> add // TODO(a.garipov): Migrate leases.db.
IP netip.Addr `json:"ip"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dnsforward/dns.go |
leaseIP := l.IP
ipToHost[leaseIP] = lowhost
hostToIP[lowhost] = leaseIP | <mask>
<mask> continue
<mask> }
<mask>
<mask> ipToHost[ip] = lowhost
<mask> hostToIP[lowhost] = ip
<mask> }
<mask>
<mask> s.setTableHostToIP(hostToIP)
<mask> s.setTableIPToHost(ipToHost)
<mask>
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove //
// TODO(a.garipov): Remove once we switch to netip.Addr more fully.
ip, err := netutil.IPToAddr(l.IP, netutil.AddrFamilyIPv4)
if err != nil {
log.Debug("dnsforward: skipping invalid ip %v from dhcp: %s", l.IP, err)
</s> add if !l.IP.Is4() {
log.Debug("dnsforward: skipping invalid ip from dhcp: bad ipv4 net.IP %v", l.IP) </s> remove // TODO(a.garipov): Remove once we switch to netip.Addr more fully.
ipAddr, err := netutil.IPToAddrNoMapped(l.IP)
if err != nil {
log.Error("clients: bad client ip %v from dhcp: %s", l.IP, err)
continue
}
ok := clients.addHostLocked(ipAddr, l.Hostname, ClientSourceDHCP)
</s> add ok := clients.addHostLocked(l.IP, l.Hostname, ClientSourceDHCP) </s> remove if l.IP.Equal(ip) {
</s> add if l.IP == netIP { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dnsforward/dns.go |
IP: netip.MustParseAddr("192.168.12.34"), | <mask> OnStop: func() (err error) { panic("not implemented") },
<mask> OnEnabled: func() (ok bool) { return true },
<mask> OnLeases: func(flags dhcpd.GetLeasesFlags) (leases []*dhcpd.Lease) {
<mask> return []*dhcpd.Lease{{
<mask> IP: net.IP{192, 168, 12, 34},
<mask> HWAddr: net.HardwareAddr{0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
<mask> Hostname: "myhost",
<mask> }}
<mask> },
<mask> OnSetOnLeaseChanged: func(olct dhcpd.OnLeaseChangedT) {},
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove IP: net.IP{192, 168, 10, 100},
</s> add IP: netip.MustParseAddr("192.168.10.100"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), </s> remove IP: net.IP{192, 168, 10, 150},
</s> add IP: netip.MustParseAddr("192.168.10.150"), </s> remove IP: net.IP{192, 168, 10, 101},
</s> add IP: netip.MustParseAddr("192.168.10.101"), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/dnsforward/dnsforward_test.go |
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/stringutil"
<mask> "golang.org/x/exp/maps"
<mask> "golang.org/x/exp/slices"
<mask> )
<mask>
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove "net"
"strconv"
</s> add "net/netip" </s> remove // The maximum lengths of generated hostnames for different IP versions.
const (
ipv4HostnameMaxLen = len("192-168-100-100")
ipv6HostnameMaxLen = len("ff80-f076-0000-0000-0000-0000-0000-0010")
)
// generateIPv4Hostname generates the hostname by IP address version 4.
func generateIPv4Hostname(ipv4 net.IP) (hostname string) {
hnData := make([]byte, 0, ipv4HostnameMaxLen)
for i, part := range ipv4 {
if i > 0 {
hnData = append(hnData, '-')
}
hnData = strconv.AppendUint(hnData, uint64(part), 10)
}
return string(hnData)
}
// generateIPv6Hostname generates the hostname by IP address version 6.
func generateIPv6Hostname(ipv6 net.IP) (hostname string) {
hnData := make([]byte, 0, ipv6HostnameMaxLen)
for i, partsNum := 0, net.IPv6len/2; i < partsNum; i++ {
if i > 0 {
hnData = append(hnData, '-')
}
for _, val := range ipv6[i*2 : i*2+2] {
if val < 10 {
hnData = append(hnData, '0')
}
hnData = strconv.AppendUint(hnData, uint64(val), 16)
}
}
return string(hnData)
}
</s> add </s> remove "net"
</s> add "net/netip" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/home/clients.go | |
ok := clients.addHostLocked(l.IP, l.Hostname, ClientSourceDHCP) | <mask> if l.Hostname == "" {
<mask> continue
<mask> }
<mask>
<mask> // TODO(a.garipov): Remove once we switch to netip.Addr more fully.
<mask> ipAddr, err := netutil.IPToAddrNoMapped(l.IP)
<mask> if err != nil {
<mask> log.Error("clients: bad client ip %v from dhcp: %s", l.IP, err)
<mask>
<mask> continue
<mask> }
<mask>
<mask> ok := clients.addHostLocked(ipAddr, l.Hostname, ClientSourceDHCP)
<mask> if ok {
<mask> n++
<mask> }
<mask> }
<mask>
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove //
// TODO(a.garipov): Remove once we switch to netip.Addr more fully.
ip, err := netutil.IPToAddr(l.IP, netutil.AddrFamilyIPv4)
if err != nil {
log.Debug("dnsforward: skipping invalid ip %v from dhcp: %s", l.IP, err)
</s> add if !l.IP.Is4() {
log.Debug("dnsforward: skipping invalid ip from dhcp: bad ipv4 net.IP %v", l.IP) </s> remove if !(len(obj[i].IP) == 4 || len(obj[i].IP) == 16) {
</s> add ip, ok := netip.AddrFromSlice(obj[i].IP)
if !ok { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/home/clients.go |
ip := netip.MustParseAddr("1.2.3.4") | <mask> if runtime.GOOS == "windows" {
<mask> t.Skip("skipping dhcp test on windows")
<mask> }
<mask>
<mask> ip := net.IP{1, 2, 3, 4}
<mask>
<mask> // First, init a DHCP server with a single static lease.
<mask> config := &dhcpd.ServerConfig{
<mask> Enabled: true,
<mask> DBFilePath: "leases.db",
</s> Pull request 1771: AG-20352-dhcpd-lease-netip-addr
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
Merge: 0020006e 306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
Merge: c82b18f1 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
Merge: c68e85c4 9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr </s> remove offset, inOffset := r.offset(l.IP)
</s> add leaseIP := net.IP(l.IP.AsSlice())
offset, inOffset := r.offset(leaseIP) </s> remove IP: net.IP{0, 2, 3, 4},
</s> add IP: netip.MustParseAddr("0.2.3.4"), </s> remove s.ipAddrs[l.IP[15]] = 1
</s> add ip := l.IP.As16()
s.ipAddrs[ip[15]] = 1 </s> remove addr := netip.AddrFrom4(*(*[4]byte)(l.IP.To4()))
if sn := s.conf.subnet; !sn.Contains(addr) {
</s> add if sn := s.conf.subnet; !sn.Contains(l.IP) { </s> remove l.IP = s.nextIP()
if l.IP == nil {
</s> add nextIP := s.nextIP()
if nextIP == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bea39934bdab65b984e98d75ae69547b78ac55d9 | internal/home/clients_test.go |
var serviceRulesArray = []svc{{
name: "whatsapp",
rules: []string{"||whatsapp.net^", "||whatsapp.com^"},
}, {
name: "facebook",
rules: []string{ | <mask>
<mask> // Keep in sync with:
<mask> // client/src/helpers/constants.js
<mask> // client/src/components/ui/Icons.js
<mask> var serviceRulesArray = []svc{
<mask> {"whatsapp", []string{"||whatsapp.net^", "||whatsapp.com^"}},
<mask> {"facebook", []string{
<mask> "||facebook.com^",
<mask> "||facebook.net^",
<mask> "||fbcdn.net^",
<mask> "||accountkit.com^",
<mask> "||fb.me^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
}
</s> add },
}} </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "twitter",
rules: []string{"||twitter.com^", "||twttr.com^", "||t.co^", "||twimg.com^"},
}, {
name: "youtube",
rules: []string{ | <mask> "||messenger.com^",
<mask> "||facebookcorewwwi.onion^",
<mask> "||fbcdn.com^",
<mask> "||fb.watch^",
<mask> }},
<mask> {"twitter", []string{"||twitter.com^", "||twttr.com^", "||t.co^", "||twimg.com^"}},
<mask> {"youtube", []string{
<mask> "||youtube.com^",
<mask> "||ytimg.com^",
<mask> "||youtu.be^",
<mask> "||googlevideo.com^",
<mask> "||youtubei.googleapis.com^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"twitch", []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"}},
{"netflix", []string{"||nflxext.com^", "||netflix.com^", "||nflximg.net^", "||nflxvideo.net^", "||nflxso.net^"}},
{"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}},
{"snapchat", []string{
</s> add },
}, {
name: "twitch",
rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"},
}, {
name: "netflix",
rules: []string{
"||nflxext.com^",
"||netflix.com^",
"||nflximg.net^",
"||nflxvideo.net^",
"||nflxso.net^",
},
}, {
name: "instagram",
rules: []string{"||instagram.com^", "||cdninstagram.com^"},
}, {
name: "snapchat",
rules: []string{ </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "twitch",
rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"},
}, {
name: "netflix",
rules: []string{
"||nflxext.com^",
"||netflix.com^",
"||nflximg.net^",
"||nflxvideo.net^",
"||nflxso.net^",
},
}, {
name: "instagram",
rules: []string{"||instagram.com^", "||cdninstagram.com^"},
}, {
name: "snapchat",
rules: []string{ | <mask> "||googlevideo.com^",
<mask> "||youtubei.googleapis.com^",
<mask> "||youtube-nocookie.com^",
<mask> "||youtube",
<mask> }},
<mask> {"twitch", []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"}},
<mask> {"netflix", []string{"||nflxext.com^", "||netflix.com^", "||nflximg.net^", "||nflxvideo.net^", "||nflxso.net^"}},
<mask> {"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}},
<mask> {"snapchat", []string{
<mask> "||snapchat.com^",
<mask> "||sc-cdn.net^",
<mask> "||snap-dev.net^",
<mask> "||snapkit.co",
<mask> "||snapads.com^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"twitter", []string{"||twitter.com^", "||twttr.com^", "||t.co^", "||twimg.com^"}},
{"youtube", []string{
</s> add },
}, {
name: "twitter",
rules: []string{"||twitter.com^", "||twttr.com^", "||t.co^", "||twimg.com^"},
}, {
name: "youtube",
rules: []string{ </s> remove }},
{"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^", "||discord.com^", "||discord.media^"}},
{"ok", []string{"||ok.ru^"}},
{"skype", []string{"||skype.com^", "||skypeassets.com^"}},
{"vk", []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"}},
{"origin", []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"}},
{"steam", []string{
</s> add },
}, {
name: "discord",
rules: []string{
"||discord.gg^",
"||discordapp.net^",
"||discordapp.com^",
"||discord.com^",
"||discord.media^",
},
}, {
name: "ok",
rules: []string{"||ok.ru^"},
}, {
name: "skype",
rules: []string{"||skype.com^", "||skypeassets.com^"},
}, {
name: "vk",
rules: []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"},
}, {
name: "origin",
rules: []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"},
}, {
name: "steam",
rules: []string{ </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "discord",
rules: []string{
"||discord.gg^",
"||discordapp.net^",
"||discordapp.com^",
"||discord.com^",
"||discord.media^",
},
}, {
name: "ok",
rules: []string{"||ok.ru^"},
}, {
name: "skype",
rules: []string{"||skype.com^", "||skypeassets.com^"},
}, {
name: "vk",
rules: []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"},
}, {
name: "origin",
rules: []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"},
}, {
name: "steam",
rules: []string{ | <mask> "||snap-dev.net^",
<mask> "||snapkit.co",
<mask> "||snapads.com^",
<mask> "||impala-media-production.s3.amazonaws.com^",
<mask> }},
<mask> {"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^", "||discord.com^", "||discord.media^"}},
<mask> {"ok", []string{"||ok.ru^"}},
<mask> {"skype", []string{"||skype.com^", "||skypeassets.com^"}},
<mask> {"vk", []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"}},
<mask> {"origin", []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"}},
<mask> {"steam", []string{
<mask> "||steam.com^",
<mask> "||steampowered.com^",
<mask> "||steamcommunity.com^",
<mask> "||steamstatic.com^",
<mask> "||steamstore-a.akamaihd.net^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"epic_games", []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"}},
{"reddit", []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"}},
{"mail_ru", []string{"||mail.ru^"}},
{"cloudflare", []string{
</s> add },
}, {
name: "epic_games",
rules: []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"},
}, {
name: "reddit",
rules: []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"},
}, {
name: "mail_ru",
rules: []string{"||mail.ru^"},
}, {
name: "cloudflare",
rules: []string{ </s> remove }},
{"twitch", []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"}},
{"netflix", []string{"||nflxext.com^", "||netflix.com^", "||nflximg.net^", "||nflxvideo.net^", "||nflxso.net^"}},
{"instagram", []string{"||instagram.com^", "||cdninstagram.com^"}},
{"snapchat", []string{
</s> add },
}, {
name: "twitch",
rules: []string{"||twitch.tv^", "||ttvnw.net^", "||jtvnw.net^", "||twitchcdn.net^"},
}, {
name: "netflix",
rules: []string{
"||nflxext.com^",
"||netflix.com^",
"||nflximg.net^",
"||nflxvideo.net^",
"||nflxso.net^",
},
}, {
name: "instagram",
rules: []string{"||instagram.com^", "||cdninstagram.com^"},
}, {
name: "snapchat",
rules: []string{ </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "epic_games",
rules: []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"},
}, {
name: "reddit",
rules: []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"},
}, {
name: "mail_ru",
rules: []string{"||mail.ru^"},
}, {
name: "cloudflare",
rules: []string{ | <mask> "||steamcommunity.com^",
<mask> "||steamstatic.com^",
<mask> "||steamstore-a.akamaihd.net^",
<mask> "||steamcdn-a.akamaihd.net^",
<mask> }},
<mask> {"epic_games", []string{"||epicgames.com^", "||easyanticheat.net^", "||easy.ac^", "||eac-cdn.com^"}},
<mask> {"reddit", []string{"||reddit.com^", "||redditstatic.com^", "||redditmedia.com^", "||redd.it^"}},
<mask> {"mail_ru", []string{"||mail.ru^"}},
<mask> {"cloudflare", []string{
<mask> "||cloudflare.com^",
<mask> "||cloudflare-dns.com^",
<mask> "||cloudflare.net^",
<mask> "||cloudflareinsights.com^",
<mask> "||cloudflarestream.com^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"discord", []string{"||discord.gg^", "||discordapp.net^", "||discordapp.com^", "||discord.com^", "||discord.media^"}},
{"ok", []string{"||ok.ru^"}},
{"skype", []string{"||skype.com^", "||skypeassets.com^"}},
{"vk", []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"}},
{"origin", []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"}},
{"steam", []string{
</s> add },
}, {
name: "discord",
rules: []string{
"||discord.gg^",
"||discordapp.net^",
"||discordapp.com^",
"||discord.com^",
"||discord.media^",
},
}, {
name: "ok",
rules: []string{"||ok.ru^"},
}, {
name: "skype",
rules: []string{"||skype.com^", "||skypeassets.com^"},
}, {
name: "vk",
rules: []string{"||vk.com^", "||userapi.com^", "||vk-cdn.net^", "||vkuservideo.net^"},
}, {
name: "origin",
rules: []string{"||origin.com^", "||signin.ea.com^", "||accounts.ea.com^"},
}, {
name: "steam",
rules: []string{ </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "amazon",
rules: []string{ | <mask> "||one.one^",
<mask> "||warp.plus^",
<mask> "||1.1.1.1^",
<mask> "||dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion^",
<mask> }},
<mask> {"amazon", []string{
<mask> "||amazon.com^",
<mask> "||media-amazon.com^",
<mask> "||primevideo.com^",
<mask> "||amazontrust.com^",
<mask> "||images-amazon.com^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ </s> remove }},
{"tiktok", []string{
</s> add },
}, {
name: "tiktok",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "ebay",
rules: []string{ | <mask> "||amazon.com.mx^",
<mask> "||amazon.co.uk^",
<mask> "||createspace.com^",
<mask> "||aws",
<mask> }},
<mask> {"ebay", []string{
<mask> "||ebay.com^",
<mask> "||ebayimg.com^",
<mask> "||ebaystatic.com^",
<mask> "||ebaycdn.net^",
<mask> "||ebayinc.com^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ </s> remove }},
{"tiktok", []string{
</s> add },
}, {
name: "tiktok",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "tiktok",
rules: []string{ | <mask> "||ebay.com.hk^",
<mask> "||ebay.com.my^",
<mask> "||ebay.com.sg^",
<mask> "||ebay.co.uk^",
<mask> }},
<mask> {"tiktok", []string{
<mask> "||tiktok.com^",
<mask> "||tiktokcdn.com^",
<mask> "||musical.ly^",
<mask> "||snssdk.com^",
<mask> "||amemv.com^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ </s> remove }},
{"ebay", []string{
</s> add },
}, {
name: "ebay",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", | <mask> "||muscdn.com^",
<mask> "||bytedance.map.fastly.net^",
<mask> "||douyin.com^",
<mask> "||tiktokv.com^",
<mask> }},
<mask> {"vimeo", []string{
<mask> "||vimeo.com^",
<mask> "||vimeocdn.com^",
<mask> "*vod-adaptive.akamaized.net^",
<mask> }},
<mask> {"pinterest", []string{
<mask> "||pinterest.*^",
<mask> "||pinimg.com^",
<mask> }},
<mask> {"imgur", []string{
<mask> "||imgur.com^",
<mask> }},
<mask> {"dailymotion", []string{
<mask> "||dailymotion.com^",
<mask> "||dm-event.net^",
<mask> "||dmcdn.net^",
<mask> }},
<mask> {"qq", []string{
<mask> // block qq.com and subdomains excluding WeChat domains
<mask> "||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
<mask> "||qqzaixian.com^",
<mask> }},
<mask> {"wechat", []string{
<mask> "||wechat.com^",
<mask> "||weixin.qq.com^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ </s> remove }},
{"tiktok", []string{
</s> add },
}, {
name: "tiktok",
rules: []string{ </s> remove }},
{"ebay", []string{
</s> add },
}, {
name: "ebay",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"ke... | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ | <mask> {"qq", []string{
<mask> // block qq.com and subdomains excluding WeChat domains
<mask> "||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
<mask> "||qqzaixian.com^",
<mask> }},
<mask> {"wechat", []string{
<mask> "||wechat.com^",
<mask> "||weixin.qq.com^",
<mask> "||wx.qq.com^",
<mask> }},
<mask> {"viber", []string{
<mask> "||viber.com^",
<mask> }},
<mask> {"weibo", []string{
<mask> "||weibo.com^",
<mask> }},
<mask> {"9gag", []string{
<mask> "||9cache.com^",
<mask> "||9gag.com^",
<mask> }},
<mask> {"telegram", []string{
<mask> "||t.me^",
<mask> "||telegram.me^",
<mask> "||telegram.org^",
<mask> }},
<mask> {"disneyplus", []string{
<mask> "||disney-plus.net^",
<mask> "||disneyplus.com^",
<mask> "||disney.playback.edge.bamgrid.com^",
<mask> "||media.dssott.com^",
<mask> }},
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ </s> remove }},
{"tiktok", []string{
</s> add },
}, {
name: "tiktok",
rules: []string{ </s> remove }},
{"ebay", []string{
</s> add },
}, {
name: "ebay",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ | <mask> "||disney-plus.net^",
<mask> "||disneyplus.com^",
<mask> "||disney.playback.edge.bamgrid.com^",
<mask> "||media.dssott.com^",
<mask> }},
<mask> {"hulu", []string{
<mask> "||hulu.com^",
<mask> }},
<mask> {"spotify", []string{
<mask> "/_spotify-connect._tcp.local/",
<mask> "||spotify.com^",
<mask> "||scdn.co^",
<mask> "||spotify.com.edgesuite.net^",
<mask> "||spotify.map.fastly.net^",
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ </s> remove }},
{"tiktok", []string{
</s> add },
}, {
name: "tiktok",
rules: []string{ </s> remove }},
{"ebay", []string{
</s> add },
}, {
name: "ebay",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}, {
name: "tinder",
rules: []string{ | <mask> "||audio-ak-spotify-com.akamaized.net^",
<mask> "||audio4-ak-spotify-com.akamaized.net^",
<mask> "||heads-ak-spotify-com.akamaized.net^",
<mask> "||heads4-ak-spotify-com.akamaized.net^",
<mask> }},
<mask> {"tinder", []string{
<mask> "||gotinder.com^",
<mask> "||tinder.com^",
<mask> "||tindersparks.com^",
<mask> }},
<mask> }
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
}
</s> add },
}} </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ </s> remove }},
{"tiktok", []string{
</s> add },
}, {
name: "tiktok",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
},
}} | <mask> {"tinder", []string{
<mask> "||gotinder.com^",
<mask> "||tinder.com^",
<mask> "||tindersparks.com^",
<mask> }},
<mask> }
<mask>
<mask> // convert array to map
<mask> func initBlockedServices() {
<mask> serviceRules = make(map[string][]*rules.NetworkRule)
<mask> for _, s := range serviceRulesArray {
</s> Pull request: filtering: fix qq regex legacy
Merge in DNS/adguard-home from qq-rule to master
Updates #3717.
Squashed commit of the following:
commit 1e2d50077067e5f95da645091686349ce9c8a6bc
Merge: 7290a1c4 b16b1d1d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:14:10 2022 +0300
Merge branch 'master' into qq-rule
commit 7290a1c456a7f47e91cc9485f5e112b92cb595ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 18 20:36:17 2022 +0300
filtering: fix qq regex legacy </s> remove }},
{"tinder", []string{
</s> add },
}, {
name: "tinder",
rules: []string{ </s> remove var serviceRulesArray = []svc{
{"whatsapp", []string{"||whatsapp.net^", "||whatsapp.com^"}},
{"facebook", []string{
</s> add var serviceRulesArray = []svc{{
name: "whatsapp",
rules: []string{"||whatsapp.net^", "||whatsapp.com^"},
}, {
name: "facebook",
rules: []string{ </s> remove }},
{"vimeo", []string{
"||vimeo.com^",
"||vimeocdn.com^",
"*vod-adaptive.akamaized.net^",
}},
{"pinterest", []string{
"||pinterest.*^",
"||pinimg.com^",
}},
{"imgur", []string{
"||imgur.com^",
}},
{"dailymotion", []string{
"||dailymotion.com^",
"||dm-event.net^",
"||dmcdn.net^",
}},
{"qq", []string{
// block qq.com and subdomains excluding WeChat domains
"||qq.com^$denyallow=wx*.qq.com|weixin.qq.com",
</s> add },
}, {
name: "vimeo",
rules: []string{"||vimeo.com^", "||vimeocdn.com^", "*vod-adaptive.akamaized.net^"},
}, {
name: "pinterest",
rules: []string{"||pinterest.*^", "||pinimg.com^"},
}, {
name: "imgur",
rules: []string{"||imgur.com^"},
}, {
name: "dailymotion",
rules: []string{"||dailymotion.com^", "||dm-event.net^", "||dmcdn.net^"},
}, {
name: "qq",
rules: []string{
// Block qq.com and subdomains excluding WeChat's domains.
"||qq.com^$denyallow=wx.qq.com|weixin.qq.com", </s> remove }},
{"wechat", []string{
"||wechat.com^",
"||weixin.qq.com^",
"||wx.qq.com^",
}},
{"viber", []string{
"||viber.com^",
}},
{"weibo", []string{
"||weibo.com^",
}},
{"9gag", []string{
"||9cache.com^",
"||9gag.com^",
}},
{"telegram", []string{
"||t.me^",
"||telegram.me^",
"||telegram.org^",
}},
{"disneyplus", []string{
</s> add },
}, {
name: "wechat",
rules: []string{"||wechat.com^", "||weixin.qq.com^", "||wx.qq.com^"},
}, {
name: "viber",
rules: []string{"||viber.com^"},
}, {
name: "weibo",
rules: []string{"||weibo.com^"},
}, {
name: "9gag",
rules: []string{"||9cache.com^", "||9gag.com^"},
}, {
name: "telegram",
rules: []string{"||t.me^", "||telegram.me^", "||telegram.org^"},
}, {
name: "disneyplus",
rules: []string{ </s> remove }},
{"hulu", []string{
"||hulu.com^",
}},
{"spotify", []string{
</s> add },
}, {
name: "hulu",
rules: []string{"||hulu.com^"},
}, {
name: "spotify",
rules: []string{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb674ecbc0cf47510e62064fb03497650f58e42 | internal/filtering/blocked.go |
"install_settings_interface_link": "Your AdGuard Home admin web interface is available on <0>{{link}}</0>", | <mask> "install_welcome_desc": "Lorem ipsum dolor sit amet consectetur adipisicing elit.",
<mask> "install_settings_title": "Admin Web Interface",
<mask> "install_settings_listen": "Listen interface",
<mask> "install_settings_port": "Port",
<mask> "install_settings_interface_link": "Your AdGuard Home admin web interface is available on {{link}}",
<mask> "form_error_port": "Enter valid port value",
<mask> "install_settings_dns": "DNS server",
<mask> "install_settings_dns_desc": "You will need to configure your devices or router to use the DNS server at {{ip}}",
<mask> "install_auth_title": "Authentication",
<mask> "install_auth_desc": "It is highly recommended to configure password authentication to your AdGuard Home admin web interface. Even if it is accessible only in your local network, it is still important to have it protected from unrestricted access.",
</s> Fixed initial values and string interpolation </s> remove "install_settings_dns_desc": "You will need to configure your devices or router to use the DNS server at {{ip}}",
</s> add "install_settings_dns_desc": "You will need to configure your devices or router to use the DNS server at <0>{{ip}}</0>", </s> remove <Trans>install_settings_dns_desc</Trans> <strong>{dnsIp}</strong>
</s> add <Trans
components={[<strong key="0">ip</strong>]}
values={{ ip: dnsIp }}
>
install_settings_dns_desc
</Trans> </s> remove <Trans>install_settings_interface_link</Trans> <a href={`http://${interfaceIp}`}>{`http://${interfaceIp}`}</a>
</s> add <Trans
components={[<a href={`http://${interfaceIp}`} key="0">link</a>]}
values={{ link: `http://${interfaceIp}` }}
>
install_settings_interface_link
</Trans> </s> remove initialValues={initialForm}
</s> add initialValues={{ ...values }} </s> remove initialValues={initialSelect}
</s> add initialValues={{ interface_name }} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb94741cfeaaec4a5ff730effec685ed7f8cc82 | client/src/__locales/en.json |
"install_settings_dns_desc": "You will need to configure your devices or router to use the DNS server at <0>{{ip}}</0>", | <mask> "install_settings_port": "Port",
<mask> "install_settings_interface_link": "Your AdGuard Home admin web interface is available on {{link}}",
<mask> "form_error_port": "Enter valid port value",
<mask> "install_settings_dns": "DNS server",
<mask> "install_settings_dns_desc": "You will need to configure your devices or router to use the DNS server at {{ip}}",
<mask> "install_auth_title": "Authentication",
<mask> "install_auth_desc": "It is highly recommended to configure password authentication to your AdGuard Home admin web interface. Even if it is accessible only in your local network, it is still important to have it protected from unrestricted access.",
<mask> "install_auth_username": "Username",
<mask> "install_auth_password": "Password",
<mask> "install_auth_confirm": "Confirm password",
</s> Fixed initial values and string interpolation </s> remove "install_settings_interface_link": "Your AdGuard Home admin web interface is available on {{link}}",
</s> add "install_settings_interface_link": "Your AdGuard Home admin web interface is available on <0>{{link}}</0>", </s> remove <Trans>install_settings_dns_desc</Trans> <strong>{dnsIp}</strong>
</s> add <Trans
components={[<strong key="0">ip</strong>]}
values={{ ip: dnsIp }}
>
install_settings_dns_desc
</Trans> </s> remove <Trans>install_settings_interface_link</Trans> <a href={`http://${interfaceIp}`}>{`http://${interfaceIp}`}</a>
</s> add <Trans
components={[<a href={`http://${interfaceIp}`} key="0">link</a>]}
values={{ link: `http://${interfaceIp}` }}
>
install_settings_interface_link
</Trans> </s> remove initialValues={initialForm}
</s> add initialValues={{ ...values }} </s> remove initialValues={initialSelect}
</s> add initialValues={{ interface_name }} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb94741cfeaaec4a5ff730effec685ed7f8cc82 | client/src/__locales/en.json |
<mask> 'btn btn-primary btn-standard': true,
<mask> 'btn btn-primary btn-standard btn-loading': dhcp.processingStatus,
<mask> });
<mask> const {
<mask> gateway_ip,
<mask> interface_name,
<mask> lease_duration,
<mask> range_end,
<mask> range_start,
<mask> subnet_mask,
</s> Fixed initial values and string interpolation </s> remove lease_duration,
range_end,
range_start,
subnet_mask,
</s> add ...values </s> remove const initialForm = {
gateway_ip,
lease_duration,
range_end,
range_start,
subnet_mask,
};
const initialSelect = { interface_name };
</s> add </s> remove <Trans>install_settings_dns_desc</Trans> <strong>{dnsIp}</strong>
</s> add <Trans
components={[<strong key="0">ip</strong>]}
values={{ ip: dnsIp }}
>
install_settings_dns_desc
</Trans> </s> remove <Trans>install_settings_interface_link</Trans> <a href={`http://${interfaceIp}`}>{`http://${interfaceIp}`}</a>
</s> add <Trans
components={[<a href={`http://${interfaceIp}`} key="0">link</a>]}
values={{ link: `http://${interfaceIp}` }}
>
install_settings_interface_link
</Trans> </s> remove initialValues={initialForm}
</s> add initialValues={{ ...values }} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb94741cfeaaec4a5ff730effec685ed7f8cc82 | client/src/components/Settings/Dhcp/index.js | |
...values | <mask> });
<mask> const {
<mask> gateway_ip,
<mask> interface_name,
<mask> lease_duration,
<mask> range_end,
<mask> range_start,
<mask> subnet_mask,
<mask> } = dhcp.config;
<mask> const initialForm = {
<mask> gateway_ip,
<mask> lease_duration,
<mask> range_end,
</s> Fixed initial values and string interpolation </s> remove const initialForm = {
gateway_ip,
lease_duration,
range_end,
range_start,
subnet_mask,
};
const initialSelect = { interface_name };
</s> add </s> remove gateway_ip,
</s> add </s> remove <Trans>install_settings_dns_desc</Trans> <strong>{dnsIp}</strong>
</s> add <Trans
components={[<strong key="0">ip</strong>]}
values={{ ip: dnsIp }}
>
install_settings_dns_desc
</Trans> </s> remove <Trans>install_settings_interface_link</Trans> <a href={`http://${interfaceIp}`}>{`http://${interfaceIp}`}</a>
</s> add <Trans
components={[<a href={`http://${interfaceIp}`} key="0">link</a>]}
values={{ link: `http://${interfaceIp}` }}
>
install_settings_interface_link
</Trans> </s> remove initialValues={initialForm}
</s> add initialValues={{ ...values }} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb94741cfeaaec4a5ff730effec685ed7f8cc82 | client/src/components/Settings/Dhcp/index.js |
<mask> range_end,
<mask> range_start,
<mask> subnet_mask,
<mask> } = dhcp.config;
<mask> const initialForm = {
<mask> gateway_ip,
<mask> lease_duration,
<mask> range_end,
<mask> range_start,
<mask> subnet_mask,
<mask> };
<mask> const initialSelect = { interface_name };
<mask>
<mask> return (
<mask> <Fragment>
<mask> <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<mask> <div className="dhcp">
</s> Fixed initial values and string interpolation </s> remove lease_duration,
range_end,
range_start,
subnet_mask,
</s> add ...values </s> remove gateway_ip,
</s> add </s> remove initialValues={initialSelect}
</s> add initialValues={{ interface_name }} </s> remove <Trans>install_settings_interface_link</Trans> <a href={`http://${interfaceIp}`}>{`http://${interfaceIp}`}</a>
</s> add <Trans
components={[<a href={`http://${interfaceIp}`} key="0">link</a>]}
values={{ link: `http://${interfaceIp}` }}
>
install_settings_interface_link
</Trans> </s> remove initialValues={initialForm}
</s> add initialValues={{ ...values }} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb94741cfeaaec4a5ff730effec685ed7f8cc82 | client/src/components/Settings/Dhcp/index.js | |
initialValues={{ interface_name }} | <mask> {!dhcp.processing &&
<mask> <Fragment>
<mask> <Interface
<mask> onChange={this.handleFormSubmit}
<mask> initialValues={initialSelect}
<mask> interfaces={dhcp.interfaces}
<mask> processing={dhcp.processingInterfaces}
<mask> enabled={dhcp.config.enabled}
<mask> />
<mask> <Form
</s> Fixed initial values and string interpolation </s> remove initialValues={initialForm}
</s> add initialValues={{ ...values }} </s> remove const initialForm = {
gateway_ip,
lease_duration,
range_end,
range_start,
subnet_mask,
};
const initialSelect = { interface_name };
</s> add </s> remove <Trans>install_settings_dns_desc</Trans> <strong>{dnsIp}</strong>
</s> add <Trans
components={[<strong key="0">ip</strong>]}
values={{ ip: dnsIp }}
>
install_settings_dns_desc
</Trans> </s> remove <Trans>install_settings_interface_link</Trans> <a href={`http://${interfaceIp}`}>{`http://${interfaceIp}`}</a>
</s> add <Trans
components={[<a href={`http://${interfaceIp}`} key="0">link</a>]}
values={{ link: `http://${interfaceIp}` }}
>
install_settings_interface_link
</Trans> </s> remove lease_duration,
range_end,
range_start,
subnet_mask,
</s> add ...values | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb94741cfeaaec4a5ff730effec685ed7f8cc82 | client/src/components/Settings/Dhcp/index.js |
initialValues={{ ...values }} | <mask> enabled={dhcp.config.enabled}
<mask> />
<mask> <Form
<mask> onSubmit={this.handleFormSubmit}
<mask> initialValues={initialForm}
<mask> interfaces={dhcp.interfaces}
<mask> processingConfig={dhcp.processingConfig}
<mask> />
<mask> <hr/>
<mask> <div className="card-actions mb-3">
</s> Fixed initial values and string interpolation </s> remove initialValues={initialSelect}
</s> add initialValues={{ interface_name }} </s> remove <Trans>install_settings_dns_desc</Trans> <strong>{dnsIp}</strong>
</s> add <Trans
components={[<strong key="0">ip</strong>]}
values={{ ip: dnsIp }}
>
install_settings_dns_desc
</Trans> </s> remove <Trans>install_settings_interface_link</Trans> <a href={`http://${interfaceIp}`}>{`http://${interfaceIp}`}</a>
</s> add <Trans
components={[<a href={`http://${interfaceIp}`} key="0">link</a>]}
values={{ link: `http://${interfaceIp}` }}
>
install_settings_interface_link
</Trans> </s> remove const initialForm = {
gateway_ip,
lease_duration,
range_end,
range_start,
subnet_mask,
};
const initialSelect = { interface_name };
</s> add </s> remove lease_duration,
range_end,
range_start,
subnet_mask,
</s> add ...values | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb94741cfeaaec4a5ff730effec685ed7f8cc82 | client/src/components/Settings/Dhcp/index.js |
<Trans
components={[<a href={`http://${interfaceIp}`} key="0">link</a>]}
values={{ link: `http://${interfaceIp}` }}
>
install_settings_interface_link
</Trans> | <mask> </div>
<mask> </div>
<mask> </div>
<mask> <div className="setup__desc">
<mask> <Trans>install_settings_interface_link</Trans> <a href={`http://${interfaceIp}`}>{`http://${interfaceIp}`}</a>
<mask> </div>
<mask> </div>
<mask> <div className="setup__group">
<mask> <div className="setup__subtitle">
<mask> <Trans>install_settings_dns</Trans>
</s> Fixed initial values and string interpolation </s> remove <Trans>install_settings_dns_desc</Trans> <strong>{dnsIp}</strong>
</s> add <Trans
components={[<strong key="0">ip</strong>]}
values={{ ip: dnsIp }}
>
install_settings_dns_desc
</Trans> </s> remove initialValues={initialForm}
</s> add initialValues={{ ...values }} </s> remove const initialForm = {
gateway_ip,
lease_duration,
range_end,
range_start,
subnet_mask,
};
const initialSelect = { interface_name };
</s> add </s> remove initialValues={initialSelect}
</s> add initialValues={{ interface_name }} </s> remove lease_duration,
range_end,
range_start,
subnet_mask,
</s> add ...values | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb94741cfeaaec4a5ff730effec685ed7f8cc82 | client/src/install/Setup/Settings.js |
<Trans
components={[<strong key="0">ip</strong>]}
values={{ ip: dnsIp }}
>
install_settings_dns_desc
</Trans> | <mask> </div>
<mask> </div>
<mask> </div>
<mask> <p className="setup__desc">
<mask> <Trans>install_settings_dns_desc</Trans> <strong>{dnsIp}</strong>
<mask> </p>
<mask> </div>
<mask> <Controls invalid={invalid} />
<mask> </form>
<mask> );
</s> Fixed initial values and string interpolation </s> remove <Trans>install_settings_interface_link</Trans> <a href={`http://${interfaceIp}`}>{`http://${interfaceIp}`}</a>
</s> add <Trans
components={[<a href={`http://${interfaceIp}`} key="0">link</a>]}
values={{ link: `http://${interfaceIp}` }}
>
install_settings_interface_link
</Trans> </s> remove initialValues={initialForm}
</s> add initialValues={{ ...values }} </s> remove initialValues={initialSelect}
</s> add initialValues={{ interface_name }} </s> remove const initialForm = {
gateway_ip,
lease_duration,
range_end,
range_start,
subnet_mask,
};
const initialSelect = { interface_name };
</s> add </s> remove lease_duration,
range_end,
range_start,
subnet_mask,
</s> add ...values | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/beb94741cfeaaec4a5ff730effec685ed7f8cc82 | client/src/install/Setup/Settings.js |
QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
QueryLogMemSize uint32 `yaml:"querylog_size_memory"` // number of entries kept in memory before they are flushed to disk | <mask>
<mask> // time interval for statistics (in days)
<mask> StatsInterval uint32 `yaml:"statistics_interval"`
<mask>
<mask> QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
<mask> QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
<mask> QueryLogMemSize uint32 `yaml:"querylog_memsize"` // number of entries kept in memory before they are flushed to disk
<mask>
<mask> dnsforward.FilteringConfig `yaml:",inline"`
<mask>
<mask> FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
<mask> FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
</s> - querylog: querylog_memsize setting was reset to 0
Since v0.100.0 the query logs memory buffer was not active,
despite the default capacity of 1000 items.
Now we remove querylog_memsize setting and replace it with querylog_size_memory </s> remove querylog_memsize: 0
</s> add querylog_size_memory: 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bebd43923b71b2ef4bf4e1beb5bb69ff6208d06e | home/config.go |
querylog_size_memory: 0 | <mask> port: 5354
<mask> statistics_interval: 90
<mask> querylog_enabled: true
<mask> querylog_interval: 90
<mask> querylog_memsize: 0
<mask> protection_enabled: true
<mask> blocking_mode: null_ip
<mask> blocked_response_ttl: 0
<mask> ratelimit: 100
<mask> ratelimit_whitelist: []
</s> - querylog: querylog_memsize setting was reset to 0
Since v0.100.0 the query logs memory buffer was not active,
despite the default capacity of 1000 items.
Now we remove querylog_memsize setting and replace it with querylog_size_memory </s> remove QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
QueryLogMemSize uint32 `yaml:"querylog_memsize"` // number of entries kept in memory before they are flushed to disk
</s> add QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
QueryLogMemSize uint32 `yaml:"querylog_size_memory"` // number of entries kept in memory before they are flushed to disk | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bebd43923b71b2ef4bf4e1beb5bb69ff6208d06e | home/home_test.go |
dc.MemSize = l.conf.MemSize | <mask>
<mask> func (l *queryLog) WriteDiskConfig(dc *DiskConfig) {
<mask> dc.Enabled = l.conf.Enabled
<mask> dc.Interval = l.conf.Interval
<mask> }
<mask>
<mask> // Clear memory buffer and remove log files
<mask> func (l *queryLog) clear() {
<mask> l.fileFlushLock.Lock()
</s> - querylog: querylog_memsize setting was reset to 0
Since v0.100.0 the query logs memory buffer was not active,
despite the default capacity of 1000 items.
Now we remove querylog_memsize setting and replace it with querylog_size_memory </s> remove QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
QueryLogMemSize uint32 `yaml:"querylog_memsize"` // number of entries kept in memory before they are flushed to disk
</s> add QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
QueryLogInterval uint32 `yaml:"querylog_interval"` // time interval for query log (in days)
QueryLogMemSize uint32 `yaml:"querylog_size_memory"` // number of entries kept in memory before they are flushed to disk </s> remove querylog_memsize: 0
</s> add querylog_size_memory: 0 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bebd43923b71b2ef4bf4e1beb5bb69ff6208d06e | querylog/qlog.go |
// github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName | <mask> // clientServerName returns the TLS server name based on the protocol.
<mask> func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) {
<mask> switch proto {
<mask> case proxy.ProtoHTTPS:
<mask> if connState := pctx.HTTPRequest.TLS; connState != nil {
<mask> srvName = pctx.HTTPRequest.TLS.ServerName
<mask> }
<mask> case proxy.ProtoQUIC:
<mask> qConn := pctx.QUICConnection
<mask> conn, ok := qConn.(quicConnection)
<mask> if !ok {
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug </s> remove return "", fmt.Errorf(
"proxy ctx quic conn of proto %s is %T, want quic.Connection",
proto,
qConn,
)
</s> add return "", fmt.Errorf("pctx conn of proto %s is %T, want quic.Connection", proto, qConn) </s> remove u := &url.URL{
Path: "/dns-query",
}
connState := &tls.ConnectionState{
ServerName: tc.cliSrvName,
}
httpReq = &http.Request{
URL: u,
TLS: connState,
}
</s> add httpReq = newHTTPReq(tc.cliSrvName, tc.useHTTP3) </s> remove return "", fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
</s> add return "", fmt.Errorf("pctx conn of proto %s is %T, want *tls.Conn", proto, conn) </s> remove // TODO(a.garipov): Consider moving away from the text-based error
// checks and onto a more structured approach.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid.go |
return "", fmt.Errorf("pctx conn of proto %s is %T, want quic.Connection", proto, qConn) | <mask> case proxy.ProtoQUIC:
<mask> qConn := pctx.QUICConnection
<mask> conn, ok := qConn.(quicConnection)
<mask> if !ok {
<mask> return "", fmt.Errorf(
<mask> "proxy ctx quic conn of proto %s is %T, want quic.Connection",
<mask> proto,
<mask> qConn,
<mask> )
<mask> }
<mask>
<mask> srvName = conn.ConnectionState().TLS.ServerName
<mask> case proxy.ProtoTLS:
<mask> conn := pctx.Conn
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug </s> remove return "", fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
</s> add return "", fmt.Errorf("pctx conn of proto %s is %T, want *tls.Conn", proto, conn) </s> remove if connState := pctx.HTTPRequest.TLS; connState != nil {
srvName = pctx.HTTPRequest.TLS.ServerName
</s> add // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName </s> remove u := &url.URL{
Path: "/dns-query",
}
connState := &tls.ConnectionState{
ServerName: tc.cliSrvName,
}
httpReq = &http.Request{
URL: u,
TLS: connState,
}
</s> add httpReq = newHTTPReq(tc.cliSrvName, tc.useHTTP3) </s> remove // TODO(a.garipov): Consider moving away from the text-based error
// checks and onto a more structured approach.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid.go |
return "", fmt.Errorf("pctx conn of proto %s is %T, want *tls.Conn", proto, conn) | <mask> case proxy.ProtoTLS:
<mask> conn := pctx.Conn
<mask> tc, ok := conn.(tlsConn)
<mask> if !ok {
<mask> return "", fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
<mask> }
<mask>
<mask> srvName = tc.ConnectionState().ServerName
<mask> }
<mask>
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug </s> remove return "", fmt.Errorf(
"proxy ctx quic conn of proto %s is %T, want quic.Connection",
proto,
qConn,
)
</s> add return "", fmt.Errorf("pctx conn of proto %s is %T, want quic.Connection", proto, qConn) </s> remove if connState := pctx.HTTPRequest.TLS; connState != nil {
srvName = pctx.HTTPRequest.TLS.ServerName
</s> add // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName </s> remove u := &url.URL{
Path: "/dns-query",
}
connState := &tls.ConnectionState{
ServerName: tc.cliSrvName,
}
httpReq = &http.Request{
URL: u,
TLS: connState,
}
</s> add httpReq = newHTTPReq(tc.cliSrvName, tc.useHTTP3) </s> remove // TODO(a.garipov): Consider moving away from the text-based error
// checks and onto a more structured approach.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid.go |
<mask> return cs
<mask> }
<mask>
<mask> func TestServer_clientIDFromDNSContext(t *testing.T) {
<mask> // TODO(a.garipov): Consider moving away from the text-based error
<mask> // checks and onto a more structured approach.
<mask> testCases := []struct {
<mask> name string
<mask> proto proxy.Proto
<mask> hostSrvName string
<mask> cliSrvName string
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug </s> remove if connState := pctx.HTTPRequest.TLS; connState != nil {
srvName = pctx.HTTPRequest.TLS.ServerName
</s> add // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName </s> remove return "", fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
</s> add return "", fmt.Errorf("pctx conn of proto %s is %T, want *tls.Conn", proto, conn) </s> remove return "", fmt.Errorf(
"proxy ctx quic conn of proto %s is %T, want quic.Connection",
proto,
qConn,
)
</s> add return "", fmt.Errorf("pctx conn of proto %s is %T, want quic.Connection", proto, qConn) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go | |
useHTTP3 bool | <mask> cliSrvName string
<mask> wantClientID string
<mask> wantErrMsg string
<mask> strictSNI bool
<mask> }{{
<mask> name: "udp",
<mask> proto: proxy.ProtoUDP,
<mask> hostSrvName: "",
<mask> cliSrvName: "",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug </s> remove // TODO(a.garipov): Consider moving away from the text-based error
// checks and onto a more structured approach.
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> cliSrvName: "",
<mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: false,
<mask> }, {
<mask> name: "tls_no_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_no_client_server_name",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "",
<mask> wantClientID: "",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantErrMsg: `clientid check: client server name "" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_no_client_server_name_no_strict",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "",
<mask> wantClientID: "",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantClientID: "",
<mask> wantErrMsg: "",
<mask> strictSNI: false,
<mask> }, {
<mask> name: "tls_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_clientid_hostname_error",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.net",
<mask> wantClientID: "",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "cli.example.net" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_invalid_clientid",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "!!!.example.com",
<mask> wantClientID: "",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: invalid clientid "!!!": ` +
<mask> `bad domain name label rune '!'`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_clientid_too_long",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantErrMsg: `clientid check: invalid clientid "abcdefghijklmno` +
<mask> `pqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789": ` +
<mask> `domain name label is too long: got 72, max 63`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "quic_clientid",
<mask> proto: proxy.ProtoQUIC,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_clientid_issue3437",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.myexample.com",
<mask> wantClientID: "",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantClientID: "",
<mask> wantErrMsg: `clientid check: client server name "cli.myexample.com" ` +
<mask> `doesn't match host server name "example.com"`,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "tls_case",
<mask> proto: proxy.ProtoTLS,
<mask> hostSrvName: "example.com",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantErrMsg: ``,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "quic_case",
<mask> proto: proxy.ProtoQUIC,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "InSeNsItIvE.example.com",
<mask> wantClientID: "insensitive",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantErrMsg: ``,
<mask> strictSNI: true,
<mask> }, {
<mask> name: "https_no_clientid",
<mask> proto: proxy.ProtoHTTPS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "example.com",
<mask> wantClientID: "",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false, | <mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }, {
<mask> name: "https_clientid",
<mask> proto: proxy.ProtoHTTPS,
<mask> hostSrvName: "example.com",
<mask> cliSrvName: "cli.example.com",
<mask> wantClientID: "cli",
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
useHTTP3: false,
}, {
name: "https_clientid_quic",
proto: proxy.ProtoHTTPS,
hostSrvName: "example.com",
cliSrvName: "cli.example.com",
wantClientID: "cli",
wantErrMsg: "",
strictSNI: true,
useHTTP3: true, | <mask> wantErrMsg: "",
<mask> strictSNI: true,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> tlsConf := TLSConfig{
<mask> ServerName: tc.hostSrvName,
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug </s> remove // TODO(a.garipov): Consider moving away from the text-based error
// checks and onto a more structured approach.
</s> add </s> remove u := &url.URL{
Path: "/dns-query",
}
connState := &tls.ConnectionState{
ServerName: tc.cliSrvName,
}
httpReq = &http.Request{
URL: u,
TLS: connState,
}
</s> add httpReq = newHTTPReq(tc.cliSrvName, tc.useHTTP3) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
httpReq = newHTTPReq(tc.cliSrvName, tc.useHTTP3) | <mask> )
<mask>
<mask> switch tc.proto {
<mask> case proxy.ProtoHTTPS:
<mask> u := &url.URL{
<mask> Path: "/dns-query",
<mask> }
<mask>
<mask> connState := &tls.ConnectionState{
<mask> ServerName: tc.cliSrvName,
<mask> }
<mask>
<mask> httpReq = &http.Request{
<mask> URL: u,
<mask> TLS: connState,
<mask> }
<mask> case proxy.ProtoQUIC:
<mask> qconn = testQUICConnection{
<mask> serverName: tc.cliSrvName,
<mask> }
<mask> case proxy.ProtoTLS:
</s> Pull request: http3-tls-fix
Merge in DNS/adguard-home from http3-tls-fix to master
Squashed commit of the following:
commit 4b4ac9f91d6a36654674c5e7037d2bf35a6b211a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Oct 26 15:35:07 2022 +0300
dnsforward: add crutch for quic-go bug </s> remove return "", fmt.Errorf(
"proxy ctx quic conn of proto %s is %T, want quic.Connection",
proto,
qConn,
)
</s> add return "", fmt.Errorf("pctx conn of proto %s is %T, want quic.Connection", proto, qConn) </s> remove if connState := pctx.HTTPRequest.TLS; connState != nil {
srvName = pctx.HTTPRequest.TLS.ServerName
</s> add // github.com/lucas-clemente/quic-go seems to not populate the TLS
// field. So, if the request comes over HTTP/3, use the Host header
// value as the server name.
//
// See https://github.com/lucas-clemente/quic-go/issues/2879.
//
// TODO(a.garipov): Remove this crutch once they fix it.
r := pctx.HTTPRequest
if r.ProtoAtLeast(3, 0) {
var host string
host, err = netutil.SplitHost(r.Host)
if err != nil {
return "", fmt.Errorf("parsing host: %w", err)
}
srvName = host
} else if connState := r.TLS; connState != nil {
srvName = r.TLS.ServerName </s> remove return "", fmt.Errorf("proxy ctx conn of proto %s is %T, want *tls.Conn", proto, conn)
</s> add return "", fmt.Errorf("pctx conn of proto %s is %T, want *tls.Conn", proto, conn) </s> remove // TODO(a.garipov): Consider moving away from the text-based error
// checks and onto a more structured approach.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf10f157ab69104819a7a3257f826b1e4426f222 | internal/dnsforward/clientid_test.go |
defer d.confLock.Unlock()
| <mask> // WriteDiskConfig - write configuration
<mask> func (d *DNSFilter) WriteDiskConfig(c *Config) {
<mask> d.confLock.Lock()
<mask> *c = d.Config
<mask> c.Rewrites = cloneRewrites(c.Rewrites)
<mask> }
<mask>
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove c.Rewrites = rewriteArrayDup(d.Config.Rewrites)
// BlockedServices
d.confLock.Unlock()
</s> add c.Rewrites = cloneRewrites(c.Rewrites)
}
func cloneRewrites(entries []RewriteEntry) (clone []RewriteEntry) {
return append([]RewriteEntry(nil), entries...) </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add </s> remove d.Rewrites[i].prepare()
</s> add d.Rewrites[i].normalize() </s> remove func (r *RewriteEntry) equals(b RewriteEntry) bool {
return r.Domain == b.Domain && r.Answer == b.Answer
</s> add // equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} </s> remove if ent.equals(entDel) {
</s> add if ent.equal(entDel) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/filtering.go |
c.Rewrites = cloneRewrites(c.Rewrites)
}
func cloneRewrites(entries []RewriteEntry) (clone []RewriteEntry) {
return append([]RewriteEntry(nil), entries...) | <mask> // WriteDiskConfig - write configuration
<mask> func (d *DNSFilter) WriteDiskConfig(c *Config) {
<mask> d.confLock.Lock()
<mask> *c = d.Config
<mask> c.Rewrites = rewriteArrayDup(d.Config.Rewrites)
<mask> // BlockedServices
<mask> d.confLock.Unlock()
<mask> }
<mask>
<mask> // SetFilters - set new filters (synchronously or asynchronously)
<mask> // When filters are set asynchronously, the old filters continue working until the new filters are ready.
<mask> // In this case the caller must ensure that the old filter files are intact.
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add </s> remove func (r *RewriteEntry) equals(b RewriteEntry) bool {
return r.Domain == b.Domain && r.Answer == b.Answer
</s> add // equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} </s> remove d.Rewrites[i].prepare()
</s> add d.Rewrites[i].normalize() </s> remove func findRewrites(a []RewriteEntry, host string, qtype uint16) []RewriteEntry {
</s> add func findRewrites(entries []RewriteEntry, host string, qtype uint16) (matched []RewriteEntry) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/filtering.go |
// equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} | <mask> // Type is the DNS record type: A, AAAA, or CNAME.
<mask> Type uint16 `yaml:"-"`
<mask> }
<mask>
<mask> func (r *RewriteEntry) equals(b RewriteEntry) bool {
<mask> return r.Domain == b.Domain && r.Answer == b.Answer
<mask> }
<mask>
<mask> func isWildcard(host string) bool {
<mask> return len(host) > 1 && host[0] == '*' && host[1] == '.'
<mask> }
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove // Return CNAMEs for all types requests, but only the
// appropriate ones for A and AAAA.
if r.Type == dns.TypeCNAME ||
(r.Type == qtype && (qtype == dns.TypeA || qtype == dns.TypeAAAA)) {
rr = append(rr, r)
</s> add if e.matchesQType(qtype) {
rr = append(rr, e) </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add </s> remove func findRewrites(a []RewriteEntry, host string, qtype uint16) []RewriteEntry {
</s> add func findRewrites(entries []RewriteEntry, host string, qtype uint16) (matched []RewriteEntry) { </s> remove for _, r := range a {
if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
</s> add for _, e := range entries {
if e.Domain != host && !matchDomainWildcard(host, e.Domain) { </s> remove c.Rewrites = rewriteArrayDup(d.Config.Rewrites)
// BlockedServices
d.confLock.Unlock()
</s> add c.Rewrites = cloneRewrites(c.Rewrites)
}
func cloneRewrites(entries []RewriteEntry) (clone []RewriteEntry) {
return append([]RewriteEntry(nil), entries...) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites.go |
<mask> // both are wildcards
<mask> return len(a[i].Domain) > len(a[j].Domain)
<mask> }
<mask>
<mask> // prepare prepares the a new or decoded entry.
<mask> func (r *RewriteEntry) prepare() {
<mask> // TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
<mask> // and use it in matchDomainWildcard instead of using strings.ToLower
<mask> // everywhere.
<mask> r.Domain = strings.ToLower(r.Domain)
<mask>
<mask> switch r.Answer {
<mask> case "AAAA":
<mask> r.IP = nil
<mask> r.Type = dns.TypeAAAA
<mask>
<mask> return
<mask> case "A":
<mask> r.IP = nil
<mask> r.Type = dns.TypeA
<mask>
<mask> return
<mask> default:
<mask> // Go on.
<mask> }
<mask>
<mask> ip := net.ParseIP(r.Answer)
<mask> if ip == nil {
<mask> r.Type = dns.TypeCNAME
<mask>
<mask> return
<mask> }
<mask>
<mask> ip4 := ip.To4()
<mask> if ip4 != nil {
<mask> r.IP = ip4
<mask> r.Type = dns.TypeA
<mask> } else {
<mask> r.IP = ip
<mask> r.Type = dns.TypeAAAA
<mask> }
<mask> }
<mask>
<mask> func (d *DNSFilter) prepareRewrites() {
<mask> for i := range d.Rewrites {
<mask> d.Rewrites[i].prepare()
<mask> }
<mask> }
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove func (r *RewriteEntry) equals(b RewriteEntry) bool {
return r.Domain == b.Domain && r.Answer == b.Answer
</s> add // equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} </s> remove // Return CNAMEs for all types requests, but only the
// appropriate ones for A and AAAA.
if r.Type == dns.TypeCNAME ||
(r.Type == qtype && (qtype == dns.TypeA || qtype == dns.TypeAAAA)) {
rr = append(rr, r)
</s> add if e.matchesQType(qtype) {
rr = append(rr, e) </s> remove c.Rewrites = rewriteArrayDup(d.Config.Rewrites)
// BlockedServices
d.confLock.Unlock()
</s> add c.Rewrites = cloneRewrites(c.Rewrites)
}
func cloneRewrites(entries []RewriteEntry) (clone []RewriteEntry) {
return append([]RewriteEntry(nil), entries...) </s> remove d.Rewrites[i].prepare()
</s> add d.Rewrites[i].normalize() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites.go | |
d.Rewrites[i].normalize() | <mask> }
<mask>
<mask> func (d *DNSFilter) prepareRewrites() {
<mask> for i := range d.Rewrites {
<mask> d.Rewrites[i].prepare()
<mask> }
<mask> }
<mask>
<mask> // findRewrites returns the list of matched rewrite entries. The priority is:
<mask> // CNAME, then A and AAAA; exact, then wildcard. If the host is matched
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove func findRewrites(a []RewriteEntry, host string, qtype uint16) []RewriteEntry {
</s> add func findRewrites(entries []RewriteEntry, host string, qtype uint16) (matched []RewriteEntry) { </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add </s> remove func (r *RewriteEntry) equals(b RewriteEntry) bool {
return r.Domain == b.Domain && r.Answer == b.Answer
</s> add // equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} </s> remove for _, r := range a {
if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
</s> add for _, e := range entries {
if e.Domain != host && !matchDomainWildcard(host, e.Domain) { </s> remove c.Rewrites = rewriteArrayDup(d.Config.Rewrites)
// BlockedServices
d.confLock.Unlock()
</s> add c.Rewrites = cloneRewrites(c.Rewrites)
}
func cloneRewrites(entries []RewriteEntry) (clone []RewriteEntry) {
return append([]RewriteEntry(nil), entries...) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites.go |
func findRewrites(entries []RewriteEntry, host string, qtype uint16) (matched []RewriteEntry) { | <mask> // findRewrites returns the list of matched rewrite entries. The priority is:
<mask> // CNAME, then A and AAAA; exact, then wildcard. If the host is matched
<mask> // exactly, wildcard entries aren't returned. If the host matched by wildcards,
<mask> // return the most specific for the question type.
<mask> func findRewrites(a []RewriteEntry, host string, qtype uint16) []RewriteEntry {
<mask> rr := rewritesSorted{}
<mask> for _, r := range a {
<mask> if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
<mask> continue
<mask> }
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove for _, r := range a {
if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
</s> add for _, e := range entries {
if e.Domain != host && !matchDomainWildcard(host, e.Domain) { </s> remove d.Rewrites[i].prepare()
</s> add d.Rewrites[i].normalize() </s> remove // Return CNAMEs for all types requests, but only the
// appropriate ones for A and AAAA.
if r.Type == dns.TypeCNAME ||
(r.Type == qtype && (qtype == dns.TypeA || qtype == dns.TypeAAAA)) {
rr = append(rr, r)
</s> add if e.matchesQType(qtype) {
rr = append(rr, e) </s> remove func (r *RewriteEntry) equals(b RewriteEntry) bool {
return r.Domain == b.Domain && r.Answer == b.Answer
</s> add // equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites.go |
for _, e := range entries {
if e.Domain != host && !matchDomainWildcard(host, e.Domain) { | <mask> // exactly, wildcard entries aren't returned. If the host matched by wildcards,
<mask> // return the most specific for the question type.
<mask> func findRewrites(a []RewriteEntry, host string, qtype uint16) []RewriteEntry {
<mask> rr := rewritesSorted{}
<mask> for _, r := range a {
<mask> if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
<mask> continue
<mask> }
<mask>
<mask> // Return CNAMEs for all types requests, but only the
<mask> // appropriate ones for A and AAAA.
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove func findRewrites(a []RewriteEntry, host string, qtype uint16) []RewriteEntry {
</s> add func findRewrites(entries []RewriteEntry, host string, qtype uint16) (matched []RewriteEntry) { </s> remove // Return CNAMEs for all types requests, but only the
// appropriate ones for A and AAAA.
if r.Type == dns.TypeCNAME ||
(r.Type == qtype && (qtype == dns.TypeA || qtype == dns.TypeAAAA)) {
rr = append(rr, r)
</s> add if e.matchesQType(qtype) {
rr = append(rr, e) </s> remove func (r *RewriteEntry) equals(b RewriteEntry) bool {
return r.Domain == b.Domain && r.Answer == b.Answer
</s> add // equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} </s> remove d.Rewrites[i].prepare()
</s> add d.Rewrites[i].normalize() </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites.go |
if e.matchesQType(qtype) {
rr = append(rr, e) | <mask> if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
<mask> continue
<mask> }
<mask>
<mask> // Return CNAMEs for all types requests, but only the
<mask> // appropriate ones for A and AAAA.
<mask> if r.Type == dns.TypeCNAME ||
<mask> (r.Type == qtype && (qtype == dns.TypeA || qtype == dns.TypeAAAA)) {
<mask> rr = append(rr, r)
<mask> }
<mask> }
<mask>
<mask> if len(rr) == 0 {
<mask> return nil
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove for _, r := range a {
if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
</s> add for _, e := range entries {
if e.Domain != host && !matchDomainWildcard(host, e.Domain) { </s> remove func (r *RewriteEntry) equals(b RewriteEntry) bool {
return r.Domain == b.Domain && r.Answer == b.Answer
</s> add // equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add </s> remove func findRewrites(a []RewriteEntry, host string, qtype uint16) []RewriteEntry {
</s> add func findRewrites(entries []RewriteEntry, host string, qtype uint16) (matched []RewriteEntry) { </s> remove d.Rewrites[i].prepare()
</s> add d.Rewrites[i].normalize() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites.go |
<mask>
<mask> return b
<mask> }
<mask>
<mask> func rewriteArrayDup(a []RewriteEntry) []RewriteEntry {
<mask> a2 := make([]RewriteEntry, len(a))
<mask> copy(a2, a)
<mask> return a2
<mask> }
<mask>
<mask> type rewriteEntryJSON struct {
<mask> Domain string `json:"domain"`
<mask> Answer string `json:"answer"`
<mask> }
<mask>
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove func findRewrites(a []RewriteEntry, host string, qtype uint16) []RewriteEntry {
</s> add func findRewrites(entries []RewriteEntry, host string, qtype uint16) (matched []RewriteEntry) { </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add </s> remove func (r *RewriteEntry) equals(b RewriteEntry) bool {
return r.Domain == b.Domain && r.Answer == b.Answer
</s> add // equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} </s> remove c.Rewrites = rewriteArrayDup(d.Config.Rewrites)
// BlockedServices
d.confLock.Unlock()
</s> add c.Rewrites = cloneRewrites(c.Rewrites)
}
func cloneRewrites(entries []RewriteEntry) (clone []RewriteEntry) {
return append([]RewriteEntry(nil), entries...) </s> remove for _, r := range a {
if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
</s> add for _, e := range entries {
if e.Domain != host && !matchDomainWildcard(host, e.Domain) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites.go | |
ent.normalize() | <mask> ent := RewriteEntry{
<mask> Domain: jsent.Domain,
<mask> Answer: jsent.Answer,
<mask> }
<mask> ent.prepare()
<mask> d.confLock.Lock()
<mask> d.Config.Rewrites = append(d.Config.Rewrites, ent)
<mask> d.confLock.Unlock()
<mask> log.Debug("Rewrites: added element: %s -> %s [%d]",
<mask> ent.Domain, ent.Answer, len(d.Config.Rewrites))
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove if ent.equals(entDel) {
</s> add if ent.equal(entDel) { </s> remove c.Rewrites = rewriteArrayDup(d.Config.Rewrites)
// BlockedServices
d.confLock.Unlock()
</s> add c.Rewrites = cloneRewrites(c.Rewrites)
}
func cloneRewrites(entries []RewriteEntry) (clone []RewriteEntry) {
return append([]RewriteEntry(nil), entries...) </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add </s> remove func (r *RewriteEntry) equals(b RewriteEntry) bool {
return r.Domain == b.Domain && r.Answer == b.Answer
</s> add // equal returns true if the entry is considered equal to the other.
func (e *RewriteEntry) equal(other RewriteEntry) (ok bool) {
return e.Domain == other.Domain && e.Answer == other.Answer
}
// matchesQType returns true if the entry matched qtype.
func (e *RewriteEntry) matchesQType(qtype uint16) (ok bool) {
// Add CNAMEs, since they match for all types requests.
if e.Type == dns.TypeCNAME {
return true
}
// Reject types other than A and AAAA.
if qtype != dns.TypeA && qtype != dns.TypeAAAA {
return false
}
// If the types match or the entry is set to allow only the other type,
// include them.
return e.Type == qtype || e.IP == nil
}
// normalize makes sure that the a new or decoded entry is normalized with
// regards to domain name case, IP length, and so on.
func (e *RewriteEntry) normalize() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
e.Domain = strings.ToLower(e.Domain)
switch e.Answer {
case "AAAA":
e.IP = nil
e.Type = dns.TypeAAAA
return
case "A":
e.IP = nil
e.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(e.Answer)
if ip == nil {
e.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
e.IP = ip4
e.Type = dns.TypeA
} else {
e.IP = ip
e.Type = dns.TypeAAAA
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites.go |
if ent.equal(entDel) { | <mask> }
<mask> arr := []RewriteEntry{}
<mask> d.confLock.Lock()
<mask> for _, ent := range d.Config.Rewrites {
<mask> if ent.equals(entDel) {
<mask> log.Debug("Rewrites: removed element: %s -> %s", ent.Domain, ent.Answer)
<mask> continue
<mask> }
<mask> arr = append(arr, ent)
<mask> }
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove ent.prepare()
</s> add ent.normalize() </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add </s> remove for _, r := range a {
if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
</s> add for _, e := range entries {
if e.Domain != host && !matchDomainWildcard(host, e.Domain) { </s> remove // Return CNAMEs for all types requests, but only the
// appropriate ones for A and AAAA.
if r.Type == dns.TypeCNAME ||
(r.Type == qtype && (qtype == dns.TypeA || qtype == dns.TypeAAAA)) {
rr = append(rr, r)
</s> add if e.matchesQType(qtype) {
rr = append(rr, e) </s> remove d.Rewrites[i].prepare()
</s> add d.Rewrites[i].normalize() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites.go |
want: []net.IP{}, | <mask> dtyp: dns.TypeA,
<mask> }, {
<mask> name: "match_AAAA_host3.com",
<mask> host: "host3.com",
<mask> want: nil,
<mask> dtyp: dns.TypeAAAA,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name+"_"+tc.host, func(t *testing.T) {
</s> Pull request: filtering: fix special values in legacy rewrites
Updates #3616.
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites </s> remove for _, r := range a {
if r.Domain != host && !matchDomainWildcard(host, r.Domain) {
</s> add for _, e := range entries {
if e.Domain != host && !matchDomainWildcard(host, e.Domain) { </s> remove if ent.equals(entDel) {
</s> add if ent.equal(entDel) { </s> remove func findRewrites(a []RewriteEntry, host string, qtype uint16) []RewriteEntry {
</s> add func findRewrites(entries []RewriteEntry, host string, qtype uint16) (matched []RewriteEntry) { </s> remove // prepare prepares the a new or decoded entry.
func (r *RewriteEntry) prepare() {
// TODO(a.garipov): Write a case-agnostic version of strings.HasSuffix
// and use it in matchDomainWildcard instead of using strings.ToLower
// everywhere.
r.Domain = strings.ToLower(r.Domain)
switch r.Answer {
case "AAAA":
r.IP = nil
r.Type = dns.TypeAAAA
return
case "A":
r.IP = nil
r.Type = dns.TypeA
return
default:
// Go on.
}
ip := net.ParseIP(r.Answer)
if ip == nil {
r.Type = dns.TypeCNAME
return
}
ip4 := ip.To4()
if ip4 != nil {
r.IP = ip4
r.Type = dns.TypeA
} else {
r.IP = ip
r.Type = dns.TypeAAAA
}
}
</s> add </s> remove d.Rewrites[i].prepare()
</s> add d.Rewrites[i].normalize() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf1263628ab2ab2c3a875a41f7e235ccd50d622a | internal/filtering/rewrites_test.go |
"upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https:\/\/1.1.1.1\/' target='_blank'>Cloudflare DNS<\/a> as an upstream.", | <mask> "no_servers_specified": "No servers specified",
<mask> "no_settings": "No settings",
<mask> "general_settings": "General settings",
<mask> "upstream_dns": "Upstream DNS servers",
<mask> "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https:\/\/1.1.1.1\/' target='_blank'>Cloudflare DNS<\/a> as an upstream. Use tls:\/\/ prefix for DNS over TLS servers.",
<mask> "test_upstream_btn": "Test upstreams",
<mask> "apply_btn": "Apply",
<mask> "disabled_filtering_toast": "Disabled filtering",
<mask> "enabled_filtering_toast": "Enabled filtering",
<mask> "disabled_safe_browsing_toast": "Disabled safebrowsing",
</s> * client: locales and pass object to testUpstream </s> remove "bootstrap_dns": "Bootstrap DNS",
"bootstrap_dns_desc": "Bootstrap DNS for DNS-over-HTTPS and DNS-over-TLS servers"
</s> add "bootstrap_dns": "Bootstrap DNS servers",
"bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve the IP address of the DOH/DOT resolvers you specify as upstreams." </s> remove export const testUpstream = values => async (dispatch) => {
</s> add export const testUpstream = config => async (dispatch) => { </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); </s> remove upstream: PropTypes.string,
</s> add </s> remove boostrapDns={dashboard.boostrapDns}
</s> add bootstrapDns={dashboard.bootstrapDns} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/__locales/en.json |
"bootstrap_dns": "Bootstrap DNS servers",
"bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve the IP address of the DOH/DOT resolvers you specify as upstreams." | <mask> "form_error_password": "Password mismatched",
<mask> "reset_settings": "Reset settings",
<mask> "update_announcement": "AdGuard Home {{version}} is now available! <0>Click here</0> for more info.",
<mask> "upstream_parallel": "Use parallel queries to speed up resolving by simultaneously querying all upstream servers",
<mask> "bootstrap_dns": "Bootstrap DNS",
<mask> "bootstrap_dns_desc": "Bootstrap DNS for DNS-over-HTTPS and DNS-over-TLS servers"
<mask> }
</s> * client: locales and pass object to testUpstream </s> remove "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https:\/\/1.1.1.1\/' target='_blank'>Cloudflare DNS<\/a> as an upstream. Use tls:\/\/ prefix for DNS over TLS servers.",
</s> add "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https:\/\/1.1.1.1\/' target='_blank'>Cloudflare DNS<\/a> as an upstream.", </s> remove values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
</s> add values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); </s> remove upstream: PropTypes.string,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/__locales/en.json |
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; | <mask> export const setUpstream = config => async (dispatch) => {
<mask> dispatch(setUpstreamRequest());
<mask> try {
<mask> const values = { ...config };
<mask> values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
<mask> values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
<mask>
<mask> await apiClient.setUpstream(values);
<mask> dispatch(addSuccessToast('updated_upstream_dns_toast'));
<mask> dispatch(setUpstreamSuccess());
<mask> } catch (error) {
</s> * client: locales and pass object to testUpstream </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); </s> remove export const testUpstream = values => async (dispatch) => {
</s> add export const testUpstream = config => async (dispatch) => { </s> remove onClick={() => testUpstream(upstreamDns)}
</s> add onClick={() => testUpstream({
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
})} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/actions/index.js |
export const testUpstream = config => async (dispatch) => { | <mask> export const testUpstreamRequest = createAction('TEST_UPSTREAM_REQUEST');
<mask> export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE');
<mask> export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS');
<mask>
<mask> export const testUpstream = values => async (dispatch) => {
<mask> dispatch(testUpstreamRequest());
<mask> try {
<mask> const servers = normalizeTextarea(values);
<mask> const upstreamResponse = await apiClient.testUpstream(servers);
<mask>
</s> * client: locales and pass object to testUpstream </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); </s> remove values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
</s> add values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/actions/index.js |
const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); | <mask>
<mask> export const testUpstream = values => async (dispatch) => {
<mask> dispatch(testUpstreamRequest());
<mask> try {
<mask> const servers = normalizeTextarea(values);
<mask> const upstreamResponse = await apiClient.testUpstream(servers);
<mask>
<mask> const testMessages = Object.keys(upstreamResponse).map((key) => {
<mask> const message = upstreamResponse[key];
<mask> if (message !== 'OK') {
<mask> dispatch(addErrorToast({ error: t('dns_test_not_ok_toast', { key }) }));
<mask> }
</s> * client: locales and pass object to testUpstream </s> remove export const testUpstream = values => async (dispatch) => {
</s> add export const testUpstream = config => async (dispatch) => { </s> remove values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
</s> add values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/actions/index.js |
bootstrapDns,
allServers, | <mask> testUpstream,
<mask> upstreamDns,
<mask> submitting,
<mask> invalid,
<mask> processingSetUpstream,
<mask> processingTestUpstream,
<mask> } = props;
<mask>
</s> * client: locales and pass object to testUpstream </s> remove values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
</s> add values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); </s> remove onClick={() => testUpstream(upstreamDns)}
</s> add onClick={() => testUpstream({
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
})} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/Upstream/Form.js |
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label> | <mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <label>{t('upstream_dns')}</label>
<mask> <Field
<mask> id="upstream_dns"
<mask> name="upstream_dns"
<mask> component="textarea"
<mask> type="text"
</s> * client: locales and pass object to testUpstream </s> remove <label>{t('bootstrap_dns')}</label>
</s> add <label className="form__label" htmlFor="bootstrap_dns">
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div> </s> remove placeholder={t('bootstrap_dns_desc')}
</s> add placeholder={t('bootstrap_dns')} </s> remove onClick={() => testUpstream(upstreamDns)}
</s> add onClick={() => testUpstream({
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
})} </s> remove upstream: PropTypes.string,
</s> add </s> remove boostrapDns={dashboard.boostrapDns}
</s> add bootstrapDns={dashboard.bootstrapDns} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/Upstream/Form.js |
<label className="form__label" htmlFor="bootstrap_dns">
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div> | <mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group">
<mask> <label>{t('bootstrap_dns')}</label>
<mask> <Field
<mask> id="bootstrap_dns"
<mask> name="bootstrap_dns"
<mask> component="textarea"
<mask> type="text"
</s> * client: locales and pass object to testUpstream </s> remove placeholder={t('bootstrap_dns_desc')}
</s> add placeholder={t('bootstrap_dns')} </s> remove <label>{t('upstream_dns')}</label>
</s> add <label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label> </s> remove boostrapDns={dashboard.boostrapDns}
</s> add bootstrapDns={dashboard.bootstrapDns} </s> remove onClick={() => testUpstream(upstreamDns)}
</s> add onClick={() => testUpstream({
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
})} </s> remove upstream: PropTypes.string,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/Upstream/Form.js |
placeholder={t('bootstrap_dns')} | <mask> name="bootstrap_dns"
<mask> component="textarea"
<mask> type="text"
<mask> className="form-control"
<mask> placeholder={t('bootstrap_dns_desc')}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> <div className="card-actions">
</s> * client: locales and pass object to testUpstream </s> remove <label>{t('bootstrap_dns')}</label>
</s> add <label className="form__label" htmlFor="bootstrap_dns">
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div> </s> remove boostrapDns={dashboard.boostrapDns}
</s> add bootstrapDns={dashboard.bootstrapDns} </s> remove <label>{t('upstream_dns')}</label>
</s> add <label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label> </s> remove onClick={() => testUpstream(upstreamDns)}
</s> add onClick={() => testUpstream({
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
})} </s> remove upstream: PropTypes.string,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/Upstream/Form.js |
onClick={() => testUpstream({
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
})} | <mask> <div className="btn-list">
<mask> <button
<mask> type="button"
<mask> className={testButtonClass}
<mask> onClick={() => testUpstream(upstreamDns)}
<mask> disabled={!upstreamDns || processingTestUpstream}
<mask> >
<mask> <Trans>test_upstream_btn</Trans>
<mask> </button>
<mask> <button
</s> * client: locales and pass object to testUpstream </s> remove values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
</s> add values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); </s> remove <label>{t('upstream_dns')}</label>
</s> add <label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label> </s> remove <label>{t('bootstrap_dns')}</label>
</s> add <label className="form__label" htmlFor="bootstrap_dns">
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div> </s> remove placeholder={t('bootstrap_dns_desc')}
</s> add placeholder={t('bootstrap_dns')} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/Upstream/Form.js |
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool, | <mask> initialValues: PropTypes.object,
<mask> upstreamDns: PropTypes.string,
<mask> processingTestUpstream: PropTypes.bool,
<mask> processingSetUpstream: PropTypes.bool,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> const selector = formValueSelector('upstreamForm');
</s> * client: locales and pass object to testUpstream </s> remove upstream: PropTypes.string,
</s> add </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); </s> remove export const testUpstream = values => async (dispatch) => {
</s> add export const testUpstream = config => async (dispatch) => { </s> remove values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
</s> add values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/Upstream/Form.js |
const bootstrapDns = selector(state, 'bootstrap_dns');
const allServers = selector(state, 'all_servers'); | <mask>
<mask> Form = connect((state) => {
<mask> const upstreamDns = selector(state, 'upstream_dns');
<mask> return {
<mask> upstreamDns,
<mask> bootstrapDns,
<mask> allServers,
<mask> };
</s> * client: locales and pass object to testUpstream </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); </s> remove export const testUpstream = values => async (dispatch) => {
</s> add export const testUpstream = config => async (dispatch) => { </s> remove values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
</s> add values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/Upstream/Form.js |
bootstrapDns,
allServers, | <mask> return {
<mask> upstreamDns,
<mask> };
<mask> })(Form);
<mask>
<mask> export default flow([
<mask> withNamespaces(),
</s> * client: locales and pass object to testUpstream </s> remove upstream: PropTypes.string,
</s> add </s> remove export const testUpstream = values => async (dispatch) => {
</s> add export const testUpstream = config => async (dispatch) => { </s> remove values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
</s> add values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/Upstream/Form.js |
bootstrapDns={dashboard.bootstrapDns} | <mask> </div>
<mask> </Card>
<mask> <Upstream
<mask> upstreamDns={dashboard.upstreamDns}
<mask> boostrapDns={dashboard.boostrapDns}
<mask> allServers={dashboard.allServers}
<mask> setUpstream={this.props.setUpstream}
<mask> testUpstream={this.props.testUpstream}
<mask> processingTestUpstream={settings.processingTestUpstream}
<mask> processingSetUpstream={settings.processingSetUpstream}
</s> * client: locales and pass object to testUpstream </s> remove placeholder={t('bootstrap_dns_desc')}
</s> add placeholder={t('bootstrap_dns')} </s> remove <label>{t('bootstrap_dns')}</label>
</s> add <label className="form__label" htmlFor="bootstrap_dns">
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div> </s> remove upstream: PropTypes.string,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/index.js |
<mask> settingsList: PropTypes.object,
<mask> toggleSetting: PropTypes.func,
<mask> handleUpstreamChange: PropTypes.func,
<mask> setUpstream: PropTypes.func,
<mask> upstream: PropTypes.string,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Settings);
</s> * client: locales and pass object to testUpstream </s> remove export const testUpstream = values => async (dispatch) => {
</s> add export const testUpstream = config => async (dispatch) => { </s> remove values.bootstrap_dns = (values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)) || '';
values.upstream_dns = (values.upstream_dns && normalizeTextarea(values.upstream_dns)) || '';
</s> add values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || []; </s> remove const servers = normalizeTextarea(values);
const upstreamResponse = await apiClient.testUpstream(servers);
</s> add const values = { ...config };
values.bootstrap_dns = (
values.bootstrap_dns && normalizeTextarea(values.bootstrap_dns)
) || [];
values.upstream_dns = (
values.upstream_dns && normalizeTextarea(values.upstream_dns)
) || [];
console.log(values);
const upstreamResponse = await apiClient.testUpstream(values); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf2781d465041c2e7db68cb3529115642a61e455 | client/src/components/Settings/index.js | |
"dev": true | <mask> },
<mask> "ansi-regex": {
<mask> "version": "2.1.1",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "aproba": {
<mask> "version": "1.2.0",
<mask> "bundled": true,
<mask> "dev": true,
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "optional": true,
</s> add </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json |
"dev": true | <mask> },
<mask> "balanced-match": {
<mask> "version": "1.0.0",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "brace-expansion": {
<mask> "version": "1.1.11",
<mask> "bundled": true,
<mask> "dev": true,
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json |
<mask> "brace-expansion": {
<mask> "version": "1.1.11",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true,
<mask> "requires": {
<mask> "balanced-match": "^1.0.0",
<mask> "concat-map": "0.0.1"
<mask> }
<mask> },
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json | |
"dev": true | <mask> },
<mask> "code-point-at": {
<mask> "version": "1.1.0",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "concat-map": {
<mask> "version": "0.0.1",
<mask> "bundled": true,
<mask> "dev": true,
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json |
"dev": true | <mask> },
<mask> "concat-map": {
<mask> "version": "0.0.1",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "console-control-strings": {
<mask> "version": "1.1.0",
<mask> "bundled": true,
<mask> "dev": true,
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json |
"dev": true | <mask> },
<mask> "console-control-strings": {
<mask> "version": "1.1.0",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "core-util-is": {
<mask> "version": "1.0.2",
<mask> "bundled": true,
<mask> "dev": true,
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json |
"dev": true | <mask> },
<mask> "inherits": {
<mask> "version": "2.0.3",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "ini": {
<mask> "version": "1.3.5",
<mask> "bundled": true,
<mask> "dev": true,
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json |
<mask> "is-fullwidth-code-point": {
<mask> "version": "1.0.0",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true,
<mask> "requires": {
<mask> "number-is-nan": "^1.0.0"
<mask> }
<mask> },
<mask> "isarray": {
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json | |
<mask> "minimatch": {
<mask> "version": "3.0.4",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true,
<mask> "requires": {
<mask> "brace-expansion": "^1.1.7"
<mask> }
<mask> },
<mask> "minimist": {
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "optional": true,
</s> add </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json | |
"dev": true | <mask> },
<mask> "minimist": {
<mask> "version": "0.0.8",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "minipass": {
<mask> "version": "2.3.5",
<mask> "bundled": true,
<mask> "dev": true,
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json |
<mask> "minipass": {
<mask> "version": "2.3.5",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true,
<mask> "requires": {
<mask> "safe-buffer": "^5.1.2",
<mask> "yallist": "^3.0.0"
<mask> }
<mask> },
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "optional": true,
</s> add </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json | |
<mask> "mkdirp": {
<mask> "version": "0.5.1",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true,
<mask> "requires": {
<mask> "minimist": "0.0.8"
<mask> }
<mask> },
<mask> "ms": {
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "optional": true,
</s> add </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json | |
"dev": true | <mask> },
<mask> "number-is-nan": {
<mask> "version": "1.0.1",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true
<mask> },
<mask> "object-assign": {
<mask> "version": "4.1.1",
<mask> "bundled": true,
<mask> "dev": true,
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "optional": true,
</s> add </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "dev": true,
"optional": true
</s> add "dev": true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json |
<mask> "once": {
<mask> "version": "1.4.0",
<mask> "bundled": true,
<mask> "dev": true,
<mask> "optional": true,
<mask> "requires": {
<mask> "wrappy": "1"
<mask> }
<mask> },
<mask> "os-homedir": {
</s> + client: add X-DNS-Prefetch-Control meta tag </s> remove "dev": true,
"optional": true
</s> add "dev": true </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add </s> remove "optional": true,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bf410c81ae30e2ac0a9064cd8e890449e29d34db | client/package-lock.json |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.